--- queensgui/src/queensmain.cpp	2007/07/19 22:26:42	2
+++ queensgui/src/queensmain.cpp	2007/07/22 20:19:43	13
@@ -31,15 +31,20 @@
 #include "queensmain.h"
 #include "board.h"
 #include "queens.h"
+
 #include "solution.h"
-#include "solutionvector.h"
-#include "solutionlist.h"
-#include "solutionhash.h"
-#include "solutionmnvector.h"
+#include "solutionmatrix.h"
+#include "solutionint.h"
+
+#include "containervector.h"
+#include "containerlist.h"
+#include "containerhash.h"
+#include "containermnvector.h"
+#include "containerminimalvector.h"
 
 #include "config.h"
 
-#define MatrixSolution Solution
+
 
 QueensMain::QueensMain(QWidget *parent, const char *name)
  : QDialog(parent, name)
@@ -78,10 +83,11 @@
     m_sizeSelector->setValue( 8 );
     m_board->setSize( 8 );
         
-	m_storage = StorageMatrix;
+	m_storage = StorageInt;
     m_sortalgo = SortList;
     m_solutions = NULL;
     m_queens = NULL;
+	m_sol = NULL;
     
     connect(m_quit, 
     	SIGNAL( clicked() ), 
@@ -124,6 +130,11 @@
 QueensMain::~QueensMain()
 {
     delete m_board;
+	
+	if (m_solutions != NULL)
+		delete m_solutions;
+	if (m_sol != NULL)
+		delete m_sol;
 }
 
 void QueensMain::start()
@@ -134,26 +145,32 @@
     m_list->clear();
     m_status->setText( QString("Searching ...") );
     
+	m_board->setMatrix(0);
+	
     if (m_queens != NULL) {
         m_queens->wait();
         delete m_queens;
+		m_queens = 0;
     }    
     
     if (m_solutions != NULL)
          delete m_solutions;
     switch (m_sortalgo) {
 	    case SortList:
-		    m_solutions = new SolutionList(this);
+		    m_solutions = new ContainerList(this);
 		    break;
 	    case SortVector:
-		    m_solutions = new SolutionVector(this);
+		    m_solutions = new ContainerVector(this);
 		    break;
 	    case SortHash:
-		    m_solutions = new SolutionHash(this);
+		    m_solutions = new ContainerHash(this);
 		    break;
 	    case SortMNVector:
-		    m_solutions = new SolutionMNVector(this);
+		    m_solutions = new ContainerMNVector(this);
 		    break;
+		case SortMinimalVector:
+			m_solutions = new ContainerMinimalVector(this);
+			break;
     }
 	
 	if (m_sol != NULL)
@@ -161,18 +178,17 @@
 	
 	switch(this->m_storage) {
 		case StorageInt:
-			#warning MatrixSolution<=>IntSolution
-			m_sol = new MatrixSolution(m_sizeSelector->value());
+			m_sol = new SolutionInt(m_sizeSelector->value());
 			break;
 		case StorageMatrix:
-			m_sol = new MatrixSolution(m_sizeSelector->value());
+			m_sol = new SolutionMatrix(m_sizeSelector->value());
 			break;
 	}
 
 
     m_elapsed.start();
     m_time.start();
-    m_queens = new Queens(this, m_solutions, m_sizeSelector->value() ,false);
+    m_queens = new Queens(this, m_sol, m_solutions, m_sizeSelector->value() ,false);
     m_queens->start();
 }
 
@@ -220,7 +236,7 @@
 {
 	int index = m_list->currentItem();
 	Solution* sol = m_solutions->solution( index );
-	m_board->setMatrix( *sol );
+	m_board->setMatrix( sol );
 }
 
 void QueensMain::resize(int size)
@@ -273,7 +289,7 @@
 {
 	QPopupMenu *contextMenu = new QPopupMenu( this );
 	contextMenu->setCheckable( true );
-	QLabel *sortCaption = new QLabel("<b><i>Sort algorithm</i></b>", this);
+	QLabel *sortCaption = new QLabel("<b><i>Container class</i></b>", this);
 	sortCaption->setAlignment( Qt::AlignCenter );
 	contextMenu->insertItem( sortCaption );
 
@@ -281,11 +297,13 @@
 	contextMenu->insertItem("Vector", this, SLOT( sortVector() ), 0, 2);
 	contextMenu->insertItem("Hash", this, SLOT( sortHash() ), 0, 3);
 	contextMenu->insertItem("M*N Vector", this, SLOT(sortMNVector()), 0, 4);
+	contextMenu->insertItem("Minimal Vector", this, SLOT(sortMinimalVector()), 0, 5);
 	
-	QLabel *storageCaption = new QLabel("<b><i>Storage class</i></b>", this);
+	QLabel *storageCaption = new QLabel("<b><i>Solution class</i></b>", this);
+	storageCaption->setAlignment( Qt::AlignCenter );
 	contextMenu->insertItem( storageCaption );
-	contextMenu->insertItem("Matrix Solution", this, SLOT( storageMatrix() ), 0, 5);
-	contextMenu->insertItem("Int Solution", this, SLOT( storageInt() ), 0, 6);
+	contextMenu->insertItem("Matrix Solution", this, SLOT( storageMatrix() ), 0, 6);
+	contextMenu->insertItem("Int Solution", this, SLOT( storageInt() ), 0, 7);
 
 
 	switch (m_sortalgo) {
@@ -301,14 +319,17 @@
 		case SortMNVector:
 			contextMenu->setItemChecked( 4, true);
 			break;
+		case SortMinimalVector:
+			contextMenu->setItemChecked( 5, true);
+			break;
 	}	
 	
 	switch (m_storage) {
 		case StorageMatrix:
-			contextMenu->setItemChecked(5, true);
+			contextMenu->setItemChecked(6, true);
 			break;
 		case StorageInt:
-			contextMenu->setItemChecked(6, true);
+			contextMenu->setItemChecked(7, true);
 			break;
 	}
 
@@ -349,6 +370,12 @@
 	m_sortalgo = SortMNVector;
 }
 
+void QueensMain::sortMinimalVector()
+{
+	m_sortalgo = SortMinimalVector;
+}
+
+
 void QueensMain::storageInt()
 {
 	m_storage = StorageInt;
@@ -360,3 +387,4 @@
 }
 
 
+