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

added a4 result presentation

Browse Source
This commit is contained in:
Raphael Maenle 2018-01-27 13:54:09 +01:00
parent a289ccee57
commit d3d7d53a45
3 changed files with 9 additions and 12 deletions
Show Stats 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"
#ifdef _WIN32
#define PATH_FULL_PUZZLE "..\\..\\..\\puzzle_img\\puzzle1.jpg"
#define PATH_FULL_PUZZLE "..\\..\\..\\puzzle_img\\puzzle2.jpg"
#elif defined __unix__
#define PATH_FULL_PUZZLE "..//..//..//puzzle_img//puzzle1.jpg"
#elif defined __APPLE__

12
Source/functions/solve/puzzleExtension.cpp
View File

@ -65,8 +65,8 @@ void Puzzle::shuffle()
//deletes all constraints from all abstractionlayers
void Puzzle::removeConstrains(coor removeCoordinates)
{
// this->a1.RemoveConstraintOnPosition(removeCoordinates);
// this->a3.RemoveConstraintOnPosition(removeCoordinates);
this->a1.RemoveConstraintOnPosition(removeCoordinates);
//this->a3.RemoveConstraintOnPosition(removeCoordinates);
this->a4.RemoveConstraintOnPosition(removeCoordinates);
//TODO!! Add other layer remove here
}
@ -78,7 +78,7 @@ void Puzzle::setConstraints(coor setConstraints, Part* constraintPiece)
// this->dp.m_constraintMatrix[setConstraints.col][setConstraints.row].DestructionArray.emplace_back(it);
//a1
//this->a1.SetConstraintOnPosition(setConstraints,constraintPiece->m_a1);
this->a1.SetConstraintOnPosition(setConstraints,constraintPiece->m_a1);
//a3
//this->a3.SetConstraintOnPosition(setConstraints,constraintPiece->m_a3);
@ -192,12 +192,6 @@ Mat Puzzle::resultImage( vector<LogEntry>& log){
Mat invert = Mat::ones(img.size(), CV_8UC3); // invert for rotation to work correctly
bitwise_not ( img, invert );
if (it.myCoor.col == 35 && it.myCoor.row == 5)
{
//imshow("img",img);
//waitKey(0);
;
}
int angle = ((int)it.PieceCollector[0].second->GetNumOfRotations())*-90;

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

@ -95,8 +95,6 @@ void solve(vector<LogEntry>& log,Puzzle& puzzleMat)
break;
}
float worth = capLogElements(log);
cout << " | " << worth << endl;
// calculateTrueDestructionPower(log,puzzleMat, worth);
CalculateNewCombinedQuality(log, log.back().PieceCollector, puzzleMat.combinedQualityVector);
@ -120,6 +118,11 @@ void setsolution(vector<LogEntry>& log, Puzzle& puzzleMat)
cout << "set:" << log.back().myCoor.col << "," << log.back().myCoor.row << endl;
//cout << "ID: " << log.back().PieceCollector[0].second->GetPartID() << endl;
cout << "Size of Log: " << log.back().PieceCollector.size() << endl;
//if(log.back().myCoor.col==32 && log.back().myCoor.row==16)
//{
// puzzleMat.resultImage(log);
// waitKey(0);
// }
}
bool backtrack(vector<LogEntry>& log, Puzzle& puzzleMat)