Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2025-12-10 10:25:36 +01:00
Code Issues Projects Releases Wiki Activity

not use square functions for perpendicular & parallel constraints

Browse source
This commit is contained in:
Val Erastov 2014-10-01 19:20:19 -07:00
parent 333e608988
commit 64e9e52b11
2 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/cad/gcs/constr/Parallel.java
View file

@ -55,13 +55,12 @@ public class Parallel implements Constraint {
@Override
public double error() {
double dx1 = (params[l1p2x].get() - params[l1p1x].get());
double dy1 = (params[l1p2y].get() - params[l1p1y].get());
double dx2 = -(params[l2p2y].get() - params[l2p1y].get());
double dy2 = (params[l2p2x].get() - params[l2p1x].get());
double dx1 = (params[l1p1x].get() - params[l1p2x].get());
double dy1 = (params[l1p1y].get() - params[l1p2y].get());
double dx2 = -(params[l2p1x].get() - params[l2p2x].get());
double dy2 = (params[l2p1y].get() - params[l2p2y].get());
//dot product shows how the lines off to be perpendicular
double off = dx1 * dx2 + dy1 * dy2;
return off * off;
return (dx1 * dy2 - dy1 * dx2);
}
@ -75,8 +74,19 @@ public class Parallel implements Constraint {
return -2*a2*(a1*a2 - a2*x+a3);
}
@Override
public void gradient(double[] out) {
out[l1p1x] = (params[l2p1y].get() - params[l2p2y].get()); // = dy2
out[l1p2x] = -(params[l2p1y].get() - params[l2p2y].get()); // = -dy2
out[l1p1y] = -(params[l2p1x].get() - params[l2p2x].get()); // = -dx2
out[l1p2y] = (params[l2p1x].get() - params[l2p2x].get()); // = dx2
out[l2p1x] = -(params[l1p1y].get() - params[l1p2y].get()); // = -dy1
out[l2p2x] = (params[l1p1y].get() - params[l1p2y].get()); // = dy1
out[l2p1y] = (params[l1p1x].get() - params[l1p2x].get()); // = dx1
out[l2p2y] = -(params[l1p1x].get() - params[l1p2x].get()); // = -dx1
}
public void gradient2(double[] out) {
double x1 = params[l1p1x].get();
double x2 = params[l1p1y].get();

25
src/cad/gcs/constr/Perpendicular.java
View file

@ -55,13 +55,12 @@ public class Perpendicular implements Constraint {
@Override
public double error() {
double dx1 = (params[l1p2x].get() - params[l1p1x].get());
double dy1 = (params[l1p2y].get() - params[l1p1y].get());
double dx2 = (params[l2p2x].get() - params[l2p1x].get());
double dy2 = (params[l2p2y].get() - params[l2p1y].get());
double dx1 = (params[l1p1x].get() - params[l1p2x].get());
double dy1 = (params[l1p1y].get() - params[l1p2y].get());
double dx2 = (params[l2p1x].get() - params[l2p2x].get());
double dy2 = (params[l2p1y].get() - params[l2p2y].get());
//dot product shows how the lines off to be perpendicular
double off = dx1 * dx2 + dy1 * dy2;
return off * off;
return (dx1 * dx2 + dy1 * dy2);
}
//derivative of ((x-a1)*a2 + a3)^2
@ -74,9 +73,21 @@ public class Perpendicular implements Constraint {
return -2*a2*(a1*a2 - a2*x+a3);
}
@Override
public void gradient(double[] out) {
out[l1p1x] = (params[l2p1x].get() - params[l2p2x].get()); // = dx2
out[l1p2x] = -(params[l2p1x].get() - params[l2p2x].get()); // = -dx2
out[l1p1y] = (params[l2p1y].get() - params[l2p2y].get()); // = dy2
out[l1p2y] = -(params[l2p1y].get() - params[l2p2y].get()); // = -dy2
out[l2p1x] = (params[l1p1x].get() - params[l1p2x].get()); // = dx1
out[l2p2x] = -(params[l1p1x].get() - params[l1p2x].get()); // = -dx1
out[l2p1y] = (params[l1p1y].get() - params[l1p2y].get()); // = dy1
out[l2p2y] = -(params[l1p1y].get() - params[l1p2y].get()); // = -dy1
}
public void gradient3(double[] out) {
double x1 = params[l1p1x].get();
double x2 = params[l1p1y].get();
double x3 = params[l1p2x].get();