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

Abstraction1 Komplett eingebunden - Probleme nun auf Dispatcherseite

Browse Source 
Die Bilder sind in einem Ordner über dem Github abgespeichert, sieht man eh wohin die PATH zeigt. Bilder werden die "WORKING PIECES" verwendet.
This commit is contained in:
Raphael Maenle
2018-01-06 23:23:42 +01:00
parent 9d98ed83fa
commit 882737bd30
8 changed files with 79 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,5 +67,23 @@ void Puzzle::createRandomPuzzle()
void Puzzle::createp_box()
{
for(int i=0;i<rows*cols*4;i++)
p_myBox.push_back(&myBox[i]);
}
//creates a box of puzzlepieces with nothing other than puzzle piece id and correct nr of pieces
void Puzzle::createBox(){
for(int i=0;i<rows*cols*4;i++)
{
Part temp;
temp.SetPartID(i);
for(uint8_t j=0;j<4;j++)
{
temp.SetNumOfRotations(j);
myBox.push_back(temp);
}
}
}

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

@ -48,6 +48,10 @@ void createNextLogElement(vector<LogEntry>& log, vector<Part*>& p_Box, Puzzle& p
log.emplace_back(LogEntry(coor(0, 0)));
log.back().myCoor = calculateNextCoor(log, p_Box,puzzleMat);
puzzleMat.dp.DestructionOfSurrounding(log.back().myCoor);//calculate dp from surrounding
for(auto it:p_Box)
log.back().PieceCollector.emplace_back(pair<float,Part*>(0,it));
cout << p_Box.size() << endl;
cout << log.back().PieceCollector.size() << endl;
solve(log, p_Box,puzzleMat);
}
@ -72,11 +76,11 @@ coor calculateNextCoor(vector<LogEntry>& log, vector<Part*>& p_Box, Puzzle& puzz
void solve(vector<LogEntry>& log, vector<Part*>& p_Box, Puzzle& puzzleMat)
{
puzzleMat.dp.getNextAbstractionLayer(log.back().myCoor,log.back().abstractionLevel); //sets in abstractionLevel
log.back().abstractionLevel = puzzleMat.dp.getNextAbstractionLayer(log.back().myCoor,log.back().abstractionLevel); //sets in abstractionLevel
//status(log,p_Box,puzzleMat);
switch(log.back().abstractionLevel)
{
case 1:
case 0:
puzzleMat.a1.EvaluateQuality(log.back().myCoor, log.back().PieceCollector);
break;