diff --git a/Source/functions/solve/structure.cpp b/Source/functions/solve/structure.cpp index 074a093..0000be1 100755 --- a/Source/functions/solve/structure.cpp +++ b/Source/functions/solve/structure.cpp @@ -78,12 +78,12 @@ void solve(vector& log,Puzzle& puzzleMat) switch(log.back().abstractionLevel) { case 0://pömpel - puzzleMat.a4.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); + puzzleMat.a1.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); //puzzleMat.a1.EvaluateQuality(log.back().myCoor, log.back().PieceCollector); break; case 1://poempelposition - return; - puzzleMat.a3.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); +// return; + puzzleMat.a4.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); break; case 4://SURFFeature break; diff --git a/Source/header/solve.h b/Source/header/solve.h index dcec481..0a7cb73 100755 --- a/Source/header/solve.h +++ b/Source/header/solve.h @@ -44,8 +44,8 @@ public: bool PreProcessing() { createBox(); createp_box(); -// if(!dp.PreProcessing({cols,rows}, nullptr)) return false; -// if(!a1.PreProcessing({cols,rows}, &p_myBox)) return false; + if(!dp.PreProcessing({cols,rows}, nullptr)) return false; + if(!a1.PreProcessing({cols,rows}, &p_myBox)) return false; // if(!a3.PreProcessing({cols,rows}, &p_myBox)) return false; if(!a4.PreProcessing({cols,rows}, &p_myBox)) return false;