Sketch: Verbose to console output malformed constraints that are ignored by the solver

This commit is contained in:
Abdullah Tahiri
2019-04-22 14:59:25 +02:00
committed by abdullahtahiriyo
parent 23f0be2129
commit c5ff5d9d48

View File

@@ -1488,10 +1488,16 @@ int Sketch::addConstraint(const Constraint *constraint)
int Sketch::addConstraints(const std::vector<Constraint *> &ConstraintList)
{
int rtn = -1;
int cid = 0;
for (std::vector<Constraint *>::const_iterator it = ConstraintList.begin();it!=ConstraintList.end();++it)
for (std::vector<Constraint *>::const_iterator it = ConstraintList.begin();it!=ConstraintList.end();++it,++cid) {
rtn = addConstraint (*it);
if(rtn == -1) {
Base::Console().Error("Sketcher constraint number %d is malformed!\n",cid);
}
}
return rtn;
}
@@ -1504,6 +1510,10 @@ int Sketch::addConstraints(const std::vector<Constraint *> &ConstraintList,
for (std::vector<Constraint *>::const_iterator it = ConstraintList.begin();it!=ConstraintList.end();++it,++cid) {
if (!unenforceableConstraints[cid] && (*it)->Type != Block) {
rtn = addConstraint (*it);
if(rtn == -1) {
Base::Console().Error("Sketcher constraint number %d is malformed!\n",cid);
}
}
else {
++ConstraintsCounter; // For correct solver redundant reporting