Removed lots of slack, edited map functions into dispatcher, puzzleMat missing
Removed overconstructed logic, changed vector to map. PuzzleMat object not defined yet, for implementation, make the functions that have already been called through it.
This commit is contained in:
Raphael Maenle
parent
c885e472fb
commit
ce5e007bc7
@ -40,6 +40,7 @@ bool AbstractionLayer_1::CreateRandomPuzzle()
|
|||||||
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
|
||||||
uint8_t tempPiece = 0b00000000;
|
uint8_t tempPiece = 0b00000000;
|
||||||
if(simple_rand()%2)
|
if(simple_rand()%2)
|
||||||
tempPiece|=0b01000000;
|
tempPiece|=0b01000000;
|
||||||
@ -61,6 +62,17 @@ bool AbstractionLayer_1::CreateRandomPuzzle()
|
|||||||
else
|
else
|
||||||
tempPiece|=0b00000010;
|
tempPiece|=0b00000010;
|
||||||
|
|
||||||
|
//set edges and corners to 00
|
||||||
|
if(row==1)
|
||||||
|
tempPiece and_eq (uint8_t)0b00111111;
|
||||||
|
if(row==m_constraintMatrix[col].size())
|
||||||
|
tempPiece and_eq (uint8_t)0b11110011;
|
||||||
|
if(col==1)
|
||||||
|
tempPiece and_eq (uint8_t)0b11111100;
|
||||||
|
if(col==m_constraintMatrix.size()-1)
|
||||||
|
tempPiece and_eq (uint8_t)0b11001111;
|
||||||
|
|
||||||
|
//set piece if piece good
|
||||||
if(PlaceOfPartGood(coor(col,row),tempPiece))
|
if(PlaceOfPartGood(coor(col,row),tempPiece))
|
||||||
row++;
|
row++;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,175 +1,9 @@
|
|||||||
#include "../../header.h"
|
#include "../../header.h"
|
||||||
|
|
||||||
//shifts puzzle piece one to the right
|
|
||||||
void PuzzlePiece::shift(unsigned int moves)
|
|
||||||
{
|
|
||||||
shifts = (shifts+moves)%4;
|
|
||||||
setConnections(((getConnections() >> (moves*2)) | (getConnections() << sizeof(unsigned char)*8 - (moves*2))));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//creates random centerpiece
|
//use this in second abstraction layer maybe ey?
|
||||||
void PuzzlePiece::randomCenterPiece()
|
void createRandomAbstraction2()
|
||||||
{
|
|
||||||
setConnections(0b00000000);
|
|
||||||
|
|
||||||
if(rand()%2)
|
|
||||||
setConnections(getConnections() | (uint8_t)0b01000000);
|
|
||||||
else
|
|
||||||
setConnections(getConnections() | (uint8_t)0b10000000);
|
|
||||||
|
|
||||||
if(rand()%2)
|
|
||||||
setConnections(getConnections() | (uint8_t)0b00010000);
|
|
||||||
else
|
|
||||||
setConnections(getConnections() | (uint8_t)0b00100000);
|
|
||||||
|
|
||||||
if(rand()%2)
|
|
||||||
setConnections(getConnections() | (uint8_t)0b00000100);
|
|
||||||
else
|
|
||||||
setConnections(getConnections() | (uint8_t)0b00001000);
|
|
||||||
|
|
||||||
if(rand()%2)
|
|
||||||
setConnections(getConnections() | (uint8_t)0b00000001);
|
|
||||||
else
|
|
||||||
setConnections(getConnections() | (uint8_t)0b00000010);
|
|
||||||
}
|
|
||||||
|
|
||||||
//tests the myPart in all 4 rotations at position m, n
|
|
||||||
bool Puzzle::testRotationPiece(coor myCoor, PuzzlePiece& myPart, int nrOfRotations)
|
|
||||||
{
|
|
||||||
for(int rotation=0; rotation < nrOfRotations; rotation++)
|
|
||||||
{
|
|
||||||
//coor myCoor(m,n);
|
|
||||||
if(PlaceOfPartGood(myCoor,myPart))
|
|
||||||
return true;
|
|
||||||
//cout << "was rotated in testRotationPiece" << endl;
|
|
||||||
myPart.shift(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
//cout << "Was a bad part" << endl;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
//insterts piece at position in box according to boxidentifier and removes piece from puzzle
|
|
||||||
//this returns the position after!! the puzzle piece was put back in! not the boxidentifier of the piece. look that up in other function.
|
|
||||||
unsigned int Puzzle::putBackIntoBox(coor myCoor, vector<PuzzlePiece>& myBox)
|
|
||||||
{
|
|
||||||
#ifdef debug
|
|
||||||
cout << "putting back" << endl;
|
|
||||||
cout << "Old Box: ";
|
|
||||||
printBox(myBox);
|
|
||||||
cout << endl;
|
|
||||||
#endif
|
|
||||||
for(unsigned int i = 0; i < myBox.size();i++)
|
|
||||||
{
|
|
||||||
if(myBox[i].getBoxIdentifier()>getPiece(myCoor.col,myCoor.row).getBoxIdentifier())
|
|
||||||
{
|
|
||||||
myBox.insert(myBox.begin()+i,getPiece(myCoor.col,myCoor.row));
|
|
||||||
removePiece(myCoor);
|
|
||||||
return i+1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//using push back, if the element was the last element in the vector chain
|
|
||||||
myBox.push_back(getPiece(myCoor.col,myCoor.row));
|
|
||||||
removePiece(myCoor);
|
|
||||||
return myBox.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
//checks if the myPart in its current orientation is legal in position m, n
|
|
||||||
bool Puzzle::PlaceOfPartGood(coor myCoor, PuzzlePiece& myPart)
|
|
||||||
{
|
|
||||||
|
|
||||||
PuzzlePiece negativePart(0);
|
|
||||||
|
|
||||||
negativePart.setConnections(negativePart.getConnections() | (getPiece(myCoor.col,myCoor.row+1).getConnections() & (uint8_t)0b11000000));
|
|
||||||
negativePart.setConnections(negativePart.getConnections() | (getPiece(myCoor.col-1,myCoor.row).getConnections() & (uint8_t)0b00110000));
|
|
||||||
negativePart.setConnections(negativePart.getConnections() | (getPiece(myCoor.col,myCoor.row-1).getConnections() & (uint8_t)0b00001100));
|
|
||||||
negativePart.setConnections(negativePart.getConnections() | (getPiece(myCoor.col+1,myCoor.row).getConnections() & (uint8_t)0b00000011));
|
|
||||||
negativePart.shift(2);
|
|
||||||
|
|
||||||
|
|
||||||
if (
|
|
||||||
( ((((negativePart.getConnections() & 0b11000000) ^ (myPart.getConnections() & 0b11000000)) != 0b00000000) && (((myPart.getConnections() & 0b11000000) != 0b00000000) && (negativePart.getConnections() & 0b11000000) != 0b00000000))
|
|
||||||
|| ((((negativePart.getConnections() & 0b11000000) == 0b11000000) || ((myPart.getConnections() & 0b11000000) == 0b11000000)) && (((myPart.getConnections() & 0b11000000) != 0b00000000) && (negativePart.getConnections() & 0b11000000) != 0b00000000))
|
|
||||||
|| (((negativePart.getConnections() & 0b11000000) == 0b00000000) && ((myPart.getConnections() & 0b11000000) == 0b00000000)) )
|
|
||||||
&&
|
|
||||||
( ((((negativePart.getConnections() & 0b00110000) ^ (myPart.getConnections() & 0b00110000)) != 0b00000000) && (((myPart.getConnections() & 0b00110000) != 0b00000000) && (negativePart.getConnections() & 0b00110000) != 0b00000000))
|
|
||||||
|| ((((negativePart.getConnections() & 0b00110000) == 0b00110000) || ((myPart.getConnections() & 0b00110000) == 0b00110000)) && (((myPart.getConnections() & 0b00110000) != 0b00000000) && (negativePart.getConnections() & 0b00110000) != 0b00000000))
|
|
||||||
|| (((negativePart.getConnections() & 0b00110000) == 0b00000000) && ((myPart.getConnections() & 0b00110000) == 0b00000000)) )
|
|
||||||
&&
|
|
||||||
( ((((negativePart.getConnections() & 0b00001100) ^ (myPart.getConnections() & 0b00001100)) != 0b00000000) && (((myPart.getConnections() & 0b00001100) != 0b00000000) && (negativePart.getConnections() & 0b00001100) != 0b00000000))
|
|
||||||
|| ((((negativePart.getConnections() & 0b00001100) == 0b00001100) || ((myPart.getConnections() & 0b00001100) == 0b00001100)) && (((myPart.getConnections() & 0b00001100) != 0b00000000) && (negativePart.getConnections() & 0b00001100) != 0b00000000))
|
|
||||||
|| (((negativePart.getConnections() & 0b00001100) == 0b00000000) && ((myPart.getConnections() & 0b00001100) == 0b00000000)) )
|
|
||||||
&&
|
|
||||||
( ((((negativePart.getConnections() & 0b00000011) ^ (myPart.getConnections() & 0b00000011)) != 0b00000000) && (((myPart.getConnections() & 0b00000011) != 0b00000000) && (negativePart.getConnections() & 0b00000011) != 0b00000000))
|
|
||||||
|| ((((negativePart.getConnections() & 0b00000011) == 0b00000011) || ((myPart.getConnections() & 0b00000011) == 0b00000011)) && (((myPart.getConnections() & 0b00000011) != 0b00000000) && (negativePart.getConnections() & 0b00000011) != 0b00000000))
|
|
||||||
|| (((negativePart.getConnections() & 0b00000011) == 0b00000000) && ((myPart.getConnections() & 0b00000011) == 0b00000000)) )
|
|
||||||
)
|
|
||||||
{
|
|
||||||
//cout << "good Part: ";
|
|
||||||
//myPart.printPiece();
|
|
||||||
//cout << endl;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
//cout << "bad Part: ";
|
|
||||||
//myPart.printPiece();
|
|
||||||
//cout << endl;
|
|
||||||
|
|
||||||
return false;
|
|
||||||
|
|
||||||
}
|
|
||||||
//prints the true puzzle (without 0 edges)
|
|
||||||
void Puzzle::printPuzzle()
|
|
||||||
{
|
|
||||||
cout << "current Puzzle: " << endl;
|
|
||||||
for(int i=1;i<row+1;i++)
|
|
||||||
{
|
|
||||||
for(int j=1;j<col+1;j++)
|
|
||||||
{
|
|
||||||
Matrix[i][j].printPiece();
|
|
||||||
cout << " ";
|
|
||||||
}
|
|
||||||
cout << endl;
|
|
||||||
}
|
|
||||||
cout << endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
//creates a legal puzzle out of random pieces
|
|
||||||
|
|
||||||
void randomBox::createRandomAbstraction1()
|
|
||||||
{
|
|
||||||
coor myCoor;
|
|
||||||
PuzzlePiece temporaryRandomPiece(0);
|
|
||||||
|
|
||||||
for(unsigned int i=0;i<getRows();i++)
|
|
||||||
{
|
|
||||||
for(unsigned int j = 0; j < getCols();)
|
|
||||||
{
|
|
||||||
|
|
||||||
//create random piece, set edges according to position and check if piece is good
|
|
||||||
temporaryRandomPiece.randomCenterPiece();
|
|
||||||
if(i==0)
|
|
||||||
temporaryRandomPiece.setConnections((uint8_t)0b00111111 & temporaryRandomPiece.getConnections());
|
|
||||||
if(i==getRows()-1)
|
|
||||||
temporaryRandomPiece.setConnections((uint8_t)0b11110011 & temporaryRandomPiece.getConnections());
|
|
||||||
if(j==0)
|
|
||||||
temporaryRandomPiece.setConnections((uint8_t)0b11111100 & temporaryRandomPiece.getConnections());
|
|
||||||
if(j==getCols()-1)
|
|
||||||
temporaryRandomPiece.setConnections((uint8_t)0b11001111 & temporaryRandomPiece.getConnections());
|
|
||||||
|
|
||||||
myCoor.col = j;
|
|
||||||
myCoor.row = i;
|
|
||||||
if(PlaceOfPartGood(myCoor,temporaryRandomPiece))
|
|
||||||
{
|
|
||||||
temporaryRandomPiece.assignIdentifier();
|
|
||||||
setPiece(myCoor,temporaryRandomPiece);
|
|
||||||
j++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void randomBox::createRandomAbstraction2()
|
|
||||||
{
|
{
|
||||||
//get a picture
|
//get a picture
|
||||||
cv::Mat PuzzlePicture = cv::imread("../../Codicil/Images/Balloons.jpg");
|
cv::Mat PuzzlePicture = cv::imread("../../Codicil/Images/Balloons.jpg");
|
||||||
@ -207,30 +41,8 @@ void randomBox::createRandomAbstraction2()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void randomBox::putAllIntoBox() {
|
|
||||||
for (unsigned int i = 0; i < getRows(); i++)
|
|
||||||
{
|
|
||||||
for (unsigned int j = 0; j < getCols(); j++)
|
|
||||||
{
|
|
||||||
Box.push_back(getPiece(j,i));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//prints a box contents on console
|
|
||||||
void randomBox::printBox()
|
|
||||||
{
|
|
||||||
shuffle();
|
|
||||||
for (auto i:Box)
|
|
||||||
{
|
|
||||||
i.printPiece();
|
|
||||||
cout << ' ';
|
|
||||||
}
|
|
||||||
cout << endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
//shuffles around a box, randomizing pieces and orientation
|
//shuffles around a box, randomizing pieces and orientation
|
||||||
vector<PuzzlePiece> randomBox::shuffle()
|
vector<Part> randomBox::shuffle()
|
||||||
{
|
{
|
||||||
random_shuffle(Box.begin(),Box.end());
|
random_shuffle(Box.begin(),Box.end());
|
||||||
for (auto &i:Box)
|
for (auto &i:Box)
|
||||||
@ -241,48 +53,4 @@ vector<PuzzlePiece> randomBox::shuffle()
|
|||||||
|
|
||||||
numerateBox(Box);
|
numerateBox(Box);
|
||||||
return Box;
|
return Box;
|
||||||
}
|
|
||||||
|
|
||||||
//creates a random box size m, n, shuffles it, and then retuns it
|
|
||||||
vector<PuzzlePiece> createBox(coor myCoor)
|
|
||||||
{
|
|
||||||
randomBox myFirstPuzzleBox(myCoor.col,myCoor.row);
|
|
||||||
myFirstPuzzleBox.createRandomAbstraction1();
|
|
||||||
myFirstPuzzleBox.createRandomAbstraction2();
|
|
||||||
myFirstPuzzleBox.putAllIntoBox();
|
|
||||||
|
|
||||||
myFirstPuzzleBox.printPuzzle();
|
|
||||||
return myFirstPuzzleBox.shuffle();
|
|
||||||
}
|
|
||||||
|
|
||||||
//prints contents of box
|
|
||||||
void printBox(vector<PuzzlePiece> myBox)
|
|
||||||
{
|
|
||||||
cout << "current Box: " << endl;
|
|
||||||
for (auto &i:myBox)
|
|
||||||
{
|
|
||||||
i.printPiece();
|
|
||||||
cout << ' ';
|
|
||||||
}
|
|
||||||
cout << endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
//gives every element in box a box identifier.
|
|
||||||
void numerateBox(vector<PuzzlePiece>& myBox)
|
|
||||||
{
|
|
||||||
for(int i = 0; i< myBox.size();i++)
|
|
||||||
myBox[i].setBoxIdentifier(i);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
std::vector<PuzzlePiece> convertPart2PuzzlePiece(std::vector<Part> simplePartBox)
|
|
||||||
{
|
|
||||||
std::vector<PuzzlePiece> advancedPartBox;
|
|
||||||
for(auto const &i:simplePartBox)
|
|
||||||
{
|
|
||||||
PuzzlePiece tmpNewPiece(0);
|
|
||||||
tmpNewPiece.setConnections(i.getConnections());
|
|
||||||
advancedPartBox.push_back(tmpNewPiece);
|
|
||||||
}
|
|
||||||
return advancedPartBox;
|
|
||||||
}
|
}
|
||||||
@ -1,15 +1,15 @@
|
|||||||
#include "../../header.h"
|
#include "../../header.h"
|
||||||
|
|
||||||
void status(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat);
|
void status(vector<LogEntry>& log, vector<Part*>& p_Box);
|
||||||
|
|
||||||
|
|
||||||
bool next(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat)
|
bool next(vector<LogEntry>& log, vector<Part*>& p_Box)
|
||||||
{
|
{
|
||||||
//last log element is set, create new log element or log not yet started
|
//last log element is set, create new log element or log not yet started
|
||||||
if(!(log.size()) || log.back().isSet())
|
if(!(log.size()) || log.back().isSet())
|
||||||
{
|
{
|
||||||
if(!(p_Box.size())) return false; //puzzle solved
|
if(!(p_Box.size())) return false; //puzzle solved
|
||||||
else createNextLogElement(log,p_Box,puzzleMat);
|
else createNextLogElement(log,p_Box);
|
||||||
}
|
}
|
||||||
//last log element is empty, backtrack
|
//last log element is empty, backtrack
|
||||||
else if(!(log.back().PieceCollector.size())) backtrack(log,p_Box,puzzleMat);
|
else if(!(log.back().PieceCollector.size())) backtrack(log,p_Box,puzzleMat);
|
||||||
@ -28,27 +28,27 @@ bool next(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat)
|
|||||||
if(log.back().abstractionLevel < MAX_ABSTRAX)
|
if(log.back().abstractionLevel < MAX_ABSTRAX)
|
||||||
{
|
{
|
||||||
log.back().advance();
|
log.back().advance();
|
||||||
solve(log,p_Box,puzzleMat);
|
solve(log,p_Box);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
setsolution(log,p_Box,puzzleMat);
|
setsolution(log,p_Box);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
setsolution(log,p_Box,puzzleMat);
|
setsolution(log,p_Box);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void createNextLogElement(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat)
|
void createNextLogElement(vector<LogEntry>& log, vector<Part*>& p_Box)
|
||||||
{
|
{
|
||||||
log.emplace_back(LogEntry());
|
log.emplace_back(LogEntry());
|
||||||
log.back().myCoor = calculateNextCoor(log, p_Box, puzzleMat);
|
log.back().myCoor = calculateNextCoor(log, p_Box);
|
||||||
//getLayerDestructionPowerfromSurrounding();
|
//getLayerDestructionPowerfromSurrounding();
|
||||||
solve(log, p_Box,puzzleMat);
|
solve(log, p_Box);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
coor calculateNextCoor(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat)
|
coor calculateNextCoor(vector<LogEntry>& log, vector<Part*>& p_Box)
|
||||||
{
|
{
|
||||||
//level 1:
|
//level 1:
|
||||||
//go left to right, then increase current row
|
//go left to right, then increase current row
|
||||||
@ -68,15 +68,14 @@ coor calculateNextCoor(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzl
|
|||||||
//return nextCoor;
|
//return nextCoor;
|
||||||
}
|
}
|
||||||
|
|
||||||
void solve(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat)
|
void solve(vector<LogEntry>& log, vector<Part*>& p_Box)
|
||||||
{
|
{
|
||||||
//getNextHighestLayerworth(puzzleMat); //sets in abstractionLevel
|
//getNextHighestLayerworth(puzzleMat); //sets in abstractionLevel
|
||||||
//status(log,p_Box,puzzleMat);
|
//status(log,p_Box,puzzleMat);
|
||||||
switch(log.back().abstractionLevel)
|
switch(log.back().abstractionLevel)
|
||||||
{
|
{
|
||||||
case 0: abstractionlayer0solver(log,p_Box,puzzleMat);
|
case 1:
|
||||||
break;
|
puzzleMat.AbstractionLayer_1solver.EvalueteQuality(log.back().PieceCollector);
|
||||||
case 1: abstractionlayer1solver(log,p_Box,puzzleMat);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
@ -90,141 +89,50 @@ void solve(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void abstractionlayer0solver(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat)
|
//removes from box and makes log "set"
|
||||||
{
|
void setsolution(vector<LogEntry>& log, vector<Part*>& p_Box)
|
||||||
//throw all remaining puzzle pieces into newest log
|
|
||||||
for(auto i:p_Box)
|
|
||||||
log.back().PieceCollector.push_back(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
void abstractionlayer1solver(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat)
|
|
||||||
{
|
|
||||||
//remove all that do not fit according to abstraction layer 0
|
|
||||||
for(int i=0;i<(log.back().PieceCollector.size());)
|
|
||||||
{
|
|
||||||
(*(log.back().PieceCollector[i])).resetShift();
|
|
||||||
//TODO: change checker from checking every box piece to only checking the simplifyed version ob the box with abstraction layer one
|
|
||||||
if(!(puzzleMat.testRotationPiece(log.back().myCoor, *(log.back().PieceCollector[i]))))
|
|
||||||
log.back().PieceCollector.erase(log.back().PieceCollector.begin()+i);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
//set shift to 0 so that we have a defined starting position for all pieces
|
|
||||||
while(log.back().PieceCollector[i]->getShift())
|
|
||||||
log.back().PieceCollector[i]->shift(1);
|
|
||||||
i++; //otherwise loop stops before end!
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void setsolution(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat)
|
|
||||||
{
|
{
|
||||||
//advance number of randomed part count
|
//advance number of randomed part count
|
||||||
if(log.back().PieceCollector.size()>1) log.back().advanceRandomed();
|
if(log.back().PieceCollector.size()>1) log.back().advanceRandomed();
|
||||||
|
|
||||||
//remove first element in last logelement from box
|
//remove first element in last logelement from box
|
||||||
for(int i=0;i<p_Box.size();)
|
for(int i=0;i<p_Box.size();)
|
||||||
if(p_Box[i]==log.back().PieceCollector[0])
|
if(p_Box[i]==log.back().PieceCollector.begin()->first)//mach ich das richtig so?!
|
||||||
p_Box.erase(p_Box.begin()+i);
|
p_Box.erase(p_Box.begin()+i);
|
||||||
else
|
else
|
||||||
i++;
|
i++;
|
||||||
|
|
||||||
//turn piece until it fits and then set element into matrix
|
|
||||||
if(puzzleMat.testRotationPiece(log.back().myCoor,*(log.back().PieceCollector[0])))
|
|
||||||
//error if it turned
|
|
||||||
//puzzleMat.setPiece(log.back().myCoor.m, log.back().myCoor.n, *(log.back().PieceCollector[0]));
|
|
||||||
puzzleMat.setPiece(log.back().myCoor, *(log.back().PieceCollector[0]));
|
|
||||||
else
|
|
||||||
{
|
|
||||||
cout << "fatal error, wrong piece saved" << endl;
|
|
||||||
exit;
|
|
||||||
}
|
|
||||||
//tell log entry that it is set
|
//tell log entry that it is set
|
||||||
log.back().Set();
|
log.back().Set();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool backtrack(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat)
|
bool backtrack(vector<LogEntry>& log, vector<Part*>& p_Box, puzzleMat)
|
||||||
{
|
{
|
||||||
//following possibilities:
|
//if more pieces possible, take next piece
|
||||||
//last log entry empty - delete last log + backtrack
|
if((log.back().PieceCollector.size())>1)
|
||||||
if(!(log.back().PieceCollector.size()))
|
{
|
||||||
{
|
p_Box.push_back(log.back().PieceCollector.begin()->first);
|
||||||
puzzleMat.removePiece(log.back().myCoor);
|
|
||||||
log.pop_back();
|
|
||||||
backtrack(log,p_Box,puzzleMat);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
//last log entry only one solution - delete last logd put back into box + backtrack
|
|
||||||
else if((log.back().PieceCollector.size())==1)
|
|
||||||
{
|
|
||||||
(log.back().PieceCollector[0])->shift(1);
|
|
||||||
|
|
||||||
//check rotion
|
|
||||||
while((log.back().PieceCollector[0])->getShift() !=0 && (log.back().PieceCollector[0])->getShift() !=3)
|
|
||||||
{
|
|
||||||
log.back().PieceCollector[0]->shift(1);
|
|
||||||
if(puzzleMat.testRotationPiece(log.back().myCoor, *(log.back().PieceCollector[0]), 1))
|
|
||||||
{
|
|
||||||
setsolution(log,p_Box,puzzleMat);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
p_Box.push_back(log.back().PieceCollector[0]);
|
|
||||||
//shuffleup
|
|
||||||
std::random_device rd;
|
|
||||||
std::mt19937 g(rd());
|
|
||||||
std::shuffle(p_Box.begin(),p_Box.end(),g);
|
|
||||||
puzzleMat.removePiece(log.back().myCoor);
|
|
||||||
log.pop_back();
|
|
||||||
//cout << "removed" << endl;
|
|
||||||
//status(log,p_Box,puzzleMat);
|
|
||||||
backtrack(log,p_Box,puzzleMat);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
//last log entry multiple solutions (and current one was randomed) - delete randomed piece and go to next
|
|
||||||
else if((log.back().PieceCollector.size())>1)
|
|
||||||
{
|
|
||||||
|
|
||||||
//check if piece has second rotation solution
|
|
||||||
(*(log.back().PieceCollector[0])).shift(1);
|
|
||||||
|
|
||||||
while((log.back().PieceCollector[0])->getShift() !=0 && (log.back().PieceCollector[0])->getShift() !=3)
|
|
||||||
{
|
|
||||||
log.back().PieceCollector[0]->shift(1);
|
|
||||||
if(puzzleMat.testRotationPiece(log.back().myCoor, *(log.back().PieceCollector[0]), 1))
|
|
||||||
{
|
|
||||||
setsolution(log,p_Box,puzzleMat);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
p_Box.push_back(log.back().PieceCollector[0]);
|
|
||||||
//shuffleup
|
|
||||||
std::random_device rd;
|
|
||||||
std::mt19937 g(rd());
|
|
||||||
std::shuffle(p_Box.begin(),p_Box.end(),g);
|
|
||||||
log.back().PieceCollector.erase(log.back().PieceCollector.begin());
|
log.back().PieceCollector.erase(log.back().PieceCollector.begin());
|
||||||
|
|
||||||
if(log.back().PieceCollector.size()==1)
|
if(log.back().PieceCollector.size()==1)
|
||||||
log.back().decreaseRandomed();
|
log.back().decreaseRandomed();
|
||||||
|
|
||||||
//for abstraction layer 1 so that first rotation solution is set.
|
|
||||||
(*(log.back().PieceCollector[0])).resetShift();
|
|
||||||
setsolution(log,p_Box,puzzleMat);
|
setsolution(log,p_Box,puzzleMat);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
//no need to remove from puzzle mat, as setsolution overwrites it anyway
|
}
|
||||||
}
|
//else remove log element and backtrack once more
|
||||||
else
|
else
|
||||||
return false;
|
{
|
||||||
|
puzzleMat.removePiece(log.back().myCoor); //this should remove constraints from all layers
|
||||||
|
if(!(log.back().PieceCollector.size()))
|
||||||
|
p_Box.emplace_back(log.back().PieceCollector[0]);
|
||||||
|
log.pop_back();
|
||||||
|
backtrack(log,p_Box,puzzleMat);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void status(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat)
|
void status(vector<LogEntry>& log, vector<Part*>& p_Box, puzzleMat)
|
||||||
{
|
{
|
||||||
cout << "----------------------------" << endl;
|
cout << "----------------------------" << endl;
|
||||||
cout << "status:" << endl;
|
cout << "status:" << endl;
|
||||||
@ -254,7 +162,7 @@ void status(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMa
|
|||||||
cout << "----------------------------" << endl;
|
cout << "----------------------------" << endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
void calculateTrueDestructionPower(vector<LogEntry>& log, Puzzle& puzzleMat, float Layerworth)
|
void calculateTrueDestructionPower(vector<LogEntry>& log, puzzleMat, float Layerworth)
|
||||||
{
|
{
|
||||||
//hier muss noch rein, wo die zeit der Abstractionlevels gespeichter wird
|
//hier muss noch rein, wo die zeit der Abstractionlevels gespeichter wird
|
||||||
float destructionPower=sqrt(Layerworth * log.back().abstractionLevel);
|
float destructionPower=sqrt(Layerworth * log.back().abstractionLevel);
|
||||||
|
|||||||
@ -14,136 +14,10 @@ public:
|
|||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
|
|
||||||
class PuzzlePiece: public Part
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
PuzzlePiece(unsigned int flag = 0)
|
|
||||||
{
|
|
||||||
shifts=0;
|
|
||||||
boxidentifier=-1;
|
|
||||||
switch(flag)
|
|
||||||
{
|
|
||||||
case 0:
|
|
||||||
setConnections(0b00000000);
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
setConnections(0b11111111);
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
randomCenterPiece();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
unsigned int getShift(){return shifts;}
|
|
||||||
void resetShift(){shifts=0;}
|
|
||||||
void shift(unsigned int moves);
|
|
||||||
void randomCenterPiece();
|
|
||||||
void printPiece() { cout << bitset<sizeof(unsigned char)*8> (getConnections()); }
|
|
||||||
|
|
||||||
void setBoxIdentifier(int new_boxid) { boxidentifier = new_boxid; }
|
|
||||||
int getBoxIdentifier() { return boxidentifier; }
|
|
||||||
void assignIdentifier() { identifier = idcount;idcount++; }
|
|
||||||
unsigned int getIdentifier() { return identifier;}
|
|
||||||
|
|
||||||
private:
|
|
||||||
unsigned int shifts;
|
|
||||||
unsigned int boxidentifier;
|
|
||||||
unsigned int identifier;
|
|
||||||
|
|
||||||
static unsigned int idcount;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class Puzzle
|
|
||||||
{
|
|
||||||
friend class randomBox;
|
|
||||||
public:
|
|
||||||
//constructor creates matrix with 00 outside and 11 inside
|
|
||||||
Puzzle(unsigned int m = 7, unsigned int n = 4): col(m), row(n)
|
|
||||||
{
|
|
||||||
Matrix = new PuzzlePiece* [n+2];
|
|
||||||
for(int i = 0;i<n+2;i++)
|
|
||||||
{
|
|
||||||
Matrix[i] = new PuzzlePiece[m+2];
|
|
||||||
for(int j = 0;j<m+2;j++)
|
|
||||||
{
|
|
||||||
if(i==0 || j==0 || i==n+1 || j==m+1)
|
|
||||||
{
|
|
||||||
Matrix[i][j] = PuzzlePiece(0);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Matrix[i][j] = PuzzlePiece(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool setPiece(coor myCoor,PuzzlePiece newPiece) // 5th change: works
|
|
||||||
{
|
|
||||||
if(PlaceOfPartGood(myCoor,newPiece))
|
|
||||||
{
|
|
||||||
Matrix[myCoor.row+1][myCoor.col+1] = newPiece;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
//removes piece and instead puts undefined piece
|
|
||||||
bool removePiece(coor myCoor) // 6th change: works
|
|
||||||
{
|
|
||||||
Matrix[myCoor.row+1][myCoor.col+1].setConnections(0b11111111);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
//getter
|
|
||||||
PuzzlePiece getPiece(unsigned int m, unsigned int n) { return Matrix[n+1][m+1]; } // 7th change: error m+1, n+1
|
|
||||||
unsigned int getCols(){ return col; }
|
|
||||||
unsigned int getRows(){ return row; }
|
|
||||||
|
|
||||||
//functtion definitions
|
|
||||||
void printPuzzle();
|
|
||||||
bool PlaceOfPartGood(coor myCoor, PuzzlePiece& myPart); // 8th change: works
|
|
||||||
bool PlaceOfPart2Good(coor myCoor, PuzzlePiece& myPart); // 2nd change: works
|
|
||||||
|
|
||||||
bool testRotationPiece(coor myCoor, PuzzlePiece& myPart, int nrOfRotations=4); // 9th change: works
|
|
||||||
unsigned int tryAllPieces(coor myCoor, vector<PuzzlePiece>& myBox, unsigned int separator); // 3rd change: works
|
|
||||||
unsigned int putBackIntoBox(coor myCoor, vector<PuzzlePiece>& myBox); // 4th change: works
|
|
||||||
|
|
||||||
|
|
||||||
private:
|
|
||||||
unsigned int row;
|
|
||||||
unsigned int col;
|
|
||||||
|
|
||||||
PuzzlePiece** Matrix;
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
//use this for random puzzle creation
|
|
||||||
class randomBox: public Puzzle
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
randomBox(unsigned int m, unsigned int n) : Puzzle(m,n) {srand(time(0));} //passed m n to puzzle constructor
|
|
||||||
|
|
||||||
void createRandomAbstraction1();
|
|
||||||
void createRandomAbstraction2();
|
|
||||||
void putAllIntoBox();
|
|
||||||
vector<PuzzlePiece> shuffle();
|
|
||||||
void printBox();
|
|
||||||
|
|
||||||
private:
|
|
||||||
vector<PuzzlePiece> Box;
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
class LogEntry
|
class LogEntry
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
vector<PuzzlePiece*> PieceCollector;
|
map<Part*, float> PieceCollector;
|
||||||
int abstractionLevel;
|
int abstractionLevel;
|
||||||
coor myCoor;
|
coor myCoor;
|
||||||
|
|
||||||
@ -165,16 +39,10 @@ private:
|
|||||||
static int randomed;
|
static int randomed;
|
||||||
};
|
};
|
||||||
|
|
||||||
void printBox(vector<PuzzlePiece> myBox);
|
|
||||||
vector<PuzzlePiece> createBox(coor myCoor);
|
|
||||||
void numerateBox(vector<PuzzlePiece>& myBox);
|
|
||||||
|
|
||||||
bool next(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat);
|
bool next(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat);
|
||||||
coor calculateNextCoor(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat);
|
coor calculateNextCoor(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat);
|
||||||
void solve(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat);
|
void solve(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat);
|
||||||
void abstractionlayer0solver(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat);
|
|
||||||
void abstractionlayer1solver(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat);
|
|
||||||
void setsolution(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat);
|
void setsolution(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat);
|
||||||
bool backtrack(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat);
|
bool backtrack(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, puzzleMat);
|
||||||
|
|
||||||
void createNextLogElement(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat);
|
void createNextLogElement(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat);
|
||||||
@ -10,11 +10,11 @@ int main()
|
|||||||
unsigned int cols=5, rows=6;
|
unsigned int cols=5, rows=6;
|
||||||
|
|
||||||
//some basic random puzzle stuff
|
//some basic random puzzle stuff
|
||||||
vector<PuzzlePiece> myFirstBox = createBox(coor(cols,rows));
|
vector<Part> myFirstBox = createBox(coor(cols,rows));
|
||||||
|
|
||||||
//some advanced solver stuff
|
//some advanced solver stuff
|
||||||
vector<LogEntry> log;
|
vector<LogEntry> log;
|
||||||
vector<PuzzlePiece*> p_myFirstBox;
|
vector<Part*> p_myFirstBox;
|
||||||
|
|
||||||
//BoxClassify myFirstBox();
|
//BoxClassify myFirstBox();
|
||||||
cout << endl;
|
cout << endl;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user