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

removed bloat

Browse Source
This commit is contained in:
Raphael Maenle 2018-01-20 15:05:54 +01:00
parent 9863c8b9e8
commit fe04ebcd01
3 changed files with 1 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Source/functions/AbstractionLayers/LayerMeanDifference/AbstractionLayer_MeanDifference.h
View File

@ -1,35 +0,0 @@
//
// Created by Niko on 1/15/2018.
//
#ifndef MPK_PUZZLE_ABSTRACTIONLAYER_MEANDIFFERENCE_H
#define MPK_PUZZLE_ABSTRACTIONLAYER_MEANDIFFERENCE_H
#define DISPLAY false
#define PATH "..\\..\\..\\pieces\\%04d.jpg"
using namespace std;
using namespace cv;
class AbstractionLayer_MeanDifference : public AbstractionLayer_Base<AbstractionLayer_MeanDifference_Properties>
{
public:
bool PreProcessing(coor mySize, const vector<Part*>* partArray) override ;
bool EvaluateQuality ( coor constraintCoordinate, qualityVector& qVector)override;
bool SetConstraintOnPosition( coor constraintCoordinate, AbstractionLayer_1_Properties constraint)override;
bool RemoveConstraintOnPosition( coor constraintCoordinate)override;
bool PlaceOfPartGood(coor myCoor, Mat& myPart);
qualityVector returnInBox(vector<Part>& PuzzleBox);
void printConstraintMatrix();
private:
};
class cMeanDifference{
public:
Mat readImages(int);
bool calculateMeanDifference(Mat Part, Mat RefPart);
private:
};
#endif //MPK_PUZZLE_ABSTRACTIONLAYER_MEANDIFFERENCE_H

20
Source/functions/AbstractionLayers/LayerMeanDifference/AbstractionLayer_MeanDifference_Properties.h
View File

@ -1,20 +0,0 @@
//
// Created by Niko on 1/15/2018.
//
#ifndef MPK_PUZZLE_ABSTRACTIONLAYER_MEANDIFFERENCE_PROPERTIES_H
#define MPK_PUZZLE_ABSTRACTIONLAYER_MEANDIFFERENCE_PROPERTIES_H
class AbstractionLayer_MeanDifference_Properties
{
public:
AbstractionLayer_MeanDifference_Properties() : MeanDifference(-1){}
double getMeanDifference(){return MeanDifference;};
private:
double MeanDifference;
friend class AbstractionLayer_MeanDifference;
Mat image;
};
#endif //MPK_PUZZLE_ABSTRACTIONLAYER_MEANDIFFERENCE_PROPERTIES_H

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

@ -45,10 +45,7 @@ void createNextLogElement(vector<LogEntry>& log, Puzzle& puzzleMat)
log.back().myCoor = calculateNextCoor(log, puzzleMat); log.back().myCoor = calculateNextCoor(log, puzzleMat);
puzzleMat.dp.DestructionOfSurrounding(log.back().myCoor);//calculate dp from surrounding puzzleMat.dp.DestructionOfSurrounding(log.back().myCoor);//calculate dp from surrounding
cout << "-----------------------" << endl; cout << "-----------------------" << endl;
cout << "destr-array:" << endl; //get all not set pieces
for(auto it:puzzleMat.dp.m_constraintMatrix[log.back().myCoor.col][log.back().myCoor.row].DestructionArray)
cout << it << endl;
//get all not set pieces
for(auto it:puzzleMat.p_myBox) for(auto it:puzzleMat.p_myBox)
if(!it->set) if(!it->set)
log.back().PieceCollector.emplace_back(pair<float,Part*>(0,it)); log.back().PieceCollector.emplace_back(pair<float,Part*>(0,it));
@ -76,7 +73,6 @@ coor calculateNextCoor(vector<LogEntry>& log, Puzzle& puzzleMat)
void solve(vector<LogEntry>& log,Puzzle& puzzleMat) void solve(vector<LogEntry>& log,Puzzle& puzzleMat)
{ {
log.back().abstractionLevel = puzzleMat.dp.getNextAbstractionLayer(log.back().myCoor,log.back().abstractionLevel); //sets in abstractionLevel log.back().abstractionLevel = puzzleMat.dp.getNextAbstractionLayer(log.back().myCoor,log.back().abstractionLevel); //sets in abstractionLevel
cout << "ab: " << log.back().abstractionLevel << endl;
//status(log,p_Box,puzzleMat); //status(log,p_Box,puzzleMat);
//TODO!! Add more layers here //TODO!! Add more layers here
switch(log.back().abstractionLevel) switch(log.back().abstractionLevel)