kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

GCS: report partially redundant constraints

Browse Source
This commit is contained in:
Abdullah Tahiri
2021-01-19 11:25:05 +01:00
committed by abdullahtahiriyo
parent e46b821f7c
commit 567c80fb67
2 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Mod/Sketcher/App/planegcs/GCS.cpp
View File

@@ -226,6 +226,7 @@ public:
void LogQRSystemInformation(const System &system, int paramsNum = 0, int constrNum = 0, int rank = 0);
void LogGroupOfConstraints(const std::string & str, std::vector< std::vector<Constraint *> > constraintgroups);
void LogSetOfConstraints(const std::string & str, std::set<Constraint *> constraintset);
void LogGroupOfParameters(const std::string & str, std::vector< std::vector<double *> > parametergroups);
void LogMatrix(const std::string str, Eigen::MatrixXd matrix);
@@ -368,6 +369,20 @@ void SolverReportingManager::LogGroupOfConstraints(const std::string & str, std:
LogString(tempstream.str());
}
void SolverReportingManager::LogSetOfConstraints(const std::string & str, std::set<Constraint *> constraintset)
{
std::stringstream tempstream;
tempstream << str << ": [";
for(auto c : constraintset)
tempstream << c->getTag() << " ";
tempstream << "]" << '\n';
LogString(tempstream.str());
}
void SolverReportingManager::LogGroupOfParameters(const std::string & str, std::vector< std::vector<double *> > parametergroups)
{
std::stringstream tempstream;
@@ -558,6 +573,7 @@ void System::clear()
redundant.clear();
conflictingTags.clear();
redundantTags.clear();
partiallyRedundantTags.clear();
reference.clear();
clearSubSystems();
@@ -3884,6 +3900,7 @@ SolverReportingManager::Manager().LogToFile("GCS::System::diagnose()\n");
redundant.clear();
conflictingTags.clear();
redundantTags.clear();
partiallyRedundantTags.clear();
// This QR diagnosis uses a reduced Jacobian matrix to calculate the rank of the system and identify
// conflicting and redundant constraints.
@@ -4482,6 +4499,11 @@ void System::identifyConflictingRedundantConstraints( Algorithm alg,
}
}
// Augment information regarding the choice made by popularity contest
if(debugMode==IterationLevel) {
SolverReportingManager::Manager().LogSetOfConstraints("Chosen redundants", skipped);
}
std::vector<Constraint *> clistTmp;
clistTmp.reserve(clist.size());
for (std::vector<Constraint *>::iterator constr=clist.begin();
@@ -4560,20 +4582,28 @@ void System::identifyConflictingRedundantConstraints( Algorithm alg,
conflictingTags.begin());
// output of redundant tags
SET_I redundantTagsSet;
for (std::set<Constraint *>::iterator constr=redundant.begin();
constr != redundant.end(); ++constr)
SET_I redundantTagsSet, partiallyRedundantTagsSet;
for (std::set<Constraint *>::iterator constr=redundant.begin(); constr != redundant.end(); ++constr) {
redundantTagsSet.insert((*constr)->getTag());
partiallyRedundantTagsSet.insert((*constr)->getTag());
}
// remove tags represented at least in one non-redundant constraint
for (std::vector<Constraint *>::iterator constr=clist.begin();
constr != clist.end(); ++constr) {
for (std::vector<Constraint *>::iterator constr=clist.begin(); constr != clist.end(); ++constr)
if (redundant.count(*constr) == 0)
redundantTagsSet.erase((*constr)->getTag());
}
redundantTags.resize(redundantTagsSet.size());
std::copy(redundantTagsSet.begin(), redundantTagsSet.end(),
redundantTags.begin());
for(auto r : redundantTagsSet)
partiallyRedundantTagsSet.erase(r);
partiallyRedundantTags.resize(partiallyRedundantTagsSet.size());
std::copy(partiallyRedundantTagsSet.begin(), partiallyRedundantTagsSet.end(),
partiallyRedundantTags.begin());
nonredundantconstrNum = constrNum;
}