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

Changed dp calculation

Browse Source
This commit is contained in:
Raphael Maenle
2018-01-20 09:40:03 +01:00
parent 1c85bee091
commit 7a3b33455d
13 changed files with 57 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/header/input.h
View File

@ -8,7 +8,6 @@
#include "../functions/AbstractionLayers/Layer1/AbstractionLayer_1_Properties.h"
#include "../functions/AbstractionLayers/DestructionPower/DestructionPower_Properties.h"
#include "../functions/AbstractionLayers/LayerHistogram/AbstractionLayer_Histogram_Properties.h"
class LayerContainer;
@ -43,7 +42,6 @@ public:
bool set;
AbstractionLayer_1_Properties m_a1;
AbstractionLayer_Histogram_Properties m_Histogram;
private:
int32_t m_partID;
uint8_t m_numOfRotations;

5
Source/header/solve.h
View File

@ -9,7 +9,6 @@
#include "../functions/AbstractionLayers/Layer1/AbstractionLayer_1.h"
#include "../functions/AbstractionLayers/DestructionPower/DestructionPower.h"
#include "../functions/AbstractionLayers/LayerHistogram/AbstractionLayer_Histogram.h"
using namespace std;
@ -47,7 +46,6 @@ public:
createBox(); createp_box();
dp.PreProcessing({cols,rows}, nullptr);
a1.PreProcessing({cols,rows}, &p_myBox);
a3.PreProcessing({cols,rows},&p_myBox);
return true;
}
@ -55,10 +53,11 @@ public:
DestructionPower dp;
AbstractionLayer_1 a1;
AbstractionLayer_Histogram a3;
void removeConstrains(coor removeCoordinates);
void setConstraints(coor setConstraints, Part *constraintPiece);
int removeSimilar(qualityVector&, Part&);
void printPuzzle();
void printBox();
Mat resultImage(vector<LogEntry>&);