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

Merge branch 'master' into Layer_PoempelPosition

Browse Source
This commit is contained in:
Raphael Maenle
2018-01-20 20:05:56 +01:00
parent 5950ba7c5e fe04ebcd01
commit ea60145566
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,10 +45,7 @@ void createNextLogElement(vector<LogEntry>& log, Puzzle& puzzleMat)
log.back().myCoor = calculateNextCoor(log, puzzleMat); log.back().myCoor = calculateNextCoor(log, puzzleMat);
puzzleMat.dp.DestructionOfSurrounding(log.back().myCoor);//calculate dp from surrounding puzzleMat.dp.DestructionOfSurrounding(log.back().myCoor);//calculate dp from surrounding
cout << "-----------------------" << endl; cout << "-----------------------" << endl;
cout << "destr-array:" << endl; //get all not set pieces
for(auto it:puzzleMat.dp.m_constraintMatrix[log.back().myCoor.col][log.back().myCoor.row].DestructionArray)
cout << it << endl;
//get all not set pieces
for(auto it:puzzleMat.p_myBox) for(auto it:puzzleMat.p_myBox)
if(!it->set) if(!it->set)
log.back().PieceCollector.emplace_back(pair<float,Part*>(0,it)); log.back().PieceCollector.emplace_back(pair<float,Part*>(0,it));
@@ -76,7 +73,6 @@ coor calculateNextCoor(vector<LogEntry>& log, Puzzle& puzzleMat)
void solve(vector<LogEntry>& log,Puzzle& puzzleMat) void solve(vector<LogEntry>& log,Puzzle& puzzleMat)
{ {
log.back().abstractionLevel = 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
cout << "ab: " << log.back().abstractionLevel << endl;
//status(log,p_Box,puzzleMat); //status(log,p_Box,puzzleMat);
//TODO!! Add more layers here //TODO!! Add more layers here
switch(log.back().abstractionLevel) switch(log.back().abstractionLevel)