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

GCS: renaming parameters to make them more descriptive

Browse Source
This commit is contained in:
Abdullah Tahiri
2020-12-18 15:51:18 +01:00
committed by abdullahtahiriyo
parent 7f006e2c75
commit 28415f53d4
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -406,7 +406,7 @@ typedef boost::adjacency_list <boost::vecS, boost::vecS, boost::undirectedS> Gra
System::System()
: plist(0)
, pdrivenlist(0)
, pdependentparameters(0)
, pDependentParameters(0)
, clist(0)
, c2p()
, p2c()
@@ -530,8 +530,8 @@ void System::clear()
plist.clear();
pdrivenlist.clear();
pIndex.clear();
pdependentparameters.clear();
pdependentelementgroups.clear();
pDependentParameters.clear();
pDependentParametersGroups.clear();
hasUnknowns = false;
hasDiagnosis = false;
@@ -4229,20 +4229,20 @@ void System::identifyDependentParameters( T & qrJ,
if(!silent)
SolverReportingManager::Manager().LogMatrix("Rparams", Rparams);
#endif
pdependentelementgroups.resize(qrJ.cols()-rank);
pDependentParametersGroups.resize(qrJ.cols()-rank);
for (int j=rank; j < qrJ.cols(); j++) {
for (int row=0; row < rank; row++) {
if (fabs(Rparams(row,j)) > 1e-10) {
int origCol = qrJ.colsPermutation().indices()[row];
pdependentelementgroups[j-rank].push_back(pdiagnoselist[origCol]);
pdependentparameters.push_back(pdiagnoselist[origCol]);
pDependentParametersGroups[j-rank].insert(pdiagnoselist[origCol]);
pDependentParameters.push_back(pdiagnoselist[origCol]);
}
}
int origCol = qrJ.colsPermutation().indices()[j];
pdependentelementgroups[j-rank].push_back(pdiagnoselist[origCol]);
pdependentparameters.push_back(pdiagnoselist[origCol]);
pDependentParametersGroups[j-rank].insert(pdiagnoselist[origCol]);
pDependentParameters.push_back(pdiagnoselist[origCol]);
}
}
@@ -4327,7 +4327,7 @@ void System::identifyDependentGeometryParametersInTransposedJacobianDenseQRDecom
for( auto param : depParamCols) {
pdependentparameters.push_back(pdiagnoselist[param]);
pDependentParameters.push_back(pdiagnoselist[param]);
}
}

10
src/Mod/Sketcher/App/planegcs/GCS.h
View File

@@ -102,11 +102,11 @@ namespace GCS
VEC_pD pdrivenlist; // list of parameters of driven constraints
MAP_pD_I pIndex;
VEC_pD pdependentparameters; // list of dependent parameters by the system
VEC_pD pDependentParameters; // list of dependent parameters by the system
// This is a map of primary and secondary identifiers that are found dependent by the solver
// GCS ignores from a type point
std::vector< std::vector<double *> > pdependentelementgroups;
std::vector< std::set<double *> > pDependentParametersGroups;
std::vector<Constraint *> clist;
std::map<Constraint *,VEC_pD > c2p; // constraint to parameter adjacency list
@@ -358,8 +358,10 @@ namespace GCS
{ conflictingOut = hasDiagnosis ? conflictingTags : VEC_I(0); }
void getRedundant(VEC_I &redundantOut) const
{ redundantOut = hasDiagnosis ? redundantTags : VEC_I(0); }
void getDependentParams(VEC_pD &pconstraintplistOut) const
{ pconstraintplistOut = pdependentparameters;}
void getDependentParams(VEC_pD &pdependentparameterlist) const
{ pdependentparameterlist = pDependentParameters;}
void getDependentParamsGroups(std::vector<std::set<double *>> &pdependentparametergroups) const
{ pdependentparametergroups = pDependentParametersGroups;}
bool isEmptyDiagnoseMatrix() const {return emptyDiagnoseMatrix;}
};