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
parent edd3c8620b a81c39125f
commit 7c8d9cffe9
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ void Puzzle::putIntoBox()
{
//TODO! add rotation of all parts
//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
myBox.emplace_back(tmpPart);
}
@ -36,14 +36,15 @@ void Puzzle::shuffle()
//deletes all constraints from all abstractionlayers
void Puzzle::removeConstrains(coor removeCoordinates)
{
this->a1->RemoveConstraintOnPosition(removeCoordinates);
this->a1.RemoveConstraintOnPosition(removeCoordinates);
}
void Puzzle::createRandomPuzzle()
{
a1->CreateRandomPuzzle();
a1.CreateRandomPuzzle();
}
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)
{
case 1:
puzzleMat.a1->EvaluateQuality(log.back().myCoor, log.back().PieceCollector);
puzzleMat.a1.EvaluateQuality(log.back().myCoor, log.back().PieceCollector);
break;
default: