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

Merge branch 'master' into Team_ADWP_Histogram

Browse Source
This commit is contained in:
niko-fhtw
2018-01-19 16:54:32 +01:00
parent dc71f6fa63 229afbc68a
commit c724354efd
6 changed files with 140 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ bool AbstractionLayer_1::RemoveConstraintOnPosition(const coor constraintCoordin
void AbstractionLayer_1::CreateRandomPuzzle()
{
std::minstd_rand simple_rand;
simple_rand.seed((unsigned int)"dumbo");
simple_rand.seed((unsigned int)time(nullptr)); //dumbo
for(int col = 0; col < m_constraintMatrix.size()-2; col++){
for(int row = 0; row < (m_constraintMatrix[col].size() - 2);)

8
Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.h
View File

@ -24,7 +24,15 @@
#include <bitset>
#define DISPLAY false
#ifdef _WIN32
#define PATH "..\\..\\..\\pieces\\%04d.jpg"
#elif defined __unix__
#define PATH "..//..//..//pieces//%04d.jpg"
#elif defined __APPLE__
#define PATH "..//..//..//pieces//%04d.jpg"
#endif
#define IMG_SIZE 400
#define TOP 6
#define RIGHT 4

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

@ -1,14 +1,20 @@
//
// Created by Raphael Maenle on 21/12/2017.
//
#include "../../header/solve.h"
#include "../../header/input.h"
typedef std::vector<std::vector<Point>> Contour_t;
typedef std::vector<Vec4i> Hierarchy_t; //hierarchy object is needed for drawContours apparently
Mat crop2ContourInv(const Mat & img);
Contour_t getLongestContour(Mat bw);
int getLongestContourIndex(Contour_t contours);
void Puzzle::printPuzzle()
{
cout << "a1: " << endl;
a1.printConstraintMatrix();
}
void Puzzle::printBox()
@ -22,6 +28,7 @@ void Puzzle::printBox()
}
}
//puts a puzzlepiece back into its box
void Puzzle::putIntoBox()
{
@ -39,7 +46,7 @@ void Puzzle::putIntoBox()
for(int rotations=0;rotations<4;rotations++)
{
tmpPart.m_a1.shift(1);
//TODO! add all other layerswith their rotaionvariance here
//TODO! add all other layers with their rotaionvariance here
myBox.emplace_back(tmpPart);
}
@ -92,10 +99,7 @@ void Puzzle::createBox(){
temp.SetNumOfRotations(j);
myBox.push_back(temp);
}
}
}
bool Puzzle::allSet() {
@ -115,3 +119,119 @@ void Puzzle::clearMat()
}
}
}
Mat Puzzle::readImage(int fileIndex, const char* inputDir){
char indexstr[12];
sprintf(indexstr,"%d.jpg",fileIndex);
char * inputstr = (char *) malloc(1 + strlen(inputDir)+ strlen(indexstr) );
strcpy(inputstr, inputDir);
strcat(inputstr,indexstr);
//cout<<inputstr<<endl;
Mat source = imread(inputstr,1);
return source;
}
Mat Puzzle::resultImage( vector<LogEntry>& log){
int Y_size = 1200; // chose this to fit your monitor!
int separator = 1;
int partHeight = 90;
int partWidth;
auto imageH = int(round(partHeight* cols));
if(imageH > Y_size){
imageH = Y_size;
}
partHeight = int(round(imageH / cols));
partWidth= partHeight;
int imageW = int(round( partWidth*rows));
int temp = imageW;
imageW = imageH;
imageH = temp;
cout<<"imageW "<<imageW <<endl<<"imageH " <<imageH<<endl<<endl;
cout<<"partW "<<partWidth <<endl<<"partH " <<partHeight<<endl<<endl;
Mat result(imageH,imageW,CV_8UC3);
char name[100];
for (auto it:log)
{
if (it.myCoor.col == 12 && it.myCoor.row == 0)
{
;
// imshow("result",result);
// waitKey(0);
}
cout << log.size() << endl;
cout << log[0].PieceCollector.size() << endl;
cout << it.PieceCollector[0].second->GetPartID() << endl;
int imageNumber = it.PieceCollector[0].second->GetPartID();
//cout<<"imageIndex: "<< imageNumber << endl;
sprintf(name, PATH, imageNumber);
Mat img = imread(name, 1);
copyMakeBorder(img,img,200,200,200,200,BORDER_CONSTANT,Scalar(255,255,255));
Mat invert = Mat::ones(img.size(), CV_8UC3); // invert for rotation to work correctly
bitwise_not ( img, invert );
if (it.myCoor.col == 12 && it.myCoor.row == 0)
{
//imshow("img",img);
//waitKey(0);
;
}
int angle = ((int)it.PieceCollector[0].second->GetNumOfRotations())*-90;
Point2f center;
center.x = img.cols/2;
center.y = img.rows/2;
Mat RotMatrix = getRotationMatrix2D(center,angle,1);
warpAffine(invert,invert,RotMatrix, invert.size());
bitwise_not(invert,img);
Mat cropped = crop2ContourInv(img);
auto ROI_X = int(round(it.myCoor.col*partWidth));
auto ROI_Y = int(round(it.myCoor.row*partHeight));
// cout<<"ROI X: "<< ROI_X<<endl;
// cout<<"ROI Y: "<< ROI_Y<<endl;
Rect ROI(ROI_X,ROI_Y , partWidth-separator, partHeight-separator); // j is the x coordinate not i!!
Mat temp(Scalar(255,255,255));
resize(cropped,temp, Size(ROI.width, ROI.height));
temp.copyTo(result(ROI));
}
imshow("result",result);
waitKey(0);
return result;
}
Mat crop2ContourInv(const Mat & img){ // for white background images
Mat grey;
cvtColor(img, grey,CV_BGR2GRAY);
Contour_t c; Hierarchy_t h;
threshold(grey,grey,200,255,THRESH_BINARY_INV);
findContours(grey,c,h,CV_RETR_EXTERNAL,CV_CHAIN_APPROX_SIMPLE);
int longest = getLongestContourIndex(c);
Rect croppingRect = boundingRect(c[longest]);
Mat cropped = img(croppingRect);
// imshow("cropped", cropped);
return cropped;
}
int getLongestContourIndex(Contour_t contours){
double area = 0;
double largestArea = 0;
size_t largestIndex = 0;
for (size_t i = 0; i < contours.size(); ++i)
{
area = contourArea(contours[i]);
if (area < 1e2 || 1e5 < area) continue; //
if (area > largestArea) {
largestArea = area;
largestIndex = i; // i is type size_t, should be converted to int.
}
}
return(largestIndex);
}

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

@ -106,7 +106,7 @@ void setsolution(vector<LogEntry>& log, Puzzle& puzzleMat)
//tell log entry that it is set
log.back().Set();
puzzleMat.setConstraints(log.back().myCoor,log.back().PieceCollector.begin()->second);
cout << "set:" << log.back().myCoor.col << "," << log.back().myCoor.row << endl;
//cout << "set:" << log.back().myCoor.col << "," << log.back().myCoor.row << endl;
}
bool backtrack(vector<LogEntry>& log, Puzzle& puzzleMat)