Using test for testing number of sub-shapes.

[modules/shaper.git] / src / SketchSolver / SolveSpaceSolver / SolveSpaceSolver_Solver.cpp

diff --git a/src/SketchSolver/SolveSpaceSolver/SolveSpaceSolver_Solver.cpp b/src/SketchSolver/SolveSpaceSolver/SolveSpaceSolver_Solver.cpp
index a7a83a13d91a1be1a282572b8fc63fa3d9615862..5b34b1174cc6047e6b64170cfbf4a8bac9f45d1d 100644 (file)
--- a/src/SketchSolver/SolveSpaceSolver/SolveSpaceSolver_Solver.cpp
+++ b/src/SketchSolver/SolveSpaceSolver/SolveSpaceSolver_Solver.cpp
@@ -90,10 +90,14 @@ SketchSolver_SolveStatus SolveSpaceSolver_Solver::solve()
   //if (myEquationsSystem.constraints <= 0)
   //  return STATUS_EMPTYSET;
 
-  myEquationsSystem.calculateFaileds = myFindFaileds ? 1 : 0;
+  myEquationsSystem.calculateFaileds = 0;
+  if (myFindFaileds) {
+    myEquationsSystem.calculateFaileds = 1;
+    myEquationsSystem.faileds = myEquationsSystem.constraints;
+  }
 
   Events_LongOp::start(this);
-  Slvs_Solve(&myEquationsSystem, myGroup);
+  Slvs_Solve(&myEquationsSystem, (Slvs_hGroup)myGroup);
   Events_LongOp::end(this);
 
   SketchSolver_SolveStatus aStatus;
@@ -155,6 +159,10 @@ bool SolveSpaceSolver_Solver::hasDegeneratedArcs() const
       const int aShift = anEntity.point[aPnt] - anEntity.h;
       int aPntInd = anEnt + aShift;
       int aStep = 1;
+      if (aPntInd < 0)
+        aPntInd = 0;
+      else if (aPntInd >= myEquationsSystem.entities)
+        aPntInd = myEquationsSystem.entities - 1;
       if (myEquationsSystem.entity[aPntInd].h > anEntity.point[aPnt])
         aStep = -1;
       for (; aPntInd >=0 && aPntInd < myEquationsSystem.entities; aPntInd += aStep)
@@ -189,3 +197,16 @@ bool SolveSpaceSolver_Solver::hasDegeneratedArcs() const
   }
   return false;
 }
+
+bool SolveSpaceSolver_Solver::isConflicting(const ConstraintID& theConstraint) const
+{
+  for (int i = 0; i < myEquationsSystem.faileds; ++i)
+    if (myEquationsSystem.failed[i] == (Slvs_hConstraint)theConstraint)
+      return true;
+  return false;
+}
+
+int SolveSpaceSolver_Solver::dof() const
+{
+  return myEquationsSystem.dof;
+}