From ccc0161508d69be20d6a2114b4ce4d401bd5636f Mon Sep 17 00:00:00 2001 From: azv Date: Tue, 7 Jun 2016 08:29:53 +0300 Subject: [PATCH] Additional check redundant constraints in PlaneGCS to show the "Conflicting constraints" message --- src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp index b7c7591af..9aa18c592 100644 --- a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp +++ b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp @@ -72,6 +72,13 @@ SketchSolver_SolveStatus PlaneGCSSolver_Solver::solve() // solve equations if (aResult == GCS::Success) aResult = (GCS::SolveStatus)myEquationSystem.solve(myParameters); + if (aResult == GCS::Success) { + // additionally check redundant constraints + GCS::VEC_I aRedundantID; + myEquationSystem.getRedundant(aRedundantID); + if (!aRedundantID.empty()) + aResult = GCS::Failed; + } Events_LongOp::end(this); SketchSolver_SolveStatus aStatus; -- 2.39.2