Added 'View Solution' to right-click menu.

Level Solution is now saved to the .sok file.
Levels already completed should now be impossible to generate.

Author: RBrNx

SokoGenerator.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.6.0, 2016-03-23T15:01:14. -->
+<!-- Written by QtCreator 3.6.0, 2016-03-23T17:46:23. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

mainwindow.cpp

@@ -264,6 +264,7 @@ void MainWindow::rightClickMenu(const QPoint &pos){
         QMenu submenu;
         submenu.addAction("Regenerate Level");
         submenu.addAction("Delete Level");
+        submenu.addAction("View Solution");
         QAction* rightClickItem = submenu.exec(PItem);
 
         if(rightClickItem && rightClickItem->text().contains("Delete Level")){
@@ -301,6 +302,19 @@ void MainWindow::rightClickMenu(const QPoint &pos){
                 displayLevel(row);
             }
         }
+        else if(rightClickItem && rightClickItem->text().contains("View Solution")){
+            int row = ui->list_LevelSet->indexAt(pos).row();
+            if(row >= 0){
+                vector<SokoGenerator::Level> levelSet = Generator.getLevels();
+                QString solution = QString::fromStdString(levelSet[row].solution);
+                for(int i = 0; i < solution.length(); i++){
+                    if(i % 50 == 0){
+                        solution.insert(i, QChar('\n'));
+                    }
+                }
+                QMessageBox::about(this, "Level " + QString::number(row+1) + " Solution", solution);
+            }
+        }
 
     }
 

sokogenerator.cpp

@@ -125,8 +125,10 @@ void SokoGenerator::generateLevel(int roomWidth, int roomHeight, int noOfBoxes,
         if(generationSuccessful) generationSuccessful = placePlayer(newLevel, _roomW, _roomH);
         if(generationSuccessful){
             level lvl = LevelToCLevel(newLevel);
+            struct solution sol;
             qDebug() << "Generation Started: ";
-            generationSuccessful = solver.solve(lvl, timeout);
+            generationSuccessful = solver.solve(lvl, timeout, sol);
+            if(generationSuccessful) newLevel.solution = cSolToString(sol);
             qDebug() << "Generation Successful: " << generationSuccessful;
         }
     }
@@ -345,7 +347,7 @@ bool SokoGenerator::placeGoalsAndBoxes(SokoGenerator::Level &level, int roomWidt
             }
         }
         else if(level.grid[yCoord][xCoord] == GOAL){
-            if(neighbourCheck(level, yCoord, xCoord)){
+            if(neighbourCheck(level, yCoord, xCoord) && boxCount < noOfBoxes-1){
                 level.grid[yCoord][xCoord] = BOXONGOAL;
                 boxCount++;
             }
@@ -438,8 +440,10 @@ void SokoGenerator::regenerateLevel(int lvlNum){
         if(generationSuccessful) placePlayer(newLevel, _roomW, _roomH);
         if(generationSuccessful){
             level lvl = LevelToCLevel(newLevel);
+            struct solution sol;
             qDebug() << "Generation Started: ";
-            generationSuccessful = solver.solve(lvl, timeout);
+            generationSuccessful = solver.solve(lvl, timeout, sol);
+            if(generationSuccessful) newLevel.solution = cSolToString(sol);
             qDebug() << "Generation Successful: " << generationSuccessful;
         }
     }
@@ -507,3 +511,16 @@ bool SokoGenerator::isTimeout(clock_t start, float timeout){
 
     return false;
 }
+
+string SokoGenerator::cSolToString(struct solution sol){
+    string characters = "ludrLUDR";
+    string solution;
+    for(int i = 0; i < MAXSOLUTION; i++){
+        char sChar = sol.move[i];
+        if(characters.find(sChar) != string::npos){
+            solution += sChar;
+        }
+    }
+
+    return solution;
+}

sokogenerator.h

@@ -76,6 +76,7 @@ class SokoGenerator : public QObject{
     void floodfill(TwoDVector_int &level, int row, int column, int roomWidth, int roomHeigh);
     bool neighbourCheck(SokoGenerator::Level &level, int yCoord, int xCoord);
     level LevelToCLevel(SokoGenerator::Level lvl);
+    string cSolToString(struct solution sol);
 
     void deleteLevel(int lvlNum){ levels.erase(levels.begin() + lvlNum); }
     bool isTimeout(clock_t start, float timeout);

solvercpp/solver.cpp

@@ -4,7 +4,7 @@ Solver::Solver(QObject *parent):QObject(parent){
 
 }
 
-bool Solver::solve(struct level Level, float t)
+bool Solver::solve(struct level Level, float t, struct solution &sol)
 {
     initialize_allocator();
 
@@ -13,6 +13,7 @@ bool Solver::solve(struct level Level, float t)
 	struct level* last = levels;
 	int count = 1;
     timeout = t;
+    qDebug() << "Solving";
 
     while (last != NULL && !threadStop)
 	{
@@ -31,10 +32,13 @@ bool Solver::solve(struct level Level, float t)
 		{
             try_solve_level();
 			if (solvable)
-				if (!check_solution(&lvl_sol, last,0))
+                if (!check_solution(&lvl_sol, last,0)){
 					solvable = 0;
-                else
+                }
+                else{
+                    sol = lvl_sol;
                     return 1;
+                }
 		}
 
         if(DOUT)printf("Next Level: %p\n", last->next_level);

solvercpp/solver.h

@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <QOBject>
+#include <QDebug>
 #include <chrono>
 
 extern "C" {
@@ -25,7 +26,7 @@ class Solver : public QObject{
     Q_OBJECT
 public:
     Solver(QObject *parent = 0);
-    bool solve(level Level, float t);
+    bool solve(level Level, float t, struct solution &sol);
     void setThreadStop(bool value) { threadStop = value; }
 private:
     void print_binary(unsigned int x);