--- queensgui/src/solution.h	2010/04/22 20:09:09	654
+++ queensgui/src/solution.h	2010/04/23 05:57:28	655
@@ -17,35 +17,75 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#ifndef SOLUTION_H
-#define SOLUTION_H
+#ifndef SOLUTIONINT_H
+#define SOLUTIONINT_H
 
+//#include <solution.h>
+#include "config.h"
 
-/**
-@author Torben Nielsen
-*/
-class Solution 
+class Solution
 {
 public:
-	virtual ~Solution() {}
+    Solution(int size);
+
+    ~Solution();
+
+    //bool getMatrix(int x, int y);
+	bool getMatrix(int x, int y) {
+		return (m_matrix[x] == y);
+	}
+
+
+	//void setMatrix(int x, int y, bool val);
+	void setMatrix(int x, int y, bool val) {
+    	if (val == true)
+        	m_matrix[x] = y;
+	    else
+    	    m_matrix[x] = -1;
+	}
+
+
+
+    bool operator ==(const Solution& sol);
+
+    Solution* copy();
+
+    //void mirror();
+	void mirror() {
+	    unsigned char temp[MAX_SIZE];
+    	for (int i=0; i<m_size; i++)
+        	temp[i] = (m_size-1) - m_matrix[i];
+	    set( temp );
+	}
+
+    //void rotate90();
+	void rotate90() {
+    	unsigned char temp[MAX_SIZE];
+	    for (int i=0; i<m_size; i++) {
+    	    int x = i;
+        	int y = m_matrix[i];
+	        temp[y] = (m_size-1) - x;
+    	}
+	    set( temp);
+	}
 
-	virtual void rotate90() = 0;
-	virtual void mirror() = 0;
-	
-	virtual Solution* copy() = 0;
-
-	virtual bool operator==(const Solution& sol) = 0;
-	virtual bool getMatrix(int x, int y) = 0;
-	virtual void setMatrix(int x, int y, bool val) = 0;
 
 	int size() {return m_size;};
-	void setSize(int size) {m_size = size;};
-	
-	void print();
-	void print(bool debug, int row, int col);
+	void setSize(int size) {m_size = size;}; 
+private:
+	explicit Solution(const Solution& input);
+	//void set(unsigned char[MAX_SIZE]);
+	void set(unsigned char input[MAX_SIZE]) {
+	    for (int i=0; i<m_size; i++)
+    	    m_matrix[i] = input[i];
+	}
+
+
+
+	unsigned char m_matrix[MAX_SIZE];
 protected:
 	int m_size;
-	Solution& operator=(Solution& s);
+		
 };
 
 #endif