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-22 23:00:31 +01:00
commit 7c8d9cffe9
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.cpp
View File

@ -40,7 +40,7 @@ bool AbstractionLayer_1::CreateRandomPuzzle()
simple_rand.seed((unsigned int)"dumbo"); simple_rand.seed((unsigned int)"dumbo");
for(int col = 1; col < m_constraintMatrix.size()-1; col++){ for(int col = 1; col < m_constraintMatrix.size()-1; col++){
for(int row=1;row<m_constraintMatrix[col].size()-1;) for(int row = 1; row < (m_constraintMatrix[col].size() - 1);)
{ {
//create random piece //create random piece
uint8_t tempPiece = 0b00000000; uint8_t tempPiece = 0b00000000;
@ -76,7 +76,10 @@ bool AbstractionLayer_1::CreateRandomPuzzle()
//set piece if piece good //set piece if piece good
if(PlaceOfPartGood(coor(col,row),tempPiece)) if(PlaceOfPartGood(coor(col,row),tempPiece))
row++; {
row++; // Sollte er hier nicht das Puzzleteil irgendwo abspeichern? Weiß aber nicht ob die constraint layer der richtige platz ist, oder nicht eine neue, bzw. die puzzlebox
m_constraintMatrix[col][row].m_connections = tempPiece;
}
} }
} }
@ -100,7 +103,7 @@ void AbstractionLayer_1::setEdgeZero()
{ {
for(int col = 0; col < m_constraintMatrix.size(); col++) for(int col = 0; col < m_constraintMatrix.size(); col++)
for(int row = 0; row < m_constraintMatrix[col].size(); row++) for(int row = 0; row < m_constraintMatrix[col].size(); row++)
if(col ==0 || col == m_constraintMatrix.size()-1 || row == 0 || row == m_constraintMatrix[col].size()-1) if(col == 0 || col == (m_constraintMatrix.size() - 1) || row == 0 || row == (m_constraintMatrix[col].size() - 1))
m_constraintMatrix[col][row].m_connections=0b00000000; m_constraintMatrix[col][row].m_connections=0b00000000;
} }

7
Source/functions/solve/puzzleExtension.cpp
View File

@ -20,7 +20,7 @@ void Puzzle::putIntoBox()
{ {
//TODO! add rotation of all parts //TODO! add rotation of all parts
//TODO! add id to every part (how) //TODO! add id to every part (how)
tmpPart.m_test1=this->a1->m_constraintMatrix[i][j]; tmpPart.m_test1=this->a1.m_constraintMatrix[i][j];
//TODO! add all other layers here //TODO! add all other layers here
myBox.emplace_back(tmpPart); myBox.emplace_back(tmpPart);
} }
@ -36,14 +36,15 @@ void Puzzle::shuffle()
//deletes all constraints from all abstractionlayers //deletes all constraints from all abstractionlayers
void Puzzle::removeConstrains(coor removeCoordinates) void Puzzle::removeConstrains(coor removeCoordinates)
{ {
this->a1->RemoveConstraintOnPosition(removeCoordinates); this->a1.RemoveConstraintOnPosition(removeCoordinates);
} }
void Puzzle::createRandomPuzzle() void Puzzle::createRandomPuzzle()
{ {
a1->CreateRandomPuzzle(); a1.CreateRandomPuzzle();
} }
void Puzzle::createp_box() void Puzzle::createp_box()
{ {
} }

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

@ -74,7 +74,7 @@ void solve(vector<LogEntry>& log, vector<Part*>& p_Box, Puzzle& puzzleMat)
switch(log.back().abstractionLevel) switch(log.back().abstractionLevel)
{ {
case 1: case 1:
puzzleMat.a1->EvaluateQuality(log.back().myCoor, log.back().PieceCollector); puzzleMat.a1.EvaluateQuality(log.back().myCoor, log.back().PieceCollector);
break; break;
default: default:

12
Source/header/solve.h
View File

@ -39,18 +39,18 @@ private:
class Puzzle class Puzzle
{ {
public: public:
Puzzle(unsigned int newcols,unsigned int newrows,DestructionPower* newdp,AbstractionLayer_1):rows(newrows),cols(newcols)
Puzzle(unsigned int newcols,unsigned int newrows):rows(newrows),cols(newcols)
{ {
dp=newdp; a1.InitialiseConstraintMatrixSize(newcols+2, newrows+2);
a1->PreProcessing({rows,cols}, nullptr);//because could not set nullptr as default in override a1.setEdgeZero();
dp->PreProcessing({rows,cols},nullptr);
} }
coor getSizeAsCoor() coor getSizeAsCoor()
{return {cols,rows};} {return {cols,rows};}
DestructionPower* dp; DestructionPower dp;
AbstractionLayer_1* a1; AbstractionLayer_1 a1;
void removeConstrains(coor removeCoordinates); void removeConstrains(coor removeCoordinates);
void printPuzzle(); void printPuzzle();