caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move logic for handling allowRedundant out of System. NFC.

Browse Source
This commit is contained in:
whitequark 2019-05-24 15:43:20 +00:00
parent cf2f0e5d44
commit beea4444ab
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/generate.cpp
View File

@ -542,7 +542,7 @@ void SolveSpaceUI::SolveGroup(hGroup hg, bool andFindFree) {
SolveResult how = sys.Solve(g, NULL, SolveResult how = sys.Solve(g, NULL,
&(g->solved.dof), &(g->solved.dof),
&(g->solved.remove), &(g->solved.remove),
/*andFindBad=*/true, /*andFindBad=*/!g->allowRedundant,
/*andFindFree=*/andFindFree, /*andFindFree=*/andFindFree,
/*forceDofCheck=*/!g->dofCheckOk); /*forceDofCheck=*/!g->dofCheckOk);
if(how == SolveResult::OKAY) { if(how == SolveResult::OKAY) {

8
src/system.cpp
View File

@ -470,9 +470,7 @@ SolveResult System::Solve(Group *g, int *rank, int *dof, List<hConstraint> *bad,
rankOk = TestRank(rank); rankOk = TestRank(rank);
if(!rankOk) { if(!rankOk) {
if(!g->allowRedundant) { if(andFindBad) FindWhichToRemoveToFixJacobian(g, bad, forceDofCheck);
if(andFindBad) FindWhichToRemoveToFixJacobian(g, bad, forceDofCheck);
}
} else { } else {
// This is not the full Jacobian, but any substitutions or single-eq // This is not the full Jacobian, but any substitutions or single-eq
// solves removed one equation and one unknown, therefore no effect // solves removed one equation and one unknown, therefore no effect
@ -536,9 +534,7 @@ SolveResult System::SolveRank(Group *g, int *rank, int *dof, List<hConstraint> *
bool rankOk = TestRank(rank); bool rankOk = TestRank(rank);
if(!rankOk) { if(!rankOk) {
if(!g->allowRedundant) { if(andFindBad) FindWhichToRemoveToFixJacobian(g, bad, /*forceDofCheck=*/true);
if(andFindBad) FindWhichToRemoveToFixJacobian(g, bad, /*forceDofCheck=*/true);
}
} else { } else {
if(dof) *dof = CalculateDof(); if(dof) *dof = CalculateDof();
MarkParamsFree(andFindFree); MarkParamsFree(andFindFree);