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

fixed backtrack bug in logslasher function

Browse Source
This commit is contained in:
Raphael Maenle 2018-01-20 22:31:56 +01:00
parent bc1a7eb6b5
commit cefa63da54
2 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,7 @@ bool backtrack(vector<LogEntry>& log, Puzzle& puzzleMat)
//if more pieces possible, tset piece as not logged //if more pieces possible, tset piece as not logged
if((log.back().PieceCollector.size())>1) if((log.back().PieceCollector.size())>1)
{ {
cout << " next piece" << endl; //unset puzzlepieces
int count =0; int count =0;
for(int i=0;i<puzzleMat.p_myBox.size();i++) for(int i=0;i<puzzleMat.p_myBox.size();i++)
{ {
@ -150,48 +150,43 @@ bool backtrack(vector<LogEntry>& log, Puzzle& puzzleMat)
count++; count++;
} }
} }
cout << "removed " << count << endl;
if (count !=4) //remove similar in log
cerr << "incorrect set set" << endl;
Part myPart = *log.back().PieceCollector[0].second;//tmpsaves bad part Part myPart = *log.back().PieceCollector[0].second;//tmpsaves bad part
log.back().PieceCollector.erase(log.back().PieceCollector.begin());//removes bad part from log log.back().PieceCollector.erase(log.back().PieceCollector.begin());//removes bad part from log
puzzleMat.removeSimilar(log.back().PieceCollector,myPart); //removes all pieces from log that are similar to bad part puzzleMat.removeSimilar(log.back().PieceCollector,myPart); //removes all pieces from log that are similar to bad part
//TODO remove this when further layers are added!!! //TODO remove this when further layers are added!!!
if(log.back().PieceCollector.size()) // this checks if 'removeSimilar' has cleared entire LogElement
{
if(log.back().PieceCollector.size()==1) cout << " next piece" << endl;
log.back().decreaseRandomed(); if(log.back().PieceCollector.size()==1)
log.back().decreaseRandomed();
setsolution(log,puzzleMat); setsolution(log,puzzleMat);
return true;
return true; }
} }
//else remove log element and backtrack once more //else remove log element and backtrack once more
else puzzleMat.removeConstrains(log.back().myCoor); //this should remove constraints from all layers
int count =0;
if((log.back().PieceCollector.size()))
{ {
for(int i=0;i<puzzleMat.p_myBox.size();i++)
puzzleMat.removeConstrains(log.back().myCoor); //this should remove constraints from all layers
int count =0;
if((log.back().PieceCollector.size()))
{ {
for(int i=0;i<puzzleMat.p_myBox.size();i++) if(puzzleMat.p_myBox[i]->GetPartID()==log.back().PieceCollector.begin()->second->GetPartID())//sets all with partid
{ {
if(puzzleMat.p_myBox[i]->GetPartID()==log.back().PieceCollector.begin()->second->GetPartID())//sets all with partid puzzleMat.p_myBox[i]->set=false;
{ count++;
puzzleMat.p_myBox[i]->set=false;
count++;
}
} }
if (count !=4)
cerr << "incorrect set set" << endl;
} }
cout << " no more pieces" << endl; cout << "removed " << count << endl;
log.pop_back();
if(!backtrack(log,puzzleMat))
return false;
return true;
} }
cout << " no more pieces" << endl;
log.pop_back();
if(!backtrack(log,puzzleMat))
return false;
return true;
} }

4
Source/main.cpp
View File

@ -15,14 +15,14 @@ int main()
return 0; return 0;
} }
puzzleMat.createRandomBox(); //puzzleMat.createRandomBox();
cout << "Solving Puzzle now..."; cout << "Solving Puzzle now...";
while(next(log, puzzleMat)); while(next(log, puzzleMat));
cout << "Done!" << endl; cout << "Done!" << endl;
//puzzleMat.resultImage(log); puzzleMat.resultImage(log);
puzzleMat.printPuzzle(); puzzleMat.printPuzzle();