Merge branch 'Team_CMU_MergeBase' of https://github.com/MMRVZ2017/MPK.Puzzle into Team_CMU_MergeBase

Source/functions/AbstractionLayers/AbstraktionLayer_Base.h

@@ -4,7 +4,6 @@
 #include <map>
 #include <vector>
 #include "../../header/solve.h"
-#include "../../header/input.h"
 
 using namespace std;
 

Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h

@@ -14,7 +14,7 @@
 #include <bitset>
 #include <random>
 
-class DestructionPower : public AbstraktionLayer_Base <DestructionPower_Properties>
+class DestructionPower : public AbstraktionLayer_Base<DestructionPower_Properties>
 {
 public:
     void PreProcessing(const vector<Part*>* partArray);//override

Source/functions/AbstractionLayers/DestructionPower/DestructionPower_Properties.h

@@ -44,4 +44,4 @@ map<int,float> DestructionPower_Properties::create_SpeedTable()
     return m;
 }
 
-#endif //SOURCE_ABSTRACTIONLAYER_1_PROPERTIES_H
+#endif //SOURCE_DESTRUCTIONPOWER_PROPERTIES_H

Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.h

@@ -6,6 +6,7 @@
 #define SOURCE_ABSTRACTIONLAYER_1_H
 
 #include "../AbstraktionLayer_Base.h"
+#include "AbstractionLayer_1_Properties.h"
 #include <vector>
 #include <iostream>
 #include <bitset>

Source/functions/solve/classExtension.cpp

@@ -1,7 +1,5 @@
 #include "../../header.h"
 
-
-
 //use this in second abstraction layer maybe ey?
 void createRandomAbstraction2()
 {

Source/header.h

@@ -11,5 +11,12 @@
 
 using namespace std;
 
+
 #include "header/input.h"
+
+/**
+ * IMPORTANT: Each new layer must be included there, to avoid compile errors
+ */
+#include "functions/AbstractionLayers/Layer1/AbstractionLayer_1.h"
+#include "functions/AbstractionLayers/DestructionPower/DestructionPower.h"
 #include "header/solve.h"

Source/header/input.h

@@ -1,7 +1,7 @@
 #include <stdint.h>
 
-class AbstractionLayer_1_Properties;
-class DestructionPower_Properties;
+#include "../functions/AbstractionLayers/Layer1/AbstractionLayer_1_Properties.h"
+#include "../functions/AbstractionLayers/DestructionPower/DestructionPower_Properties.h"
 class Part
 {
 public:

Source/header/solve.h

@@ -6,6 +6,8 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
+class Part;
+
 using namespace std;
 
 class coor

Source/main.cpp

@@ -1,9 +1,9 @@
 #include "header.h"
+#include "header/input.h"
 
 int LogEntry::randomed(0);
 unsigned int PuzzlePiece::idcount(0);
 
-
 int main()
 {