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 <vector>
#include "../../header/solve.h"
#include "../../header/input.h"
using namespace std;

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

@ -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

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

@ -44,4 +44,4 @@ map<int,float> DestructionPower_Properties::create_SpeedTable()
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
#include "../AbstraktionLayer_Base.h"
#include "AbstractionLayer_1_Properties.h"
#include <vector>
#include <iostream>
#include <bitset>

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

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