Merge branch 'master' into MergeBranch_resultImage

This commit is contained in:
Raphael Maenle
2018-01-20 22:01:53 +01:00
12 changed files with 160 additions and 50 deletions

View File

@ -49,10 +49,13 @@ public:
bool EvaluateQuality ( coor constraintCoordinate, qualityVector& qVector)override;
bool SetConstraintOnPosition( coor constraintCoordinate, AbstractionLayer_1_Properties constraint)override;
bool RemoveConstraintOnPosition( coor constraintCoordinate)override;
int RemoveSimilar(qualityVector&,uint8_t&);
bool PlaceOfPartGood(coor myCoor, uint8_t& myPart);
void shift(uint8_t& Part, int shifts);
void setEdgeZero();
int PoempelSum(uint8_t constraint);
void CreateRandomPuzzle();
qualityVector returnInBox(vector<Part>& PuzzleBox);