diff --git a/src/lib.cpp b/src/lib.cpp index 2c2b949..ac179d8 100644 --- a/src/lib.cpp +++ b/src/lib.cpp @@ -220,7 +220,7 @@ default: dbp("bad constraint type %d", sc->type); return; ssys->result = SLVS_RESULT_DIDNT_CONVERGE; break; - case System::SINGULAR_JACOBIAN: + case System::REDUNDANT: ssys->result = SLVS_RESULT_INCONSISTENT; break; diff --git a/src/solvespace.h b/src/solvespace.h index 7bede6c..38c671e 100644 --- a/src/solvespace.h +++ b/src/solvespace.h @@ -433,10 +433,10 @@ public: bool NewtonSolve(int tag); enum { - SOLVED_OKAY = 0, - DIDNT_CONVERGE = 10, - SINGULAR_JACOBIAN = 11, - TOO_MANY_UNKNOWNS = 20 + SOLVED_OKAY = 0, + DIDNT_CONVERGE = 10, + REDUNDANT = 11, + TOO_MANY_UNKNOWNS = 20 }; int Solve(Group *g, int *dof, List *bad, bool andFindBad, bool andFindFree); diff --git a/src/system.cpp b/src/system.cpp index 5f1e633..ae82cf0 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -453,7 +453,7 @@ int System::Solve(Group *g, int *dof, List *bad, if(andFindBad) { FindWhichToRemoveToFixJacobian(g, bad); } - return System::SINGULAR_JACOBIAN; + return System::REDUNDANT; } // This is not the full Jacobian, but any substitutions or single-eq // solves removed one equation and one unknown, therefore no effect diff --git a/src/textscreens.cpp b/src/textscreens.cpp index fe46cac..9e811f5 100644 --- a/src/textscreens.cpp +++ b/src/textscreens.cpp @@ -471,12 +471,12 @@ void TextWindow::ShowGroupSolveInfo(void) { Printf(true, "%FtGROUP %E%s", g->DescriptionString().c_str()); switch(g->solved.how) { case System::DIDNT_CONVERGE: - Printf(true, "%FxSOLVE FAILED!%Fd no convergence"); + Printf(true, "%FxSOLVE FAILED!%Fd unsolvable constraints"); Printf(true, "the following constraints are unsatisfied"); break; - case System::SINGULAR_JACOBIAN: - Printf(true, "%FxSOLVE FAILED!%Fd inconsistent system"); + case System::REDUNDANT: + Printf(true, "%FxSOLVE FAILED!%Fd redundant constraints"); Printf(true, "remove any one of these to fix it"); break;