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

Sketcher Constraints: small code refactor

Browse Source 
Unifying first checks in grad().
This commit is contained in:
DeepSOIC 2014-12-18 22:36:51 +03:00 committed by wmayer
parent 8660d9a914
commit 9cc2ff7944
2 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Mod/Sketcher/App/freegcs/Constraints.cpp
View File

@ -84,6 +84,18 @@ double Constraint::maxStep(MAP_pD_D &dir, double lim)
return lim;
}
int Constraint::findParamInPvec(double *param)
{
int ret = -1;
for( int i=0 ; i<pvec.size() ; i++ ){
if ( param == pvec[i] ) {
ret = i;
break;
};
};
return ret;
}
// Equal
ConstraintEqual::ConstraintEqual(double *p1, double *p2)
{
@ -1095,11 +1107,7 @@ double ConstraintEllipseTangentLine::error()
double ConstraintEllipseTangentLine::grad(double *param)
{
//first of all, check that we need to compute anything.
int i;
for( i=0 ; i<pvec.size() ; i++ ){
if ( param == pvec[i] ) break;
};
if ( i == pvec.size() ) return 0.0;
if ( findParamInPvec(param) == -1 ) return 0.0;
double deriv;
errorgrad(0, &deriv, param);
@ -1225,11 +1233,7 @@ double ConstraintInternalAlignmentPoint2Ellipse::error()
double ConstraintInternalAlignmentPoint2Ellipse::grad(double *param)
{
//first of all, check that we need to compute anything.
int i;
for( i=0 ; i<pvec.size() ; i++ ){
if ( param == pvec[i] ) break;
};
if ( i == pvec.size() ) return 0.0;
if ( findParamInPvec(param) == -1 ) return 0.0;
double deriv;
errorgrad(0, &deriv, param);
@ -1308,11 +1312,7 @@ double ConstraintEqualMajorAxesEllipse::error()
double ConstraintEqualMajorAxesEllipse::grad(double *param)
{
//first of all, check that we need to compute anything.
int i;
for( i=0 ; i<pvec.size() ; i++ ){
if ( param == pvec[i] ) break;
};
if ( i == pvec.size() ) return 0.0;
if ( findParamInPvec(param) == -1 ) return 0.0;
double deriv;
errorgrad(0, &deriv, param);
@ -1398,11 +1398,7 @@ double ConstraintEllipticalArcRangeToEndPoints::error()
double ConstraintEllipticalArcRangeToEndPoints::grad(double *param)
{
//first of all, check that we need to compute anything.
int i;
for( i=0 ; i<pvec.size() ; i++ ){
if ( param == pvec[i] ) break;
};
if ( i == pvec.size() ) return 0.0;
if ( findParamInPvec(param) == -1 ) return 0.0;
double deriv;
errorgrad(0, &deriv, param);
@ -1502,11 +1498,7 @@ double ConstraintAngleViaPoint::error()
double ConstraintAngleViaPoint::grad(double *param)
{
//first of all, check that we need to compute anything.
int i;
for( i=0 ; i<pvec.size() ; i++ ){
if ( param == pvec[i] ) break;
};
if ( i == pvec.size() ) return 0.0;
if ( findParamInPvec(param) == -1 ) return 0.0;
double deriv=0.;
@ -1622,11 +1614,7 @@ double ConstraintSnell::grad(double *param)
{
//first of all, check that we need to compute anything.
int i;
for( i=0 ; i<pvec.size() ; i++ ){
if ( param == pvec[i] ) break;
};
if ( i == pvec.size() ) return 0.0;
if ( findParamInPvec(param) == -1 ) return 0.0;
double deriv;
errorgrad(0, &deriv, param);

1
src/Mod/Sketcher/App/freegcs/Constraints.h
View File

@ -94,6 +94,7 @@ namespace GCS
virtual double grad(double *);
// virtual void grad(MAP_pD_D &deriv); --> TODO: vectorized grad version
virtual double maxStep(MAP_pD_D &dir, double lim=1.);
int findParamInPvec(double* param);//finds first occurence of param in pvec. This is useful to test if a constraint depends on the parameter (it may not actually depend on it, e.g. angle-via-point doesn't depend on ellipse's b (radmin), but b will be included within the constraint anyway. Returns -1 if not found.
};
// Equal