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

added DestructionLayer, fixed minor problems

Browse Source
This commit is contained in:
Raphael Maenle 2017-12-20 22:10:08 +01:00
parent 23d97293a3
commit b0aaeb84b2
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,8 +2,8 @@
// Created by mpapa on 05.12.2017. // Created by mpapa on 05.12.2017.
// //
#ifndef SOURCE_ABSTRACTIONLAYER_1_H #ifndef SOURCE_DESTRUCTIONPOWER_H
#define SOURCE_ABSTRACTIONLAYER_1_H #define SOURCE_DESTRUCTIONPOWER_H
#define DESTRUCTION_INIT 0.5 #define DESTRUCTION_INIT 0.5
#define DESTRUCTION_COUNT 1 #define DESTRUCTION_COUNT 1
@ -15,7 +15,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
@ -28,4 +28,4 @@ public:
private: private:
}; };
#endif //SOURCE_ABSTRACTIONLAYER_1_H #endif //SOURCE_DESTRUCTIONPOWER_H

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

@ -2,8 +2,8 @@
// Created by mpapa on 05.12.2017. // Created by mpapa on 05.12.2017.
// //
#ifndef SOURCE_ABSTRACTIONLAYER_1_PROPERTIES_H #ifndef SOURCE_DESTRUCTIONPOWER_PROPERTIES_H
#define SOURCE_ABSTRACTIONLAYER_1_PROPERTIES_H #define SOURCE_DESTRUCTIONPOWER_PROPERTIES_H

12
Source/header/solve.h
View File

@ -39,10 +39,10 @@ private:
static int randomed; static int randomed;
}; };
bool next(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat); bool next(vector<LogEntry>& log, vector<Part*>& p_Box, Puzzle& puzzleMat);
coor calculateNextCoor(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat); coor calculateNextCoor(vector<LogEntry>& log, vector<Part*>& p_Box, Puzzle& puzzleMat);
void solve(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat); void solve(vector<LogEntry>& log, vector<Part*>& p_Box, Puzzle& puzzleMat);
void setsolution(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat); void setsolution(vector<LogEntry>& log, vector<Part*>& p_Box, Puzzle& puzzleMat);
bool backtrack(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, puzzleMat); bool backtrack(vector<LogEntry>& log, vector<Part*>& p_Box, puzzleMat);
void createNextLogElement(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat); void createNextLogElement(vector<LogEntry>& log, vector<Part*>& p_Box, Puzzle& puzzleMat);