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

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

Browse Source
This commit is contained in:
Raphael Maenle
2017-12-20 23:03:49 +01:00
parent 37eed7ef88 60e57b9ae0
commit 9720613543
9 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/functions/AbstractionLayers/AbstraktionLayer_Base.h
View File

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

2
Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h
View File

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

2
Source/functions/AbstractionLayers/DestructionPower/DestructionPower_Properties.h
View File

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

1
Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.h
View File

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

2
Source/functions/solve/classExtension.cpp
View File

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

7
Source/header.h
View File

@@ -11,5 +11,12 @@
using namespace std; using namespace std;
#include "header/input.h" #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" #include "header/solve.h"

4
Source/header/input.h
View File

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

2
Source/header/solve.h
View File

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

2
Source/main.cpp
View File

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