rm-archive/PuzzleSolver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Layer Poempl and SURF working together

Browse Source
This commit is contained in:
c-weidinger 2018-01-27 10:22:24 +01:00
parent b0cb1aa417
commit 9e2abfd64d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/functions/solve/structure.cpp
View File

@ -78,12 +78,12 @@ void solve(vector<LogEntry>& log,Puzzle& puzzleMat)
switch(log.back().abstractionLevel) switch(log.back().abstractionLevel)
{ {
case 0://pömpel 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); //puzzleMat.a1.EvaluateQuality(log.back().myCoor, log.back().PieceCollector);
break; break;
case 1://poempelposition case 1://poempelposition
return; // return;
puzzleMat.a3.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); puzzleMat.a4.EvaluateQuality(log.back().myCoor,log.back().PieceCollector);
break; break;
case 4://SURFFeature case 4://SURFFeature
break; break;

4
Source/header/solve.h
View File

@ -44,8 +44,8 @@ public:
bool PreProcessing() bool PreProcessing()
{ {
createBox(); createp_box(); createBox(); createp_box();
// if(!dp.PreProcessing({cols,rows}, nullptr)) return false; if(!dp.PreProcessing({cols,rows}, nullptr)) return false;
// if(!a1.PreProcessing({cols,rows}, &p_myBox)) return false; if(!a1.PreProcessing({cols,rows}, &p_myBox)) return false;
// if(!a3.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; if(!a4.PreProcessing({cols,rows}, &p_myBox)) return false;