suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ intent to improve the sketcher solving outside mouse drag operations (needs testing)

Browse Source 
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5096 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
logari81 2011-11-07 05:19:38 +00:00
parent a4697d22ee
commit 751929c87b
3 changed files with 71 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Sketcher/App/Sketch.cpp
View File

@ -133,6 +133,7 @@ int Sketch::setUpSketch(const std::vector<Part::Geometry *> &GeoList, const std:
addConstraints(ConstraintList);
GCSsys.clearByTag(-1);
GCSsys.clearByTag(-2);
GCSsys.initSolution(Parameters);
if (withDiagnose)
@ -1302,6 +1303,18 @@ int Sketch::addSymmetricConstraint(int geoId1, PointPos pos1, int geoId2, PointP
int Sketch::solve() {
if (!isInitMove) {
GCSsys.clearByTag(-1);
GCSsys.clearByTag(-2);
InitParameters.resize(Parameters.size());
int i=0;
for (std::vector<double*>::iterator it = Parameters.begin(); it != Parameters.end(); ++it, i++) {
InitParameters[i] = **it;
GCSsys.addConstraintEqual(*it, &InitParameters[i], -2);
}
GCSsys.initSolution(Parameters);
}
Base::TimeInfo start_time;
// solving with freegcs
@ -1362,6 +1375,7 @@ int Sketch::initMove(int geoId, PointPos pos)
assert(geoId >= 0 && geoId < int(Geoms.size()));
GCSsys.clearByTag(-1);
GCSsys.clearByTag(-2);
// don't try to move sketches that contain conflicting constraints
if (hasConflicts()) {

75
src/Mod/Sketcher/App/freegcs/GCS.cpp
View File

@ -37,7 +37,9 @@ namespace GCS
System::System()
: clist(0),
c2p(), p2c(),
subsystems(0),
subsys0(0),
subsys1(0),
subsys2(0),
reference(),
init(false)
{
@ -45,7 +47,9 @@ System::System()
System::System(std::vector<Constraint *> clist_)
: c2p(), p2c(),
subsystems(0),
subsys0(0),
subsys1(0),
subsys2(0),
reference(),
init(false)
{
@ -444,23 +448,26 @@ void System::initSolution(VEC_pD &params)
}
int i=0;
std::vector<Constraint *> clist0, clist1;
std::vector<Constraint *> clist0, clist1, clist2;
for (std::vector<Constraint *>::const_iterator constr=clist.begin();
constr != clist.end(); ++constr, i++) {
if (eliminated.count(*constr) == 0) {
if ((*constr)->getTag() >= 0)
clist0.push_back(*constr);
else
else if ((*constr)->getTag() == -1) // move constraints
clist1.push_back(*constr);
else // distance from reference constraints
clist2.push_back(*constr);
}
}
clearSubSystems();
if (clist0.size() > 0)
subsystems.push_back(new SubSystem(clist0, params, reductionmap));
subsys0 = new SubSystem(clist0, params, reductionmap);
if (clist1.size() > 0)
subsystems.push_back(new SubSystem(clist1, params, reductionmap));
subsys1 = new SubSystem(clist1, params, reductionmap);
if (clist2.size() > 0)
subsys2 = new SubSystem(clist2, params, reductionmap);
init = true;
}
@ -485,17 +492,31 @@ int System::solve(VEC_pD &params, bool isFine)
int System::solve(bool isFine)
{
if (subsystems.size() == 0)
return 0;
else if (subsystems.size() == 1) {
if (subsys0) {
resetToReference();
return solve(subsystems[0], isFine);
if (subsys2) {
int ret = solve(subsys0, subsys2, isFine);
if (subsys1) // give subsys1 higher priority than subsys2
// in this case subsys2 acts like a preconditioner
return solve(subsys0, subsys1, isFine);
else
return ret;
}
else if (subsys1)
return solve(subsys0, subsys1, isFine);
else
return solve(subsys0, isFine);
}
else {
else if (subsys1) {
resetToReference();
solve(subsystems[0], isFine);
return solve(subsystems[0], subsystems[1], isFine);
if (subsys2)
return solve(subsys1, subsys2, isFine);
else
return solve(subsys1, isFine);
}
else
// return success in order to permit coincidence constraints to be applied
return Success;
}
int System::solve(SubSystem *subsys, bool isFine)
@ -734,15 +755,23 @@ int System::solve(SubSystem *subsysA, SubSystem *subsysB, bool isFine)
void System::getSubSystems(std::vector<SubSystem *> &subsysvec)
{
subsysvec = subsystems;
subsysvec.clear();
if (subsys0)
subsysvec.push_back(subsys0);
if (subsys1)
subsysvec.push_back(subsys1);
if (subsys2)
subsysvec.push_back(subsys2);
}
void System::applySolution()
{
if (subsystems.size() > 1)
subsystems[1]->applySolution();
if (subsystems.size() > 0)
subsystems[0]->applySolution();
if (subsys2)
subsys2->applySolution();
if (subsys1)
subsys1->applySolution();
if (subsys0)
subsys0->applySolution();
for (MAP_pD_pD::const_iterator it=reductionmap.begin();
it != reductionmap.end(); ++it)
@ -755,7 +784,7 @@ int System::diagnose(VEC_pD &params, VEC_I &conflicting)
// The vector "conflicting" will hold a group of conflicting constraints
conflicting.clear();
std::vector<VEC_I> conflictingIndex;
std::vector<int> tags;
VEC_I tags;
Eigen::MatrixXd J(clist.size(), params.size());
int count=0;
for (std::vector<Constraint *>::iterator constr=clist.begin();
@ -829,7 +858,12 @@ int System::diagnose(VEC_pD &params, VEC_I &conflicting)
void System::clearSubSystems()
{
init = false;
std::vector<SubSystem *> subsystems;
getSubSystems(subsystems);
free(subsystems);
subsys0 = NULL;
subsys1 = NULL;
subsys2 = NULL;
}
double lineSearch(SubSystem *subsys, Eigen::VectorXd &xdir)
@ -964,7 +998,6 @@ void free(std::vector<SubSystem *> &subsysvec)
for (std::vector<SubSystem *>::iterator it=subsysvec.begin();
it != subsysvec.end(); ++it)
if (*it) delete *it;
subsysvec.clear();
}

4
src/Mod/Sketcher/App/freegcs/GCS.h
View File

@ -48,7 +48,9 @@ namespace GCS
std::map<Constraint *,VEC_pD > c2p; // constraint to parameter adjacency list
std::map<double *,std::vector<Constraint *> > p2c; // parameter to constraint adjacency list
std::vector<SubSystem *> subsystems;
SubSystem *subsys0; // has the highest priority, always used as the primary subsystem
SubSystem *subsys1; // normally used as secondary subsystem, it is considered primary only if subsys0 is missing
SubSystem *subsys2; // has the lowest priority, always used as secondary system
void clearSubSystems();
MAP_pD_D reference;