--- queensgui/src/solution.cpp	2007/07/19 21:34:15	1
+++ queensgui/src/solution.cpp	2010/04/23 05:57:28	655
@@ -19,13 +19,14 @@
  ***************************************************************************/
 #include "solution.h"
 
-
 Solution::Solution(int size)
 {
 	m_size = size;
-	for (int i=0; i<m_size; i++)
-		for (int j=0; j<m_size; j++)
-			matrix[i][j] = false;
+	
+	for (int i=0; i<size; i++)
+	{
+		m_matrix[i] = -1;
+	}
 }
 
 
@@ -33,65 +34,70 @@
 {
 }
 
-
-Solution::Solution(const Solution &input)
+Solution::Solution(const Solution& input)
 {
 	m_size = input.m_size;
 	for (int i=0; i<m_size; i++)
-		for (int j=0; j<m_size; j++)
-			matrix[i][j] = input.matrix[i][j];
+		m_matrix[i] = input.m_matrix[i];
 }
 
-
-void Solution::set(bool input[MAX_SIZE][MAX_SIZE])
+/*
+void Solution::set(unsigned char input[MAX_SIZE])
 {
 	for (int i=0; i<m_size; i++)
-		for (int j=0; j<m_size; j++)
-			matrix[i][j] = input[i][j];
-}
-
+		m_matrix[i] = input[i];
+}*/
 
-void Solution::rotate90()
+/*
+inline bool Solution::getMatrix(int x, int y)
+{
+	return (m_matrix[x] == y);
+}*/
+/*
+void Solution::setMatrix(int x, int y, bool val)
 {
-	bool temp[MAX_SIZE][MAX_SIZE];
+	if (val == true)
+		m_matrix[x] = y;
+	else
+		m_matrix[x] = -1;
+}*/
 
+bool Solution::operator ==(const Solution& s)
+{
+	const Solution& sol = dynamic_cast<const Solution&>(s);
 	for (int i=0; i<m_size; i++)
-		for (int j=0; j<m_size; j++) {
-			temp[j][(m_size-1)-i] = matrix[i][j];
-		}
-	set(temp);
+		if (m_matrix[i] != sol.m_matrix[i])
+			return false;
+	return true;
 }
 
-void Solution::mirror()
+Solution* Solution::copy()
 {
-	bool temp[MAX_SIZE][MAX_SIZE];
-
-	for (int i=0; i<m_size; i++)
-		for (int j=0; j<m_size;j++)
-			temp[i][(m_size-1)-j] = matrix[i][j];
-	set(temp);
+	return new Solution(*this);
 }
 
-
-bool Solution::operator==(const Solution& sol)
+/*
+void Solution::mirror()
 {
+	unsigned char temp[MAX_SIZE];
 	for (int i=0; i<m_size; i++)
-		for (int j=0; j<m_size; j++)
-			if (matrix[i][j] != sol.matrix[i][j])
-				return false;
-	return true;
-}
+		temp[i] = (m_size-1) - m_matrix[i];
+	set( temp );
+}*/
 
-bool Solution::operator!=(const Solution& sol)
+/*
+void Solution::rotate90()
 {
-	int matchcount = 0;
+	unsigned char temp[MAX_SIZE];
+		
 	for (int i=0; i<m_size; i++)
-		for (int j=0; j<m_size; j++)
-			if (matrix[i][j] == sol.matrix[i][j])
-				matchcount++;
-	if (matchcount == (m_size*2) )
-		return false;
-	else
-		return true;
-}
+	{
+		int x = i;
+		int y = m_matrix[i];
+
+		temp[y] = (m_size-1) - x;
+	} 
+		
+	set( temp);
+}*/