Merge branch 'master' into Layer_PoempelPosition

This commit is contained in:
Raphael Maenle
2018-01-20 22:53:05 +01:00
7 changed files with 522 additions and 91 deletions

View File

@ -9,7 +9,7 @@ bool AbstractionLayer_PoempelPosition::PreProcessing(coor mySize, const vector<
InitialiseConstraintMatrixSize(mySize.col, mySize.row);
cout << "Done" << endl;
return false;
return true;
}
//it through qualityVector and removes all that do not trigger PlaceOfPartGood
@ -17,7 +17,7 @@ bool AbstractionLayer_PoempelPosition::EvaluateQuality (const coor constraintCoo
{
for(int i = 0;i<qVector.size();i++)
{
float value = PlaceOfPartGood(constraintCoordinate, qVector[i].second->m_a3.SideLength));
float value = PlaceOfPartGood(constraintCoordinate, qVector[i].second->m_a3.SideLength);
if(value > 0.8)//TODO find threshold
{
qVector[i].first=value;