Merge branch 'Team_CMU_MergeBase' of https://github.com/MMRVZ2017/MPK.Puzzle into Team_CMU_MergeBase
This commit is contained in:
		@@ -4,7 +4,6 @@
 | 
			
		||||
#include <map>
 | 
			
		||||
#include <vector>
 | 
			
		||||
#include "../../header/solve.h"
 | 
			
		||||
#include "../../header/input.h"
 | 
			
		||||
 | 
			
		||||
using namespace std;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -44,4 +44,4 @@ map<int,float> DestructionPower_Properties::create_SpeedTable()
 | 
			
		||||
    return m;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#endif //SOURCE_ABSTRACTIONLAYER_1_PROPERTIES_H
 | 
			
		||||
#endif //SOURCE_DESTRUCTIONPOWER_PROPERTIES_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>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user