From a289ccee571001e2bf79b2290db5dd325f2fcfc6 Mon Sep 17 00:00:00 2001 From: Raphael Maenle <17550607+g-spacewhale@users.noreply.github.com> Date: Sat, 27 Jan 2018 13:24:44 +0100 Subject: [PATCH] added cut back --- .../Layer_SURFFeatures/AbstractionLayer_SURFFeatures.h | 2 +- Source/functions/solve/structure.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/functions/AbstractionLayers/Layer_SURFFeatures/AbstractionLayer_SURFFeatures.h b/Source/functions/AbstractionLayers/Layer_SURFFeatures/AbstractionLayer_SURFFeatures.h index 5dd0070..bacda38 100644 --- a/Source/functions/AbstractionLayers/Layer_SURFFeatures/AbstractionLayer_SURFFeatures.h +++ b/Source/functions/AbstractionLayers/Layer_SURFFeatures/AbstractionLayer_SURFFeatures.h @@ -6,7 +6,7 @@ #include "opencv2/imgproc/imgproc.hpp" #ifdef _WIN32 -#define PATH_FULL_PUZZLE "..\\..\\..\\puzzle_img\\puzzle2.jpg" +#define PATH_FULL_PUZZLE "..\\..\\..\\puzzle_img\\puzzle1.jpg" #elif defined __unix__ #define PATH_FULL_PUZZLE "..//..//..//puzzle_img//puzzle1.jpg" #elif defined __APPLE__ diff --git a/Source/functions/solve/structure.cpp b/Source/functions/solve/structure.cpp index 0000be1..93860b5 100755 --- a/Source/functions/solve/structure.cpp +++ b/Source/functions/solve/structure.cpp @@ -226,7 +226,7 @@ float capLogElements(vector& log) newid = id; } } - //cut(log,newid); + cut(log,newid); vectorsizeAfter = log.back().PieceCollector.size(); destroyed = ((double)vectorsizeBefore - (double)vectorsizeAfter) / (double)vectorsizeBefore; @@ -241,7 +241,6 @@ void cut(vector& log, int& cutID) { while(cutID