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

slight update to structure. going into subbranch now

Browse Source
This commit is contained in:
g-spacewhale
2017-11-21 11:19:51 +01:00
parent 665ad108d4
commit e947a8b24f
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ bool next(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat)
}
}
//cout << "next" << endl;
if(log.back().myCoor.n>36)
if(log.back().myCoor.n>8)
{
cout << "m: " << log.back().myCoor.m << " n: " << log.back().myCoor.n << endl;
status(log,p_Box,puzzleMat);
@@ -141,6 +141,7 @@ void abstractionlayer1solver(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box,
//remove all that do not fit according to abstraction layer 0
for(int i=0;i<(log.back().PieceCollector.size());)
{
//TODO: change checker from checking every box piece to only checking the simplifyed version ob the box with abstraction layer one
if(!(puzzleMat.testRotationPiece(log.back().myCoor.m, log.back().myCoor.n, *(log.back().PieceCollector[i]))))
{
log.back().PieceCollector.erase(log.back().PieceCollector.begin()+i);