Skip to content

Commit

Permalink
extend Python interface of sketcher and make non-parametic version wo…
Browse files Browse the repository at this point in the history 
…rking
  • Loading branch information
@wwmayer
wwmayer committed Aug 14, 2016
1 parent d4bb018 commit bfb80b0
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 34 deletions.
65 changes: 38 additions & 27 deletions src/Mod/Sketcher/App/Sketch.cpp
View file
Expand Up @@ -110,9 +110,8 @@ int Sketch::setUpSketch(const std::vector<Part::Geometry *> &GeoList,
const std::vector<Constraint *> &ConstraintList,
int extGeoCount)
{

Base::TimeInfo start_time;

clear();

std::vector<Part::Geometry *> intGeoList, extGeoList;
Expand All @@ -129,21 +128,32 @@ int Sketch::setUpSketch(const std::vector<Part::Geometry *> &GeoList,
Geoms[i].external = true;

// The Geoms list might be empty after an undo/redo
if (!Geoms.empty()) {
if (!Geoms.empty()) {
addConstraints(ConstraintList);
}
GCSsys.clearByTag(-1);
GCSsys.declareUnknowns(Parameters);
GCSsys.initSolution(defaultSolverRedundant);
GCSsys.getConflicting(Conflicting);
GCSsys.getRedundant(Redundant);
if(debugMode==GCS::Minimal || debugMode==GCS::IterationLevel) {

if (debugMode==GCS::Minimal || debugMode==GCS::IterationLevel) {
Base::TimeInfo end_time;

Base::Console().Log("Sketcher::setUpSketch()-T:%s\n",Base::TimeInfo::diffTime(start_time,end_time).c_str());
}


return GCSsys.dofsNumber();
}

int Sketch::resetSolver()
{
GCSsys.clearByTag(-1);
GCSsys.declareUnknowns(Parameters);
GCSsys.initSolution(defaultSolverRedundant);
GCSsys.getConflicting(Conflicting);
GCSsys.getRedundant(Redundant);

return GCSsys.dofsNumber();
}

Expand Down Expand Up @@ -567,9 +577,10 @@ std::vector<Part::Geometry *> Sketch::extractGeometry(bool withConstructionEleme
{
std::vector<Part::Geometry *> temp;
temp.reserve(Geoms.size());
for (std::vector<GeoDef>::const_iterator it=Geoms.begin(); it != Geoms.end(); ++it)
for (std::vector<GeoDef>::const_iterator it=Geoms.begin(); it != Geoms.end(); ++it) {
if ((!it->external || withExternalElements) && (!it->geo->Construction || withConstructionElements))
temp.push_back(it->geo->clone());
}

return temp;
}
Expand Down Expand Up @@ -2090,18 +2101,17 @@ bool Sketch::updateNonDrivingConstraints()

int Sketch::solve(void)
{

Base::TimeInfo start_time;
if (!isInitMove) { // make sure we are in single subsystem mode
GCSsys.clearByTag(-1);
isFine = true;
}

int ret = -1;
bool valid_solution;
std::string solvername;
int defaultsoltype = -1;

if(isInitMove){
solvername = "DogLeg"; // DogLeg is used for dragging (same as before)
ret = GCSsys.solve(isFine, GCS::DogLeg);
Expand All @@ -2123,9 +2133,9 @@ int Sketch::solve(void)
ret = GCSsys.solve(isFine, GCS::DogLeg);
defaultsoltype=0;
break;
}
}
}

// if successfully solved try to write the parameters back
if (ret == GCS::Success) {
GCSsys.applySolution();
Expand All @@ -2134,11 +2144,12 @@ int Sketch::solve(void)
GCSsys.undoSolution();
updateGeometry();
Base::Console().Warning("Invalid solution from %s solver.\n", solvername.c_str());
}else
{
}
else {
updateNonDrivingConstraints();
}
} else {
}
else {
valid_solution = false;
if(debugMode==GCS::Minimal || debugMode==GCS::IterationLevel){

Expand All @@ -2148,11 +2159,11 @@ int Sketch::solve(void)

if(!valid_solution && !isInitMove) { // Fall back to other solvers
for (int soltype=0; soltype < 4; soltype++) {

if(soltype==defaultsoltype){
continue; // skip default solver
}

switch (soltype) {
case 0:
solvername = "DogLeg";
Expand Down Expand Up @@ -2197,7 +2208,7 @@ int Sketch::solve(void)
if(debugMode==GCS::Minimal || debugMode==GCS::IterationLevel){

Base::Console().Log("Sketcher::Solve()-%s- Failed!! Falling back...\n",solvername.c_str());
}
}
}

if (soltype == 3) // cleanup temporary constraints of the augmented system
Expand All @@ -2222,12 +2233,12 @@ int Sketch::solve(void)
}

Base::TimeInfo end_time;

if(debugMode==GCS::Minimal || debugMode==GCS::IterationLevel){

Base::Console().Log("Sketcher::Solve()-%s-T:%s\n",solvername.c_str(),Base::TimeInfo::diffTime(start_time,end_time).c_str());
}

SolveTime = Base::TimeInfo::diffTimeF(start_time,end_time);
return ret;
}
Expand Down Expand Up @@ -2316,7 +2327,7 @@ int Sketch::initMove(int geoId, PointPos pos, bool fine)
GCSsys.rescaleConstraint(i, 0.01);
}
} else if (Geoms[geoId].type == Ellipse) {

GCS::Point &center = Points[Geoms[geoId].midPointId];
GCS::Point p0,p1;
if (pos == mid || pos == none) {
Expand All @@ -2328,7 +2339,7 @@ int Sketch::initMove(int geoId, PointPos pos, bool fine)
GCSsys.addConstraintP2PCoincident(p0,center,-1);
}
} else if (Geoms[geoId].type == ArcOfEllipse) {

GCS::Point &center = Points[Geoms[geoId].midPointId];
GCS::Point p0,p1;
if (pos == mid || pos == none) {
Expand All @@ -2339,7 +2350,7 @@ int Sketch::initMove(int geoId, PointPos pos, bool fine)
*p0.y = *center.y;
GCSsys.addConstraintP2PCoincident(p0,center,-1);
} else if (pos == start || pos == end) {

MoveParameters.resize(4); // x,y,cx,cy
if (pos == start || pos == end) {
GCS::Point &p = (pos == start) ? Points[Geoms[geoId].startPointId]
Expand All @@ -2349,7 +2360,8 @@ int Sketch::initMove(int geoId, PointPos pos, bool fine)
*p0.x = *p.x;
*p0.y = *p.y;
GCSsys.addConstraintP2PCoincident(p0,p,-1);
}
}

p1.x = &MoveParameters[2];
p1.y = &MoveParameters[3];
*p1.x = *center.x;
Expand Down Expand Up @@ -2493,8 +2505,6 @@ Base::Vector3d Sketch::getPoint(int geoId, PointPos pos)
return Base::Vector3d();
}



TopoShape Sketch::toShape(void) const
{
TopoShape result;
Expand Down Expand Up @@ -2563,6 +2573,7 @@ TopoShape Sketch::toShape(void) const
aFix.FixClosed();
wires.push_back(aFix.Wire());
}

if (wires.size() == 1)
result = *wires.begin();
else if (wires.size() > 1) {
Expand Down
2 changes: 2 additions & 0 deletions src/Mod/Sketcher/App/Sketch.h
View file
Expand Up @@ -51,6 +51,8 @@ class SketcherExport Sketch :public Base::Persistence

/// solve the actual set up sketch
int solve(void);
/// resets the solver
int resetSolver();
/// get standard (aka fine) solver precision
double getSolverPrecision(){ return GCSsys.getFinePrecision(); }
/// delete all geometry and constraints, leave an empty sketch
Expand Down
12 changes: 9 additions & 3 deletions src/Mod/Sketcher/App/SketchPy.xml
View file
Expand Up @@ -56,11 +56,17 @@
</Documentation>
<Parameter Name="Constraint" Type="Int"/>
</Attribute>
<Attribute Name="Constraints" ReadOnly="true">
<Attribute Name="Conflicts" ReadOnly="true">
<Documentation>
<UserDocu>Tuple of all constrains in this sketch</UserDocu>
<UserDocu>Tuple of conflicting constraints</UserDocu>
</Documentation>
<Parameter Name="Constraints" Type="Tuple"/>
<Parameter Name="Conflicts" Type="Tuple"/>
</Attribute>
<Attribute Name="Redundancies" ReadOnly="true">
<Documentation>
<UserDocu>Tuple of redundant constraints</UserDocu>
</Documentation>
<Parameter Name="Redundancies" Type="Tuple"/>
</Attribute>
<Attribute Name="Geometries" ReadOnly="true">
<Documentation>
Expand Down
23 changes: 20 additions & 3 deletions src/Mod/Sketcher/App/SketchPyImp.cpp
View file
Expand Up @@ -63,6 +63,7 @@ int SketchPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/)

PyObject* SketchPy::solve(PyObject *args)
{
getSketchPtr()->resetSolver();
return Py::new_reference_to(Py::Int(getSketchPtr()->solve()));
}

Expand Down Expand Up @@ -169,10 +170,26 @@ Py::Int SketchPy::getConstraint(void) const
throw Py::AttributeError("Not yet implemented");
}

Py::Tuple SketchPy::getConstraints(void) const
Py::Tuple SketchPy::getConflicts(void) const
{
//return Py::Tuple();
throw Py::AttributeError("Not yet implemented");
std::vector<int> c = getSketchPtr()->getConflicting();
Py::Tuple t(c.size());
for (std::size_t i=0; i<c.size(); i++) {
t.setItem(i, Py::Long(c[i]));
}

return t;
}

Py::Tuple SketchPy::getRedundancies(void) const
{
std::vector<int> c = getSketchPtr()->getRedundant();
Py::Tuple t(c.size());
for (std::size_t i=0; i<c.size(); i++) {
t.setItem(i, Py::Long(c[i]));
}

return t;
}

Py::Tuple SketchPy::getGeometries(void) const
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Sketcher/App/planegcs/GCS.h
View file
Expand Up @@ -252,7 +252,7 @@ namespace GCS
double getFinePrecision(){ return convergence;}

int diagnose(Algorithm alg=DogLeg);
int dofsNumber() { return hasDiagnosis ? dofs : -1; }
int dofsNumber() const { return hasDiagnosis ? dofs : -1; }
void getConflicting(VEC_I &conflictingOut) const
{ conflictingOut = hasDiagnosis ? conflictingTags : VEC_I(0); }
void getRedundant(VEC_I &redundantOut) const
Expand Down

0 comments on commit bfb80b0

Please sign in to comment.