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

added cut back

Browse Source
This commit is contained in:
Raphael Maenle
2018-01-27 13:24:44 +01:00
parent be49687f31
commit a289ccee57
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/functions/AbstractionLayers/Layer_SURFFeatures/AbstractionLayer_SURFFeatures.h
View File

@@ -6,7 +6,7 @@
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
#ifdef _WIN32 #ifdef _WIN32
#define PATH_FULL_PUZZLE "..\\..\\..\\puzzle_img\\puzzle2.jpg" #define PATH_FULL_PUZZLE "..\\..\\..\\puzzle_img\\puzzle1.jpg"
#elif defined __unix__ #elif defined __unix__
#define PATH_FULL_PUZZLE "..//..//..//puzzle_img//puzzle1.jpg" #define PATH_FULL_PUZZLE "..//..//..//puzzle_img//puzzle1.jpg"
#elif defined __APPLE__ #elif defined __APPLE__

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

@@ -226,7 +226,7 @@ float capLogElements(vector<LogEntry>& log)
newid = id; newid = id;
} }
} }
//cut(log,newid); cut(log,newid);
vectorsizeAfter = log.back().PieceCollector.size(); vectorsizeAfter = log.back().PieceCollector.size();
destroyed = ((double)vectorsizeBefore - (double)vectorsizeAfter) / (double)vectorsizeBefore; destroyed = ((double)vectorsizeBefore - (double)vectorsizeAfter) / (double)vectorsizeBefore;
@@ -241,7 +241,6 @@ void cut(vector<LogEntry>& log, int& cutID)
{ {
while(cutID<log.back().PieceCollector.size()) while(cutID<log.back().PieceCollector.size())
{ {
cerr << "!";
log.back().PieceCollector.erase(log.back().PieceCollector.begin()+cutID); log.back().PieceCollector.erase(log.back().PieceCollector.begin()+cutID);
} }
cerr << endl; cerr << endl;