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

Added David Code, removed Clion Stuff

Browse Source
This commit is contained in:
g-spacewhale
2017-12-07 16:26:45 +01:00
parent 26ce1477bd
commit bf3b103251
28 changed files with 2 additions and 2142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,12 +219,7 @@ void randomBox::createRandomAbstraction1()
if(PlaceOfPartGood(myCoor,temporaryRandomPiece))
{
temporaryRandomPiece.assignIdentifier();
<<<<<<< HEAD
setPiece(myCoor,temporaryRandomPiece);
/*=======
setPiece(j,i,temporaryRandomPiece);
>>>>>>> 9b282e83caf9aaacea107f878d2d6b3f413f286b
*/
j++;
}
}
@ -261,7 +256,7 @@ void randomBox::createRandomAbstraction2()
tmpPiece.r = cv::mean(smallChannels[0]).operator[](0);
tmpPiece.g = cv::mean(smallChannels[1]).operator[](0);
tmpPiece.b = cv::mean(smallChannels[2]).operator[](0);
setPiece(j,i,tmpPiece);
setPiece(coor(j,i),tmpPiece);
j++;
}
i++;