Difficulty can now be selected through the GUI and it will only Generate levels of the chosen difficulty

Author: RBrNx

difficultyanalyser.cpp

@@ -5,15 +5,36 @@ DifficultyAnalyser::DifficultyAnalyser(QObject *parent) : QObject(parent)
 
 }
 
-int DifficultyAnalyser::calculateDifficulty(SokoGenerator::Level level){
+QString DifficultyAnalyser::calculateDifficulty(SokoGenerator::Level level){
     int pushes = calculatePushes(level.solution);
     int lines = calculateLines(level.solution);
     int boxes = calculateBoxes(level);
     int score = 100 * (pushes + (4*lines) - (12*boxes));
+    int roomSize = (level.grid.size() - 2) * (level.grid[0].size() - 2);
 
-    int fC = furtherCalculations(level);
 
-    return score += fC;
+    if(score/roomSize <= 10){
+        return "Very Easy";
+    }
+    else if(score/roomSize >= 11 && score/roomSize <= 20){
+        return "Easy";
+    }
+    else if(score/roomSize >= 21 && score/roomSize <= 34){
+        return "Medium";
+    }
+    else if(score/roomSize >= 35 && score/roomSize <= 49){
+        return "Hard";
+    }
+    else if(score/roomSize >= 50){
+        return "Very Hard";
+    }
+    else{
+        return "No Value";
+    }
+
+    //int fC = furtherCalculations(level);
+
+    //return score/roomSize; //+= fC;
 }
 
 int DifficultyAnalyser::calculatePushes(string solution){

difficultyanalyser.h

@@ -12,7 +12,7 @@ class DifficultyAnalyser : public QObject
     Q_OBJECT
 public:
     explicit DifficultyAnalyser(QObject *parent = 0);
-    int calculateDifficulty(SokoGenerator::Level level);
+    QString calculateDifficulty(SokoGenerator::Level level);
 
 private:
     int calculatePushes(string solution);

mainwindow.cpp

@@ -1,11 +1,10 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "sokogenerator.h"
-#include "difficultyanalyser.h"
 #include <iostream>
 
 SokoGenerator Generator;
-DifficultyAnalyser diffAnanlyser;
+//DifficultyAnalyser diffAnanlyser;
 
 MainWindow::MainWindow(QWidget *parent):QMainWindow(parent),ui(new Ui::MainWindow)
 {
@@ -88,8 +87,8 @@ void MainWindow::addToList(int value){
     QString padMillis = QString("%1").arg(millis, 3, 10, QChar('0'));
     QString padSeconds = QString("%1").arg(seconds, 2, 10, QChar('0'));
     QString padMinutes = QString("%1").arg(minutes, 2, 10, QChar('0'));
-    int difficulty = diffAnanlyser.calculateDifficulty(levels[value-1]);
-    ui->list_LevelSet->addItem("Level " + QString::number(value) + " - " + padMinutes + ":" + padSeconds + ":" + padMillis + " - " + QString::number(difficulty));
+    QString diff = levels[value-1].difficulty;
+    ui->list_LevelSet->addItem("Level " + QString::number(value) + " - " + padMinutes + ":" + padSeconds + ":" + padMillis + " - " + diff);
     QVariant dataValue(value-1);
     ui->list_LevelSet->item(value-1)->setData(Qt::UserRole, dataValue);
 }

sokogenerator.cpp

@@ -2,6 +2,7 @@
 #include "mainwindow.h"
 #include <QMessageBox>
 #include <QDebug>
+#include "difficultyanalyser.h"
 
 
 SokoGenerator::SokoGenerator(QObject *parent):QObject(parent){
@@ -105,14 +106,16 @@ void SokoGenerator::generateLevel(int roomWidth, int roomHeight, int noOfBoxes,
     clock_t start = clock();
 
     while(!generationSuccessful && !threadStop){
-        if(isTimeout(start, timeout)){
+        if(isTimeout(start, timeout * 2)){
             generationSuccessful = false;
         }
 
         newLevel.grid.clear();
-        int _roomW, _roomH, _Boxes, _difficulty;
+        int _roomW, _roomH, _Boxes;
+        QString _difficulty;
         if(noOfBoxes == 0){ _Boxes = randomNumber(3, 6); } else { _Boxes = noOfBoxes; }
-        if(difficulty == 0){ _difficulty = randomNumber(1, 5); } else { _difficulty = difficulty; }
+        if(difficulty == 0){ difficulty = randomNumber(1, 5); } else { difficulty = difficulty; }
+        _difficulty = difficulties[difficulty-1];
         if(roomWidth == 0){ _roomW = randomNumber(3, 15, 3); } else { _roomW = roomWidth; }
         if(roomHeight == 0){
             if(_roomW == 3){ _roomH = randomNumber(6, 15, 3); }
@@ -132,7 +135,13 @@ void SokoGenerator::generateLevel(int roomWidth, int roomHeight, int noOfBoxes,
             struct solution sol;
             qDebug() << "Generation Started: ";
             generationSuccessful = solver.solve(lvl, timeout, sol);
-            if(generationSuccessful) newLevel.solution = cSolToString(sol);
+            if(generationSuccessful){
+                newLevel.solution = cSolToString(sol);
+                diffAnalyser = new DifficultyAnalyser;
+                newLevel.difficulty = diffAnalyser->calculateDifficulty(newLevel);
+                if(newLevel.difficulty != _difficulty){ generationSuccessful = false; }
+                delete diffAnalyser;
+            }
             qDebug() << "Generation Successful: " << generationSuccessful;
         }
     }
@@ -325,7 +334,7 @@ bool SokoGenerator::placeGoalsAndBoxes(SokoGenerator::Level &level, int roomWidt
     Level deadFields;
 
     while(!goalsPlaced && !threadStop){
-        if(isTimeout(start, timeout)){
+        if(isTimeout(start, timeout * 2)){
             break;
         }
 
@@ -343,7 +352,7 @@ bool SokoGenerator::placeGoalsAndBoxes(SokoGenerator::Level &level, int roomWidt
     deadFields = calcDeadFields(level);
 
     while(!boxesPlaced && !threadStop){
-        if(isTimeout(start, timeout)){
+        if(isTimeout(start, timeout * 2)){
             break;
         }
         xCoord = randomNumber(1, roomWidth);
@@ -377,7 +386,7 @@ bool SokoGenerator::placePlayer(SokoGenerator::Level &level, int roomWidth, int
     clock_t start = clock();
 
     while(!playerPlaced && !threadStop){
-        if(isTimeout(start, timeout)){
+        if(isTimeout(start, timeout * 2)){
             break;
         }
 
@@ -416,7 +425,9 @@ int SokoGenerator::neighbourCheck(SokoGenerator::Level &level, int yCoord, int x
 }
 
 void SokoGenerator::regenerateLevel(int lvlNum){
-    //srand(std::time(NULL));
+    generator.seed(chrono::steady_clock::now().time_since_epoch().count());
+    if(genSeed == 0){ genSeed = distribution(generator); }
+    srand(genSeed);
     bool generationSuccessful = false;
     Level newLevel;
     QTime timer;

sokogenerator.h

@@ -15,6 +15,8 @@
 #include <random>
 #include "solvercpp/solver.h"
 
+class DifficultyAnalyser;
+
 using namespace std;
 
 #define WALL '#'
@@ -41,12 +43,14 @@ class SokoGenerator : public QObject{
         TwoDVector_char grid;
         string solution;
         int generationTime;
+        QString difficulty;
     };
 
     explicit SokoGenerator(QObject *parent = 0);
     ~SokoGenerator();
 
     Solver solver;
+    DifficultyAnalyser* diffAnalyser;
     std::default_random_engine generator;
     std::uniform_int_distribution<int> distribution;
 
@@ -104,6 +108,8 @@ class SokoGenerator : public QObject{
     bool regenLevel = false;
     int regenLvlNum = 0;
 
+    QString difficulties[5]  = { "Very Easy", "Easy", "Medium", "Hard", "Very Hard" };
+
     std::vector<Level> levels;
     std::vector<Level> patterns;