From 5029044157d72c52a758d4604c13805de4973852 Mon Sep 17 00:00:00 2001
From: Raphael Maenle <17550607+g-spacewhale@users.noreply.github.com>
Date: Mon, 29 Jan 2018 13:41:19 +0100
Subject: [PATCH] stash

---
 .../Layer_ColorMatching/AbstractionLayer_ColorMatching.cpp      | 2 +-
 .../Layer_ColorMatching/AbstractionLayer_ColorMatching.h        | 2 +-
 Source/functions/solve/structure.cpp                            | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

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<Par
     InitialiseConstraintMatrixSize(mySize.col, mySize.row); //col row switched in this function
 
     //**Get color for constraint matrix**//
-    Mat puzzle = imread("puzzle1.jpg", IMREAD_COLOR); // Read the picture of the puzzle
+    Mat puzzle = imread(PATH_FULL_PUZZLE, IMREAD_COLOR); // Read the picture of the puzzle
     if (puzzle.empty())                      // Check for invalid input
     {
         cout << "Could not open or find the image" << std::endl;
diff --git a/Source/functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching.h b/Source/functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching.h
index 3c5da05..7243f26 100644
--- a/Source/functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching.h
+++ b/Source/functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching.h
@@ -16,7 +16,7 @@
 //#include <cstdlib>
 #include <cmath>
 
-
+#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<LogEntry>& log, Puzzle& puzzleMat)
 
 bool backtrack(vector<LogEntry>& log, Puzzle& puzzleMat)
 {
+    puzzleMat.resultImage(log);
     cout << "backtrack" << endl;
     if(log.empty())
     {
@@ -209,6 +210,7 @@ float capLogElements(vector<LogEntry>& log)
     }
     cut(log,id);//for debugging
     return 0;//for debugging
+
     int newid=0;
     //check if all over
     if(id==log.back().PieceCollector.size())