Salome HOME
Fix compilation error on Linux. Part V.
[modules/shaper.git] / src / SketchSolver / SketchSolver_Group.cpp
index 3c5832cdb793c7155a872ba79dce491c84416a0e..f4ba30c83ba97cd9ad720712f6be25c5eace4781 100644 (file)
@@ -6,38 +6,54 @@
 
 #include "SketchSolver_Group.h"
 
-#include <SketchSolver_Builder.h>
 #include <SketchSolver_Constraint.h>
 #include <SketchSolver_ConstraintCoincidence.h>
+#include <SketchSolver_ConstraintMulti.h>
 #include <SketchSolver_Error.h>
+////#include <SketchSolver_Builder.h>
+#include <SketchSolver_Manager.h>
 
 #include <Events_Error.h>
 #include <Events_Loop.h>
-#include <GeomAPI_XY.h>
-#include <GeomAPI_Dir2d.h>
-#include <GeomAPI_Pnt2d.h>
-#include <GeomDataAPI_Dir.h>
-#include <GeomDataAPI_Point.h>
-#include <GeomDataAPI_Point2D.h>
-#include <ModelAPI_AttributeDouble.h>
-#include <ModelAPI_Document.h>
+////#include <GeomAPI_XY.h>
+////#include <GeomAPI_Dir2d.h>
+////#include <GeomAPI_Pnt2d.h>
+////#include <GeomDataAPI_Dir.h>
+////#include <GeomDataAPI_Point.h>
+////#include <GeomDataAPI_Point2D.h>
+////#include <ModelAPI_AttributeDouble.h>
+#include <ModelAPI_AttributeString.h>
+////#include <ModelAPI_Document.h>
 #include <ModelAPI_Events.h>
-#include <ModelAPI_ResultConstruction.h>
-
-#include <SketchPlugin_Constraint.h>
-#include <SketchPlugin_ConstraintFillet.h>
-#include <SketchPlugin_ConstraintLength.h>
+////#include <ModelAPI_ResultConstruction.h>
+#include <ModelAPI_Session.h>
+#include <ModelAPI_Validator.h>
+////
+////#include <SketchPlugin_Constraint.h>
+#include <SketchPlugin_ConstraintAngle.h>
 #include <SketchPlugin_ConstraintCoincidence.h>
+#include <SketchPlugin_ConstraintDistance.h>
+#include <SketchPlugin_ConstraintEqual.h>
+#include <SketchPlugin_ConstraintHorizontal.h>
+#include <SketchPlugin_ConstraintLength.h>
+#include <SketchPlugin_ConstraintFillet.h>
 #include <SketchPlugin_ConstraintMirror.h>
+#include <SketchPlugin_ConstraintParallel.h>
+#include <SketchPlugin_ConstraintPerpendicular.h>
+#include <SketchPlugin_ConstraintRadius.h>
 #include <SketchPlugin_ConstraintRigid.h>
 #include <SketchPlugin_ConstraintTangent.h>
-#include <SketchPlugin_Feature.h>
-
-#include <SketchPlugin_Arc.h>
-#include <SketchPlugin_Circle.h>
-#include <SketchPlugin_Line.h>
-#include <SketchPlugin_Point.h>
-#include <SketchPlugin_Sketch.h>
+#include <SketchPlugin_ConstraintVertical.h>
+////#include <SketchPlugin_Feature.h>
+#include <SketchPlugin_MultiRotation.h>
+#include <SketchPlugin_MultiTranslation.h>
+////#include <SketchPlugin_Sketch.h>
+////
+////#include <SketchPlugin_Arc.h>
+////#include <SketchPlugin_Circle.h>
+////#include <SketchPlugin_Line.h>
+////#include <SketchPlugin_Point.h>
+////#include <SketchPlugin_Sketch.h>
 
 #include <math.h>
 #include <assert.h>
@@ -48,9 +64,9 @@ class GroupIndexer
 {
 public:
   /// \brief Return vacant index
-  static Slvs_hGroup NEW_GROUP() { return ++myGroupIndex; }
+  static GroupID NEW_GROUP() { return ++myGroupIndex; }
   /// \brief Removes the index
-  static void REMOVE_GROUP(const Slvs_hGroup& theIndex) {
+  static void REMOVE_GROUP(const GroupID& theIndex) {
     if (myGroupIndex == theIndex)
       myGroupIndex--;
   }
@@ -58,10 +74,18 @@ public:
 private:
   GroupIndexer() {};
 
-  static Slvs_hGroup myGroupIndex; ///< index of the group
+  static GroupID myGroupIndex; ///< index of the group
 };
 
-Slvs_hGroup GroupIndexer::myGroupIndex = 0;
+GroupID GroupIndexer::myGroupIndex = GID_OUTOFGROUP;
+
+
+static void sendMessage(const char* theMessageName)
+{
+  std::shared_ptr<Events_Message> aMessage = std::shared_ptr<Events_Message>(
+      new Events_Message(Events_Loop::eventByName(theMessageName)));
+  Events_Loop::loop()->send(aMessage);
+}
 
 
 
@@ -71,15 +95,12 @@ Slvs_hGroup GroupIndexer::myGroupIndex = 0;
 
 SketchSolver_Group::SketchSolver_Group(
     std::shared_ptr<ModelAPI_CompositeFeature> theWorkplane)
-    : myID(GroupIndexer::NEW_GROUP())
+    : myID(GroupIndexer::NEW_GROUP()),
+      myPrevSolved(true)
 {
   // Initialize workplane
-  myWorkplaneID = SLVS_E_UNKNOWN;
-#ifndef NDEBUG
-  assert(addWorkplane(theWorkplane));
-#else
+  myWorkplaneID = EID_UNKNOWN;
   addWorkplane(theWorkplane);
-#endif
 }
 
 SketchSolver_Group::~SketchSolver_Group()
@@ -103,65 +124,13 @@ bool SketchSolver_Group::isBaseWorkplane(CompositeFeaturePtr theWorkplane) const
 //  Class:    SketchSolver_Group
 //  Purpose:  verify are there any entities in the group used by given constraint
 // ============================================================================
-bool SketchSolver_Group::isInteract(
-    std::shared_ptr<SketchPlugin_Feature> theFeature) const
+bool SketchSolver_Group::isInteract(FeaturePtr theFeature) const
 {
   // Empty group interacts with everything
-  if (isEmpty()) return true;
-  ConstraintPtr aConstraint = std::dynamic_pointer_cast<SketchPlugin_Constraint>(theFeature);
-  if (aConstraint)
-    return myFeatureStorage->isInteract(aConstraint);
-  return myFeatureStorage->isInteract(std::dynamic_pointer_cast<ModelAPI_Feature>(theFeature));
-}
-
-// ============================================================================
-//  Function: getFeatureId
-//  Class:    SketchSolver_Group
-//  Purpose:  Find the identifier of the feature, if it already exists in the group
-// ============================================================================
-Slvs_hEntity SketchSolver_Group::getFeatureId(FeaturePtr theFeature) const
-{
-  Slvs_hEntity aResult = SLVS_E_UNKNOWN;
-  if (!myFeatureStorage)
-    return aResult;
-  std::set<ConstraintPtr> aConstraints = myFeatureStorage->getConstraints(theFeature);
-  if (aConstraints.empty())
-    return aResult;
-  std::set<ConstraintPtr>::iterator aConstrIter = aConstraints.begin();
-  for (; aConstrIter != aConstraints.end(); aConstrIter++) {
-    ConstraintConstraintMap::const_iterator aCIter = myConstraints.find(*aConstrIter);
-    if (aCIter == myConstraints.end())
-      continue;
-    aResult = aCIter->second->getId(theFeature);
-    if (aResult != SLVS_E_UNKNOWN)
-      return aResult;
-  }
-  return SLVS_E_UNKNOWN;
-}
-
-// ============================================================================
-//  Function: getAttributeId
-//  Class:    SketchSolver_Group
-//  Purpose:  Find the identifier of the attribute, if it already exists in the group
-// ============================================================================
-Slvs_hEntity SketchSolver_Group::getAttributeId(AttributePtr theAttribute) const
-{
-  Slvs_hEntity aResult = SLVS_E_UNKNOWN;
-  if (!myFeatureStorage)
-    return aResult;
-  std::set<ConstraintPtr> aConstraints = myFeatureStorage->getConstraints(theAttribute);
-  if (aConstraints.empty())
-    return aResult;
-  std::set<ConstraintPtr>::iterator aConstrIter = aConstraints.begin();
-  for (; aConstrIter != aConstraints.end(); aConstrIter++) {
-    ConstraintConstraintMap::const_iterator aCIter = myConstraints.find(*aConstrIter);
-    if (aCIter == myConstraints.end())
-      continue;
-    aResult = aCIter->second->getId(theAttribute);
-    if (aResult != SLVS_E_UNKNOWN)
-      return aResult;
-  }
-  return SLVS_E_UNKNOWN;
+  if (isEmpty())
+    return true;
+  // Check interaction with the storage
+  return myStorage->isInteract(theFeature);
 }
 
 // ============================================================================
@@ -173,134 +142,221 @@ bool SketchSolver_Group::changeConstraint(
     std::shared_ptr<SketchPlugin_Constraint> theConstraint)
 {
   // There is no workplane yet, something wrong
-  if (myWorkplaneID == SLVS_E_UNKNOWN)
+  if (myWorkplaneID == EID_UNKNOWN)
+    return false;
+
+  if (!theConstraint || !theConstraint->data())
     return false;
 
-  if (!theConstraint)
+  if (!checkFeatureValidity(theConstraint))
     return false;
 
-  if (myConstraints.find(theConstraint) == myConstraints.end()) {
+  BuilderPtr aBuilder = SketchSolver_Manager::instance()->builder();
+
+  bool isNewConstraint = myConstraints.find(theConstraint) == myConstraints.end();
+  if (isNewConstraint) {
     // Add constraint to the current group
-    SolverConstraintPtr aConstraint =
-        SketchSolver_Builder::getInstance()->createConstraint(theConstraint);
+    SolverConstraintPtr aConstraint = aBuilder->createConstraint(theConstraint);
     if (!aConstraint)
       return false;
-    aConstraint->setGroup(this);
-    aConstraint->setStorage(myStorage);
+    aConstraint->process(myStorage, getId(), getWorkplaneId());
     if (!aConstraint->error().empty()) {
       if (aConstraint->error() == SketchSolver_Error::NOT_INITIALIZED())
         return false; // some attribute are not initialized yet, don't show message
       Events_Error::send(aConstraint->error(), this);
     }
 
-    // Additional verification of coincidence of several points
-    if (theConstraint->getKind() == SketchPlugin_ConstraintCoincidence::ID()) {
-      ConstraintConstraintMap::iterator aCIter = myConstraints.begin();
-      for (; aCIter != myConstraints.end(); aCIter++) {
-        std::shared_ptr<SketchSolver_ConstraintCoincidence> aCoincidence =
-          std::dynamic_pointer_cast<SketchSolver_ConstraintCoincidence>(aCIter->second);
-        if (!aCoincidence)
-          continue;
-        std::shared_ptr<SketchSolver_ConstraintCoincidence> aCoinc2 =
-          std::dynamic_pointer_cast<SketchSolver_ConstraintCoincidence>(aConstraint);
-        if (aCoincidence != aCoinc2 && aCoincidence->isCoincide(aCoinc2)) {
-          aCoincidence->attach(aCoinc2);
-          aConstraint = aCoincidence;
-        }
-      }
-    }
+////    // Additional verification of coincidence of several points
+////    if (aConstraint->getType() == CONSTRAINT_PT_PT_COINCIDENT) {
+////      bool hasMultiCoincidence = false;
+////      std::shared_ptr<SketchSolver_ConstraintCoincidence> aCoincidence =
+////          std::dynamic_pointer_cast<SketchSolver_ConstraintCoincidence>(aConstraint);
+////
+////      ConstraintConstraintMap::iterator aCIter = myConstraints.begin();
+////      for (; aCIter != myConstraints.end(); ++aCIter) {
+////        if (aCIter->second->getType() != CONSTRAINT_PT_PT_COINCIDENT)
+////          continue;
+////
+////        std::shared_ptr<SketchSolver_ConstraintCoincidence> aCurCoinc =
+////          std::dynamic_pointer_cast<SketchSolver_ConstraintCoincidence>(aCIter->second);
+////        if (aCoincidence != aCurCoinc && aCurCoinc->isCoincide(aCoincidence)) {
+////          aCoincidence->attach(aCurCoinc);
+////////          // update other coincidences
+////////          ConstraintConstraintMap::iterator anIt = aCIter;
+////////          for (++anIt; anIt != myConstraints.end(); ++anIt)
+////////            if (anIt->second == aCIter->second)
+////////              anIt->second = aCoincidence;
+////          aCIter->second = aCoincidence;
+////          hasMultiCoincidence = true;
+////        }
+////      }
+////
+////      if (hasMultiCoincidence)
+////        notifyMultiConstraints();
+////    }
     myConstraints[theConstraint] = aConstraint;
   }
   else
     myConstraints[theConstraint]->update();
 
-  // Fix base features for fillet
-  if (theConstraint->getKind() == SketchPlugin_ConstraintFillet::ID()) {
-    std::list<AttributePtr> anAttrList =
-        theConstraint->data()->attributes(ModelAPI_AttributeRefAttr::typeId());
-    std::list<AttributePtr>::iterator anAttrIter = anAttrList.begin();
-    for (; anAttrIter != anAttrList.end(); anAttrIter++) {
-      AttributeRefAttrPtr aRefAttr =
-          std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(*anAttrIter);
-      if (!aRefAttr || !aRefAttr->isObject())
-        continue;
-      FeaturePtr aFeature = ModelAPI_Feature::feature(aRefAttr->object());
-      SolverConstraintPtr aConstraint =
-          SketchSolver_Builder::getInstance()->createRigidConstraint(aFeature);
-      if (!aConstraint)
-        continue;
-      aConstraint->setGroup(this);
-      aConstraint->setStorage(myStorage);
-      setTemporary(aConstraint);
-    }
-  }
-  // Fix base features for mirror
+////  // Fix base features for fillet
+////  if (isNewConstraint && theConstraint->getKind() == SketchPlugin_ConstraintFillet::ID()) {
+////    std::list<AttributePtr> anAttrList =
+////        theConstraint->data()->attributes(ModelAPI_AttributeRefAttr::typeId());
+////    std::list<AttributePtr>::iterator anAttrIter = anAttrList.begin();
+////    for (; anAttrIter != anAttrList.end(); anAttrIter++) {
+////      AttributeRefAttrPtr aRefAttr =
+////          std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(*anAttrIter);
+////      if (!aRefAttr || !aRefAttr->isObject())
+////        continue;
+////      FeaturePtr aFeature = ModelAPI_Feature::feature(aRefAttr->object());
+////      SolverConstraintPtr aConstraint = aBuilder->createRigidConstraint(aFeature);
+////      if (!aConstraint)
+////        continue;
+////      aConstraint->setGroup(this);
+////      aConstraint->setStorage(myStorage);
+////      setTemporary(aConstraint);
+////    }
+////  }
+
+  // Fix mirror line
   if (theConstraint->getKind() == SketchPlugin_ConstraintMirror::ID()) {
-    AttributeRefListPtr aRefList = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
-        theConstraint->attribute(SketchPlugin_ConstraintMirror::ENTITY_B()));
-    fixFeaturesList(aRefList);
+    AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
+        theConstraint->attribute(SketchPlugin_ConstraintMirror::ENTITY_A()));
+    if (aRefAttr && aRefAttr->isObject()) {
+      std::shared_ptr<SketchPlugin_Feature> aFeature =
+          std::dynamic_pointer_cast<SketchPlugin_Feature>(
+          ModelAPI_Feature::feature(aRefAttr->object()));
+      if (aFeature) {
+        SolverConstraintPtr aConstraint = aBuilder->createFixedConstraint(aFeature);
+        if (aConstraint) {
+          aConstraint->process(myStorage, getId(), getWorkplaneId());
+          setTemporary(aConstraint);
+        }
+      }
+    }
   }
 
-  if (!myFeatureStorage)
-    myFeatureStorage = FeatureStoragePtr(new SketchSolver_FeatureStorage);
-  myFeatureStorage->changeConstraint(theConstraint);
+////  // Check the attributes of constraint are given by parametric expression
+////  std::list<AttributePtr> anAttributes =
+////      theConstraint->data()->attributes(ModelAPI_AttributeRefAttr::typeId());
+////  std::list<AttributePtr>::iterator anAttrIt = anAttributes.begin();
+////  for (; anAttrIt != anAttributes.end(); ++anAttrIt) {
+////    AttributeRefAttrPtr aRefAttr =
+////        std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(*anAttrIt);
+////    if (!aRefAttr)
+////      continue;
+////
+////    std::shared_ptr<GeomDataAPI_Point2D> aPoint;
+////    if (aRefAttr->isObject()) {
+////      FeaturePtr aFeat = ModelAPI_Feature::feature(aRefAttr->object());
+////      if (aFeat->getKind() != SketchPlugin_Point::ID())
+////        continue;
+////      aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+////          aFeat->attribute(SketchPlugin_Point::COORD_ID()));
+////    } else
+////      aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aRefAttr->attr());
+////
+////    if (!aPoint || (aPoint->textX().empty() && aPoint->textY().empty()))
+////      continue;
+////
+////    std::map<AttributePtr, SolverConstraintPtr>::iterator aFound =
+////        myParametricConstraints.find(aPoint);
+////    if (aFound == myParametricConstraints.end()) {
+////      SolverConstraintPtr aConstraint = aBuilder->createParametricConstraint(aPoint);
+////      if (!aConstraint)
+////        continue;
+////      aConstraint->setGroup(this);
+////      aConstraint->setStorage(myStorage);
+////      myParametricConstraints[aPoint] = aConstraint;
+////    } else
+////      aFound->second->update();
+////  }
 
   return true;
 }
 
 
-bool SketchSolver_Group::updateFeature(std::shared_ptr<SketchPlugin_Feature> theFeature)
+void SketchSolver_Group::updateConstraints()
 {
-  std::set<ConstraintPtr> aConstraints =
-      myFeatureStorage->getConstraints(std::dynamic_pointer_cast<ModelAPI_Feature>(theFeature));
-  if (aConstraints.empty())
-    return false;
-  std::set<ConstraintPtr>::iterator aCIter = aConstraints.begin();
-  for (; aCIter != aConstraints.end(); aCIter++) {
-    ConstraintConstraintMap::iterator aSolConIter = myConstraints.find(*aCIter);
-    if (aSolConIter == myConstraints.end())
+  std::set<SolverConstraintPtr> aPostponed; // postponed constraints Multi-Rotation and Multi-Translation
+
+  ConstraintConstraintMap::iterator anIt = myConstraints.begin();
+  for (; anIt != myConstraints.end(); ++anIt) {
+    if (myChangedConstraints.find(anIt->first) == myChangedConstraints.end())
       continue;
-    myFeatureStorage->changeFeature(theFeature, aSolConIter->first);
-    aSolConIter->second->addFeature(theFeature);
-    aSolConIter->second->update();
+    if (anIt->first->getKind() == SketchPlugin_MultiRotation::ID() ||
+        anIt->first->getKind() == SketchPlugin_MultiTranslation::ID())
+      aPostponed.insert(anIt->second);
+    else
+      anIt->second->update();
   }
-  return true;
+
+  // Update postponed constraints
+  std::set<SolverConstraintPtr>::iterator aSCIter = aPostponed.begin();
+  for (; aSCIter != aPostponed.end(); ++aSCIter)
+    (*aSCIter)->update();
+
+  myChangedConstraints.clear();
 }
 
-void SketchSolver_Group::moveFeature(std::shared_ptr<SketchPlugin_Feature> theFeature)
+bool SketchSolver_Group::updateFeature(FeaturePtr theFeature)
 {
-  updateFeature(theFeature);
-  // Temporary rigid constraint
-  SolverConstraintPtr aConstraint =
-      SketchSolver_Builder::getInstance()->createRigidConstraint(theFeature);
-  if (!aConstraint)
-    return;
-  aConstraint->setGroup(this);
-  aConstraint->setStorage(myStorage);
-  setTemporary(aConstraint);
+  if (!checkFeatureValidity(theFeature))
+    return false;
+
+  bool isUpdated = myStorage->update(theFeature);
+
+////  // Search attributes of the feature in the set of parametric constraints and update them
+////  std::list<AttributePtr> anAttrList =
+////      theFeature->data()->attributes(GeomDataAPI_Point2D::typeId());
+////  std::list<AttributePtr>::iterator anAttrIt = anAttrList.begin();
+////  for (; anAttrIt != anAttrList.end(); ++anAttrIt) {
+////    std::map<AttributePtr, SolverConstraintPtr>::iterator aFound =
+////        myParametricConstraints.find(*anAttrIt);
+////    if (aFound != myParametricConstraints.end())
+////      aFound->second->update();
+////    else {
+////      std::shared_ptr<GeomDataAPI_Point2D> aPoint =
+////          std::dynamic_pointer_cast<GeomDataAPI_Point2D>(*anAttrIt);
+////      if (aPoint && (!aPoint->textX().empty() || !aPoint->textY().empty())) {
+////        // Create new parametric constraint
+////        SolverConstraintPtr aConstraint =
+////            SketchSolver_Builder::getInstance()->createParametricConstraint(*anAttrIt);
+////        if (!aConstraint)
+////          continue;
+////        aConstraint->setGroup(this);
+////        aConstraint->setStorage(myStorage);
+////        myParametricConstraints[*anAttrIt] = aConstraint;
+////      }
+////    }
+////  }
+  return isUpdated;
 }
 
-// ============================================================================
-//  Function: fixFeaturesList
-//  Class:    SketchSolver_Group
-//  Purpose:  Apply temporary rigid constraints for the list of features
-// ============================================================================
-void SketchSolver_Group::fixFeaturesList(AttributeRefListPtr theList)
+void SketchSolver_Group::moveFeature(FeaturePtr theFeature)
 {
-  std::list<ObjectPtr> aList = theList->list();
-  std::list<ObjectPtr>::iterator anIt = aList.begin();
-  for (; anIt != aList.end(); anIt++) {
-    if (!(*anIt))
-      continue;
-    FeaturePtr aFeature = ModelAPI_Feature::feature(*anIt);
-    SolverConstraintPtr aConstraint =
-        SketchSolver_Builder::getInstance()->createRigidConstraint(aFeature);
-    if (!aConstraint)
-      continue;
-    aConstraint->setGroup(this);
-    aConstraint->setStorage(myStorage);
-    setTemporary(aConstraint);
+  BuilderPtr aBuilder = SketchSolver_Manager::instance()->builder();
+
+  // Firstly, revert changes in the fixed entities
+  myStorage->refresh(true);
+
+  // Secondly, search attributes of the feature in the list of the Multi constraints and update them
+  ConstraintConstraintMap::iterator aCIt = myConstraints.begin();
+  for (; aCIt != myConstraints.end(); ++aCIt) {
+    if ((aCIt->second->getType() == CONSTRAINT_MULTI_ROTATION ||
+         aCIt->second->getType() == CONSTRAINT_MULTI_TRANSLATION)
+        && aCIt->second->isUsed(theFeature))
+      std::dynamic_pointer_cast<SketchSolver_ConstraintMulti>(aCIt->second)->update(true);
   }
+
+  // Then, create temporary rigid constraint
+  SolverConstraintPtr aConstraint = aBuilder->createMovementConstraint(theFeature);
+  if (!aConstraint)
+    return;
+  aConstraint->process(myStorage, getId(), getWorkplaneId());
+  if (aConstraint->error().empty())
+    setTemporary(aConstraint);
 }
 
 // ============================================================================
@@ -310,11 +366,14 @@ void SketchSolver_Group::fixFeaturesList(AttributeRefListPtr theList)
 // ============================================================================
 bool SketchSolver_Group::addWorkplane(CompositeFeaturePtr theSketch)
 {
-  if (myWorkplaneID != SLVS_E_UNKNOWN || theSketch->getKind() != SketchPlugin_Sketch::ID())
+  if (myWorkplaneID != EID_UNKNOWN || theSketch->getKind() != SketchPlugin_Sketch::ID())
     return false;  // the workplane already exists or the function parameter is not Sketch
 
   mySketch = theSketch;
-  updateWorkplane();
+  if (!updateWorkplane()) {
+    mySketch = CompositeFeaturePtr();
+    return false;
+  }
   return true;
 }
 
@@ -325,55 +384,17 @@ bool SketchSolver_Group::addWorkplane(CompositeFeaturePtr theSketch)
 // ============================================================================
 bool SketchSolver_Group::updateWorkplane()
 {
+  BuilderPtr aBuilder = SketchSolver_Manager::instance()->builder();
   if (!myStorage) // Create storage if not exists
-    myStorage = StoragePtr(new SketchSolver_Storage);
-  SketchSolver_Builder* aBuilder = SketchSolver_Builder::getInstance();
-
-  std::vector<Slvs_Entity> anEntities;
-  std::vector<Slvs_Param> aParams;
-  if (!aBuilder->createWorkplane(mySketch, anEntities, aParams))
-    return false;
+    myStorage = aBuilder->createStorage(getId());
 
-  if (myWorkplaneID == SLVS_E_UNKNOWN) {
-    myWorkplaneID = anEntities.back().h;
-    // Add new workplane elements
-    std::vector<Slvs_Param>::iterator aParIter = aParams.begin();
-    for (; aParIter != aParams.end(); aParIter++) {
-      aParIter->h = SLVS_E_UNKNOWN; // the ID should be generated by storage
-      aParIter->group = myID;
-      aParIter->h = myStorage->addParameter(*aParIter);
-    }
-    std::vector<Slvs_Entity>::iterator anEntIter = anEntities.begin();
-    for (; anEntIter != anEntities.end(); anEntIter++) {
-      anEntIter->h = SLVS_E_UNKNOWN; // the ID should be generated by storage
-      anEntIter->group = myID;
-      anEntIter->wrkpl = myWorkplaneID;
-      for (int i = 0; i < 4; i++)
-        if (anEntIter->param[i] != SLVS_E_UNKNOWN)
-          anEntIter->param[i] = aParams[anEntIter->param[i]-1].h;
-      for (int i = 0; i < 4; i++)
-        if (anEntIter->point[i] != SLVS_E_UNKNOWN)
-          anEntIter->point[i] = anEntities[anEntIter->point[i]-1].h;
-      anEntIter->h = myStorage->addEntity(*anEntIter);
-    }
-  } else {
-    // Update existent workplane
-    const Slvs_Entity& aWP = myStorage->getEntity(myWorkplaneID);
-    const Slvs_Entity& anOrigin = myStorage->getEntity(aWP.point[0]);
-    const Slvs_Entity& aNormal = myStorage->getEntity(aWP.normal);
-    // Get parameters and update them
-    Slvs_hParam aWPParams[7] = {
-        anOrigin.param[0], anOrigin.param[1], anOrigin.param[2],
-        aNormal.param[0], aNormal.param[1], aNormal.param[2], aNormal.param[3]
-      };
-    std::vector<Slvs_Param>::iterator aParIter = aParams.begin();
-    for (int i = 0; aParIter != aParams.end(); aParIter++, i++) {
-      Slvs_Param aParam = myStorage->getParameter(aWPParams[i]);
-      aParam.val = aParIter->val;
-      myStorage->updateParameter(aParam);
-    }
+  // sketch should be unchanged, set it out of current group
+  bool isUpdated = myStorage->update(FeaturePtr(mySketch), GID_OUTOFGROUP);
+  if (isUpdated) {
+    EntityWrapperPtr anEntity = myStorage->entity(FeaturePtr(mySketch));
+    myWorkplaneID = anEntity->id();
   }
-  return myWorkplaneID > 0;
+  return isUpdated;
 }
 
 // ============================================================================
@@ -383,28 +404,96 @@ bool SketchSolver_Group::updateWorkplane()
 // ============================================================================
 bool SketchSolver_Group::resolveConstraints()
 {
+  if (!myChangedConstraints.empty())
+    updateConstraints();
+
   bool aResolved = false;
-  if (myStorage->isNeedToResolve() && !isEmpty()) {
-    myConstrSolver.setGroupID(myID);
-    myStorage->initializeSolver(myConstrSolver);
+  bool isGroupEmpty = isEmpty();
+  if (myStorage->isNeedToResolve() && !isGroupEmpty) {
+    if (!mySketchSolver)
+      mySketchSolver = SketchSolver_Manager::instance()->builder()->createSolver();
+
+    mySketchSolver->setGroup(myID);
+    mySketchSolver->calculateFailedConstraints(false);
+    myStorage->initializeSolver(mySketchSolver);
 
-    int aResult = SLVS_RESULT_OKAY;
+    SketchSolver_SolveStatus aResult = STATUS_OK;
     try {
-      aResult = myConstrSolver.solve();
+      if (myStorage->hasDuplicatedConstraint())
+        aResult = STATUS_INCONSISTENT;
+      else {
+        // To avoid overconstraint situation, we will remove temporary constraints one-by-one
+        // and try to find the case without overconstraint
+        bool isLastChance = false;
+        size_t aNbTemp = myStorage->nbTemporary();
+        while (true) {
+          aResult = mySketchSolver->solve();
+          if (aResult == STATUS_OK || aResult == STATUS_EMPTYSET || isLastChance)
+            break;
+          if (aNbTemp == 0) {
+            // try to update parameters and resolve once again
+            ConstraintConstraintMap::iterator aConstrIt = myConstraints.begin();
+            for (; aConstrIt != myConstraints.end(); ++aConstrIt)
+              aConstrIt->second->update();
+            isLastChance = true;
+          } else
+            aNbTemp = myStorage->removeTemporary();
+          mySketchSolver->calculateFailedConstraints(true); // something failed => need to find it
+          myStorage->initializeSolver(mySketchSolver);
+        }
+      }
     } catch (...) {
-      Events_Error::send(SketchSolver_Error::SOLVESPACE_CRASH(), this);
+//      Events_Error::send(SketchSolver_Error::SOLVESPACE_CRASH(), this);
+      getWorkplane()->string(SketchPlugin_Sketch::SOLVER_ERROR())->setValue(SketchSolver_Error::SOLVESPACE_CRASH());
+      if (myPrevSolved) {
+        // the error message should be changed before sending the message
+        sendMessage(EVENT_SOLVER_FAILED);
+        myPrevSolved = false;
+      }
       return false;
     }
-    if (aResult == SLVS_RESULT_OKAY) {  // solution succeeded, store results into correspondent attributes
-      myFeatureStorage->blockEvents(true);
-      ConstraintConstraintMap::iterator aConstrIter = myConstraints.begin();
-      for (; aConstrIter != myConstraints.end(); aConstrIter++)
-        aConstrIter->second->refresh();
-      myFeatureStorage->blockEvents(false);
-    } else if (!myConstraints.empty())
-      Events_Error::send(SketchSolver_Error::CONSTRAINTS(), this);
+    if (aResult == STATUS_OK || aResult == STATUS_EMPTYSET) {  // solution succeeded, store results into correspondent attributes
+      myStorage->refresh();
+////      myFeatureStorage->blockEvents(true);
+////      // First refresh parametric constraints to satisfy parameters
+////      std::map<AttributePtr, SolverConstraintPtr>::iterator aParIter = myParametricConstraints.begin();
+////      for (; aParIter != myParametricConstraints.end(); ++aParIter)
+////        aParIter->second->refresh();
+////      // Update all other constraints
+////      ConstraintConstraintMap::iterator aConstrIter = myConstraints.begin();
+////      for (; aConstrIter != myConstraints.end(); ++aConstrIter)
+////        aConstrIter->second->refresh();
+////      myFeatureStorage->blockEvents(false);
+      if (!myPrevSolved) {
+        getWorkplane()->string(SketchPlugin_Sketch::SOLVER_ERROR())->setValue("");
+        // the error message should be changed before sending the message
+        sendMessage(EVENT_SOLVER_REPAIRED);
+        myPrevSolved = true;
+      }
+    } else if (!myConstraints.empty()) {
+//      Events_Error::send(SketchSolver_Error::CONSTRAINTS(), this);
+      getWorkplane()->string(SketchPlugin_Sketch::SOLVER_ERROR())->setValue(SketchSolver_Error::CONSTRAINTS());
+      if (myPrevSolved) {
+        // the error message should be changed before sending the message
+        sendMessage(EVENT_SOLVER_FAILED);
+        myPrevSolved = false;
+      }
+    }
 
     aResolved = true;
+  } else if (!isGroupEmpty) {
+////    myFeatureStorage->blockEvents(true);
+    // Check there are constraints Fixed. If they exist, update parameters by stored values
+    ConstraintConstraintMap::iterator aCIt = myConstraints.begin();
+    for (; aCIt != myConstraints.end(); ++aCIt)
+      if (aCIt->first->getKind() == SketchPlugin_ConstraintRigid::ID()) {
+////        aCIt->second->refresh();
+        aResolved = true;
+        break;
+      }
+////     myFeatureStorage->blockEvents(false);
+    if (aCIt != myConstraints.end())
+      myStorage->refresh();
   }
   removeTemporaryConstraints();
   myStorage->setNeedToResolve(false);
@@ -421,21 +510,20 @@ void SketchSolver_Group::mergeGroups(const SketchSolver_Group& theGroup)
   // If specified group is empty, no need to merge
   if (theGroup.isEmpty())
     return;
-  if (!myFeatureStorage)
-    myFeatureStorage = FeatureStoragePtr(new SketchSolver_FeatureStorage);
 
-  std::vector<ConstraintPtr> aComplexConstraints;
+  std::set<ObjectPtr> aConstraints;
   ConstraintConstraintMap::const_iterator aConstrIter = theGroup.myConstraints.begin();
-  // append simple constraints
   for (; aConstrIter != theGroup.myConstraints.end(); aConstrIter++)
-    if (isComplexConstraint(aConstrIter->first))
-      aComplexConstraints.push_back(aConstrIter->first);
-    else
-      changeConstraint(aConstrIter->first);
-  // append complex constraints
-  std::vector<ConstraintPtr>::iterator aComplexIter = aComplexConstraints.begin();
-  for (; aComplexIter != aComplexConstraints.end(); aComplexIter++)
-      changeConstraint(*aComplexIter);
+    aConstraints.insert(aConstrIter->first);
+
+  std::list<FeaturePtr> aSortedConstraints = selectApplicableFeatures(aConstraints);
+  std::list<FeaturePtr>::iterator aSCIter = aSortedConstraints.begin();
+  for (; aSCIter != aSortedConstraints.end(); ++aSCIter) {
+    ConstraintPtr aConstr = std::dynamic_pointer_cast<SketchPlugin_Constraint>(*aSCIter);
+    if (!aConstr)
+      continue;
+    changeConstraint(aConstr);
+  }
 }
 
 // ============================================================================
@@ -443,41 +531,41 @@ void SketchSolver_Group::mergeGroups(const SketchSolver_Group& theGroup)
 //  Class:    SketchSolver_Group
 //  Purpose:  divide the group into several subgroups
 // ============================================================================
-void SketchSolver_Group::splitGroup(std::vector<SketchSolver_Group*>& theCuts)
+void SketchSolver_Group::splitGroup(std::list<SketchSolver_Group*>& theCuts)
 {
+  // New storage will be used in trimmed way to store the list of constraint interacted together.
+  StoragePtr aNewStorage = SketchSolver_Manager::instance()->builder()->createStorage(getId());
+  std::list<ConstraintWrapperPtr> aDummyVec; // empty vector to avoid creation of solver's constraints
+
   // Obtain constraints, which should be separated
-  FeatureStoragePtr aNewFeatStorage(new SketchSolver_FeatureStorage);
-  std::vector<ConstraintPtr> anUnusedConstraints;
+  std::list<ConstraintPtr> anUnusedConstraints;
   ConstraintConstraintMap::iterator aCIter = myConstraints.begin();
   for ( ; aCIter != myConstraints.end(); aCIter++) {
-    std::list<ConstraintPtr> aBaseConstraints = aCIter->second->constraints();
-    std::list<ConstraintPtr>::iterator anIter = aBaseConstraints.begin();
-    for (; anIter != aBaseConstraints.end(); anIter++)
-      if (aNewFeatStorage->isInteract(*anIter)) {
-        aNewFeatStorage->changeConstraint(*anIter);
-      } else
-        anUnusedConstraints.push_back(*anIter);
+    if (aNewStorage->isInteract(FeaturePtr(aCIter->first)))
+      aNewStorage->addConstraint(aCIter->first, aDummyVec);
+    else
+      anUnusedConstraints.push_back(aCIter->first);
   }
 
   // Check the unused constraints once again, because they may become interacted with new storage since adding constraints
-  std::vector<ConstraintPtr>::iterator aUnuseIt = anUnusedConstraints.begin();
+  std::list<ConstraintPtr>::iterator aUnuseIt = anUnusedConstraints.begin();
   while (aUnuseIt != anUnusedConstraints.end()) {
-    if (aNewFeatStorage->isInteract(*aUnuseIt)) {
-      size_t aShift = aUnuseIt - anUnusedConstraints.begin();
+    if (aNewStorage->isInteract(FeaturePtr(*aUnuseIt))) {
+      aNewStorage->addConstraint(*aUnuseIt, aDummyVec);
       anUnusedConstraints.erase(aUnuseIt);
-      aUnuseIt = anUnusedConstraints.begin() + aShift;
+      aUnuseIt = anUnusedConstraints.begin();
       continue;
     }
     aUnuseIt++;
   }
 
-  std::vector<SketchSolver_Group*>::iterator aCutsIter;
+  std::list<SketchSolver_Group*>::iterator aCutsIter;
   aUnuseIt = anUnusedConstraints.begin();
-  for ( ; aUnuseIt != anUnusedConstraints.end(); aUnuseIt++) {
+  for ( ; aUnuseIt != anUnusedConstraints.end(); ++aUnuseIt) {
     // Remove unused constraints
     removeConstraint(*aUnuseIt);
     // Try to append constraint to already existent group
-    for (aCutsIter = theCuts.begin(); aCutsIter != theCuts.end(); aCutsIter++)
+    for (aCutsIter = theCuts.begin(); aCutsIter != theCuts.end(); ++aCutsIter)
       if ((*aCutsIter)->isInteract(*aUnuseIt)) {
         (*aCutsIter)->changeConstraint(*aUnuseIt);
         break;
@@ -487,6 +575,15 @@ void SketchSolver_Group::splitGroup(std::vector<SketchSolver_Group*>& theCuts)
       SketchSolver_Group* aGroup = new SketchSolver_Group(mySketch);
       aGroup->changeConstraint(*aUnuseIt);
       theCuts.push_back(aGroup);
+    } else {
+      // Find other groups interacting with constraint
+      std::list<SketchSolver_Group*>::iterator aBaseGroupIt = aCutsIter;
+      for (++aCutsIter; aCutsIter != theCuts.end(); ++aCutsIter)
+        if ((*aCutsIter)->isInteract(*aUnuseIt)) {
+          (*aBaseGroupIt)->mergeGroups(**aCutsIter);
+          std::list<SketchSolver_Group*>::iterator aRemoveIt = aCutsIter--;
+          theCuts.erase(aRemoveIt);
+        }
     }
   }
 }
@@ -498,28 +595,35 @@ void SketchSolver_Group::splitGroup(std::vector<SketchSolver_Group*>& theCuts)
 // ============================================================================
 bool SketchSolver_Group::isConsistent()
 {
-  if (!myFeatureStorage) // no one constraint is initialized yet
+  if (isEmpty()) // no one constraint is initialized yet
     return true;
 
-  bool aResult = myFeatureStorage->isConsistent();
+  // Check the features and constraint is the storage are valid
+  bool aResult = myStorage->isConsistent();
+  if (aResult) {
+    // additional check of consistency of the Fixed constraint,
+    // because they are not added to the storage
+    ConstraintConstraintMap::iterator aCIter = myConstraints.begin();
+    for (; aCIter != myConstraints.end(); ++aCIter)
+      if (aCIter->first->getKind() == SketchPlugin_ConstraintRigid::ID() &&
+         (!aCIter->first->data() || !aCIter->first->data()->isValid())) {
+        aResult = false;
+        break;
+      }
+  }
   if (!aResult) {
-    // remove invalid entities
+    // remove invalid constraints
+    std::set<ConstraintPtr> anInvalidConstraints;
     ConstraintConstraintMap::iterator aCIter = myConstraints.begin();
-    while (aCIter != myConstraints.end()) {
-      std::list<ConstraintPtr> aConstraints = aCIter->second->constraints();
-      std::list<ConstraintPtr>::iterator anIt = aConstraints.begin();
-      for (; anIt != aConstraints.end(); anIt++)
-        if (!(*anIt)->data() || !(*anIt)->data()->isValid())
-          if (aCIter->second->remove(*anIt)) {
-            // the constraint is fully removed, detach it from the list
-            ConstraintConstraintMap::iterator aTmpIt = aCIter++;
-            myFeatureStorage->removeConstraint(aTmpIt->first);
-            myConstraints.erase(aTmpIt);
-            break;
-          }
-      if (anIt == aConstraints.end())
-        aCIter++;
+    for (; aCIter != myConstraints.end(); ++aCIter) {
+      if (!aCIter->first->data() || !aCIter->first->data()->isValid())
+        anInvalidConstraints.insert(aCIter->first);
     }
+    std::set<ConstraintPtr>::const_iterator aRemoveIt = anInvalidConstraints.begin();
+    for (; aRemoveIt != anInvalidConstraints.end(); ++aRemoveIt)
+      removeConstraint(*aRemoveIt);
+    // remove invalid features
+    myStorage->removeInvalidEntities();
   }
   return aResult;
 }
@@ -532,14 +636,23 @@ bool SketchSolver_Group::isConsistent()
 // ============================================================================
 void SketchSolver_Group::removeTemporaryConstraints()
 {
-  myTempConstraints.clear();
-  myStorage->removeTemporaryConstraints();
-  // Clean lists of removed entities in the storage
-  std::set<Slvs_hParam> aRemPar;
-  std::set<Slvs_hEntity> aRemEnt;
-  std::set<Slvs_hConstraint> aRemCon;
-  myStorage->getRemoved(aRemPar, aRemEnt, aRemCon);
+  std::set<SolverConstraintPtr>::iterator aTmpIt = myTempConstraints.begin();
+  for (; aTmpIt != myTempConstraints.end(); ++aTmpIt)
+    (*aTmpIt)->remove();
+
+  size_t aNbTemp = myStorage->nbTemporary();
+  if (aNbTemp > 0)
+    myStorage->removeTemporary(aNbTemp);
+////  // Clean lists of removed entities in the storage
+////  std::set<Slvs_hParam> aRemPar;
+////  std::set<Slvs_hEntity> aRemEnt;
+////  std::set<Slvs_hConstraint> aRemCon;
+////  myStorage->getRemoved(aRemPar, aRemEnt, aRemCon);
+
+  if (!myTempConstraints.empty())
+    myStorage->verifyFixed();
   myStorage->setNeedToResolve(false);
+  myTempConstraints.clear();
 }
 
 // ============================================================================
@@ -549,16 +662,45 @@ void SketchSolver_Group::removeTemporaryConstraints()
 // ============================================================================
 void SketchSolver_Group::removeConstraint(ConstraintPtr theConstraint)
 {
-  myFeatureStorage->removeConstraint(theConstraint);
+  bool isFullyRemoved = true;
   ConstraintConstraintMap::iterator aCIter = myConstraints.begin();
   for (; aCIter != myConstraints.end(); aCIter++)
-    if (aCIter->second->hasConstraint(theConstraint)) {
-      if (!aCIter->second->remove(theConstraint)) // the constraint is not fully removed
-        aCIter = myConstraints.end();
+    if (aCIter->first == theConstraint) {
+      if (!aCIter->second->remove()) // the constraint is not fully removed
+        isFullyRemoved = false;
       break;
     }
-  if (aCIter != myConstraints.end())
+  if (aCIter == myConstraints.end())
+    return;
+
+////  // Remove entities not used by constraints
+////  myStorage->removeUnusedEntities();
+
+  if (isFullyRemoved)
     myConstraints.erase(aCIter);
+  else if (aCIter != myConstraints.end() &&
+           aCIter->first->getKind() == SketchPlugin_ConstraintCoincidence::ID()) {
+    // Update multicoincidence
+    std::list<ConstraintPtr> aMultiCoinc;
+    SolverConstraintPtr aCoincidence = aCIter->second;
+    while (aCIter != myConstraints.end()) {
+      if (aCIter->second != aCoincidence) {
+        ++aCIter;
+        continue;
+      }
+      if (aCIter->first != theConstraint)
+        aMultiCoinc.push_back(aCIter->first);
+      aCIter->second->remove();
+      ConstraintConstraintMap::iterator aRemoveIt = aCIter++;
+      myConstraints.erase(aRemoveIt);
+    }
+
+    std::list<ConstraintPtr>::iterator anIt = aMultiCoinc.begin();
+    for (; anIt != aMultiCoinc.end(); ++anIt)
+      changeConstraint(*anIt);
+
+    notifyMultiConstraints();
+  }
 }
 
 // ============================================================================
@@ -576,7 +718,7 @@ bool SketchSolver_Group::isComplexConstraint(FeaturePtr theConstraint)
 // ============================================================================
 //  Function: setTemporary
 //  Class:    SketchSolver_Group
-//  Purpose:  append given constraint to th group of temporary constraints
+//  Purpose:  append given constraint to the group of temporary constraints
 // ============================================================================
 void SketchSolver_Group::setTemporary(SolverConstraintPtr theConstraint)
 {
@@ -584,3 +726,118 @@ void SketchSolver_Group::setTemporary(SolverConstraintPtr theConstraint)
   myTempConstraints.insert(theConstraint);
 }
 
+
+// ============================================================================
+//  Function: checkFeatureValidity
+//  Class:    SketchSolver_Group
+//  Purpose:  verifies is the feature valid
+// ============================================================================
+bool SketchSolver_Group::checkFeatureValidity(FeaturePtr theFeature)
+{
+  if (!theFeature || !theFeature->data()->isValid())
+    return true;
+
+  SessionPtr aMgr = ModelAPI_Session::get();
+  ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
+  return aFactory->validate(theFeature);
+}
+
+// ============================================================================
+//  Function: notifyMultiConstraints
+//  Class:    SketchSolver_Group
+//  Purpose:  Update Multi-Translation/-Rotation constraints due to multi coincidence appears/disappears
+// ============================================================================
+void SketchSolver_Group::notifyMultiConstraints()
+{
+////  ConstraintConstraintMap::iterator aCIter = myConstraints.begin();
+////  for (; aCIter != myConstraints.end(); ++aCIter) {
+////    if (aCIter->first->getKind() == SketchPlugin_MultiRotation::ID() ||
+////        aCIter->first->getKind() == SketchPlugin_MultiTranslation::ID()) {
+////      std::shared_ptr<SketchSolver_ConstraintMulti> aMulti = 
+////          std::dynamic_pointer_cast<SketchSolver_ConstraintMulti>(aCIter->second);
+////      aMulti->checkCoincidence();
+////    }
+////  }
+}
+
+
+
+
+// ===========   Auxiliary functions   ========================================
+static double featureToVal(FeaturePtr theFeature)
+{
+  if (theFeature->getKind() == SketchPlugin_Sketch::ID())
+    return 0.0; // sketch
+  ConstraintPtr aConstraint = std::dynamic_pointer_cast<SketchPlugin_Constraint>(theFeature);
+  if (!aConstraint)
+    return 1.0; // features (arc, circle, line, point)
+
+  const std::string& anID = aConstraint->getKind();
+  if (anID == SketchPlugin_ConstraintCoincidence::ID()) {
+    AttributeRefAttrPtr anAttrA = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
+        aConstraint->attribute(SketchPlugin_Constraint::ENTITY_A()));
+    AttributeRefAttrPtr anAttrB = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
+        aConstraint->attribute(SketchPlugin_Constraint::ENTITY_B()));
+    if (anAttrA && anAttrB && (anAttrA->isObject() || anAttrB->isObject()))
+      return 2.0; // point-on-line and point-on-circle should go before points coincidence constraint
+    return 2.5;
+  }
+  if (anID == SketchPlugin_ConstraintDistance::ID() ||
+      anID == SketchPlugin_ConstraintLength::ID() ||
+      anID == SketchPlugin_ConstraintRadius::ID())
+    return 3.0;
+  if (anID == SketchPlugin_ConstraintAngle::ID())
+    return 3.5;
+  if (anID == SketchPlugin_ConstraintHorizontal::ID() ||
+      anID == SketchPlugin_ConstraintVertical::ID() ||
+      anID == SketchPlugin_ConstraintParallel::ID() ||
+      anID == SketchPlugin_ConstraintPerpendicular::ID())
+    return 4.0;
+  if (anID == SketchPlugin_ConstraintEqual::ID())
+    return 5.0;
+  if (anID == SketchPlugin_ConstraintTangent::ID() ||
+      anID == SketchPlugin_ConstraintMirror::ID())
+    return 6.0;
+  if (anID == SketchPlugin_ConstraintRigid::ID())
+    return 7.0;
+  if (anID == SketchPlugin_MultiRotation::ID() ||
+      anID == SketchPlugin_MultiTranslation::ID())
+    return 8.0;
+
+  // all other constraints are placed between Equal and Tangent constraints
+  return 5.5;
+}
+
+static bool isLess(FeaturePtr theFeature1, FeaturePtr theFeature2)
+{
+  return featureToVal(theFeature1) < featureToVal(theFeature2);
+}
+
+std::list<FeaturePtr> SketchSolver_Group::selectApplicableFeatures(const std::set<ObjectPtr>& theObjects)
+{
+  std::list<FeaturePtr> aResult;
+  std::list<FeaturePtr>::iterator aResIt;
+
+  std::set<ObjectPtr>::const_iterator anObjIter = theObjects.begin();
+  for (; anObjIter != theObjects.end(); ++anObjIter) {
+    // Operate sketch itself and SketchPlugin features only.
+    // Also, the Fillet need to be skipped, because there are several separated constraints composing it.
+    FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(*anObjIter);
+    if (!aFeature)
+      continue;
+    std::shared_ptr<SketchPlugin_Feature> aSketchFeature = 
+        std::dynamic_pointer_cast<SketchPlugin_Feature>(aFeature);
+    if ((aFeature->getKind() != SketchPlugin_Sketch::ID() && !aSketchFeature) ||
+        aFeature->getKind() == SketchPlugin_ConstraintFillet::ID())
+      continue;
+
+    // Find the place where to insert a feature
+    for (aResIt = aResult.begin(); aResIt != aResult.end(); ++aResIt)
+      if (isLess(aFeature, *aResIt))
+        break;
+    aResult.insert(aResIt, aFeature);
+  }
+
+  return aResult;
+}
+