diff --git a/Source/functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching.cpp b/Source/functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching.cpp index f791ba4..a256a51 100644 --- a/Source/functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching.cpp +++ b/Source/functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching.cpp @@ -8,7 +8,7 @@ bool AbstractionLayer_ColorMatching::PreProcessing(coor mySize, const vector #include - +#define PATH_FULL_PUZZLE "..\\..\\..\\puzzle_img_bb\\puzzle2.jpg" #ifdef _WIN32 //#define PATH "..\\..\\..\\pieces\\%04d.jpg" #elif defined __unix__ diff --git a/Source/functions/solve/structure.cpp b/Source/functions/solve/structure.cpp index 7453793..e0787c5 100755 --- a/Source/functions/solve/structure.cpp +++ b/Source/functions/solve/structure.cpp @@ -127,6 +127,7 @@ void setsolution(vector& log, Puzzle& puzzleMat) bool backtrack(vector& log, Puzzle& puzzleMat) { + puzzleMat.resultImage(log); cout << "backtrack" << endl; if(log.empty()) { @@ -209,6 +210,7 @@ float capLogElements(vector& log) } cut(log,id);//for debugging return 0;//for debugging + int newid=0; //check if all over if(id==log.back().PieceCollector.size())