--- queensgui/src/queensmain.cpp 2007/07/22 09:37:21 12 +++ queensgui/src/queensmain.cpp 2007/07/22 20:19:43 13 @@ -40,6 +40,7 @@ #include "containerlist.h" #include "containerhash.h" #include "containermnvector.h" +#include "containerminimalvector.h" #include "config.h" @@ -167,6 +168,9 @@ case SortMNVector: m_solutions = new ContainerMNVector(this); break; + case SortMinimalVector: + m_solutions = new ContainerMinimalVector(this); + break; } if (m_sol != NULL) @@ -293,12 +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("Solution class", 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) { @@ -314,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; } @@ -362,6 +370,12 @@ m_sortalgo = SortMNVector; } +void QueensMain::sortMinimalVector() +{ + m_sortalgo = SortMinimalVector; +} + + void QueensMain::storageInt() { m_storage = StorageInt; @@ -373,3 +387,4 @@ } +