From fe04ebcd0137312394fdd7b734d70cce98eb6758 Mon Sep 17 00:00:00 2001
From: Raphael Maenle <17550607+g-spacewhale@users.noreply.github.com>
Date: Sat, 20 Jan 2018 15:05:54 +0100
Subject: [PATCH] removed bloat

---
 .../AbstractionLayer_MeanDifference.h         | 35 -------------------
 ...stractionLayer_MeanDifference_Properties.h | 20 -----------
 Source/functions/solve/structure.cpp          |  6 +---
 3 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 Source/functions/AbstractionLayers/LayerMeanDifference/AbstractionLayer_MeanDifference.h
 delete mode 100644 Source/functions/AbstractionLayers/LayerMeanDifference/AbstractionLayer_MeanDifference_Properties.h

diff --git a/Source/functions/AbstractionLayers/LayerMeanDifference/AbstractionLayer_MeanDifference.h b/Source/functions/AbstractionLayers/LayerMeanDifference/AbstractionLayer_MeanDifference.h
deleted file mode 100644
index b3556c2..0000000
--- a/Source/functions/AbstractionLayers/LayerMeanDifference/AbstractionLayer_MeanDifference.h
+++ /dev/null
@@ -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
diff --git a/Source/functions/AbstractionLayers/LayerMeanDifference/AbstractionLayer_MeanDifference_Properties.h b/Source/functions/AbstractionLayers/LayerMeanDifference/AbstractionLayer_MeanDifference_Properties.h
deleted file mode 100644
index 2a1cdd9..0000000
--- a/Source/functions/AbstractionLayers/LayerMeanDifference/AbstractionLayer_MeanDifference_Properties.h
+++ /dev/null
@@ -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
diff --git a/Source/functions/solve/structure.cpp b/Source/functions/solve/structure.cpp
index 27bed9e..8ec6b68 100755
--- a/Source/functions/solve/structure.cpp
+++ b/Source/functions/solve/structure.cpp
@@ -45,10 +45,7 @@ void createNextLogElement(vector<LogEntry>& log, Puzzle& puzzleMat)
    	log.back().myCoor = calculateNextCoor(log, puzzleMat);
     puzzleMat.dp.DestructionOfSurrounding(log.back().myCoor);//calculate dp from surrounding
     cout << "-----------------------" << endl;
-    cout << "destr-array:" << endl;
-    for(auto it:puzzleMat.dp.m_constraintMatrix[log.back().myCoor.col][log.back().myCoor.row].DestructionArray)
-        cout << it << endl;
-    //get all not set pieces
+     //get all not set pieces
     for(auto it:puzzleMat.p_myBox)
         if(!it->set)
             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)
 {
 	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);
     //TODO!! Add more layers here
     switch(log.back().abstractionLevel)