Update unit tests for the PlaneGCS solver. Bug fixes.

[modules/shaper.git] / src / SketchSolver / SketchSolver_Group.h

diff --git a/src/SketchSolver/SketchSolver_Group.h b/src/SketchSolver/SketchSolver_Group.h
index a8c09c2ac88349621d9f0e7763abc3a1062a2f74..6d7dff33926702865e2210582e7686e7cccfe48f 100644 (file)
--- a/src/SketchSolver/SketchSolver_Group.h
+++ b/src/SketchSolver/SketchSolver_Group.h
@@ -13,9 +13,7 @@
 #include <SketchSolver_ISolver.h>
 
 #include <SketchPlugin_Constraint.h>
-////#include <ModelAPI_Data.h>
 #include <ModelAPI_Feature.h>
-////#include <ModelAPI_AttributeRefList.h>
 
 #include <memory>
 #include <list>
@@ -63,9 +61,6 @@ class SketchSolver_Group
     return mySketch->data() && mySketch->data()->isValid();
   }
 
-  /// \brief Verifies the constraint is complex, i.e. it needs another constraints to be created before
-  static bool isComplexConstraint(FeaturePtr theConstraint);
-
   /** \brief Adds or updates a constraint in the group
    *  \param[in] theConstraint constraint to be changed
    *  \return \c true if the constraint added or updated successfully
@@ -154,12 +149,6 @@ private:
   /// \brief Verifies is the feature valid
   bool checkFeatureValidity(FeaturePtr theFeature);
 
-  /// \brief Update just changed constraints
-  void updateConstraints();
-
-  /// \brief Update Multi-Translation/-Rotation constraints due to multi coincidence appears/disappears
-  void notifyMultiConstraints();
-
 private:
   GroupID  myID; ///< Index of the group
   EntityID myWorkplaneID; ///< Index of workplane, the group is based on
@@ -167,13 +156,12 @@ private:
   ConstraintConstraintMap myConstraints; ///< List of constraints
   std::set<SolverConstraintPtr> myTempConstraints; ///< List of temporary constraints
   std::map<AttributePtr, SolverConstraintPtr> myParametricConstraints; ///< List of parametric constraints
-  std::set<ConstraintPtr> myChangedConstraints; ///< List of just updated constraints
 
   StoragePtr myStorage; ///< Container for the set of SolveSpace constraints and their entities
 
   SolverPtr mySketchSolver;  ///< Solver for set of equations obtained by constraints
 
-  bool myPrevSolved; ///< Indicates that previous solving was done correctly
+  SketchSolver_SolveStatus myPrevResult; ///< Result of previous solution of the set of constraints
 };
 
 #endif