- // Clear removed attributes
- std::set<Slvs_hParam> aParamRemoved;
- std::set<Slvs_hEntity> anEntRemoved;
- std::set<Slvs_hConstraint> aConstrRemoved;
- myStorage->getRemoved(aParamRemoved, anEntRemoved, aConstrRemoved);
- std::map<AttributePtr, Slvs_hEntity>::iterator anAttrIter = myAttributeMap.begin();
- while (anAttrIter != myAttributeMap.end()) {
- if (anEntRemoved.find(anAttrIter->second) != anEntRemoved.end()) {
- std::map<AttributePtr, Slvs_hEntity>::iterator aTempIt = anAttrIter++;
- myCoincidentPoints.erase(aTempIt->first);
- myAttributeMap.erase(aTempIt);
- continue;
- }
- anAttrIter++;
- }
-
- // Go through remaining extra coincidence and try to add or remove them
- anExtraIt = myExtraCoincidence.begin();
- while (anExtraIt != myExtraCoincidence.end()) {
- if (anExtraIt->first == SLVS_E_UNKNOWN) {
- if (!anExtraIt->second->data() || !anExtraIt->second->data()->isValid()) {
- std::map<Slvs_hConstraint, ConstraintPtr>::iterator aTempIt = anExtraIt++;
- myExtraCoincidence.erase(aTempIt);
- continue;
- }
- if (mySlvsConstraints.empty()) {
- myBaseConstraint = anExtraIt->second;
- std::map<Slvs_hConstraint, ConstraintPtr>::iterator aTempIt = anExtraIt++;
- myExtraCoincidence.erase(aTempIt);
- process();
- continue;
- } else
- addConstraint(anExtraIt->second);
- }
- anExtraIt++;
- }
- return mySlvsConstraints.empty();