From 7fd42f94bca16b67cda90b8f69dc75f83d287a82 Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Wed, 1 Oct 2014 19:41:53 -0700 Subject: [PATCH] fix errors --- src/cad/gcs/constr/Parallel.java | 11 +++++------ src/cad/gcs/constr/Perpendicular.java | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/cad/gcs/constr/Parallel.java b/src/cad/gcs/constr/Parallel.java index 3fd1b5e2..f87c4fa6 100644 --- a/src/cad/gcs/constr/Parallel.java +++ b/src/cad/gcs/constr/Parallel.java @@ -55,12 +55,11 @@ public class Parallel implements Constraint { @Override public double error() { - 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 - return (dx1 * dy2 - dy1 * dx2); + 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()); + return (dx1*dy2 - dy1*dx2); } diff --git a/src/cad/gcs/constr/Perpendicular.java b/src/cad/gcs/constr/Perpendicular.java index 280ecdea..ffdb0951 100644 --- a/src/cad/gcs/constr/Perpendicular.java +++ b/src/cad/gcs/constr/Perpendicular.java @@ -60,7 +60,7 @@ public class Perpendicular implements Constraint { 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 - return (dx1 * dx2 + dy1 * dy2); + return (dx1*dx2 + dy1*dy2); } //derivative of ((x-a1)*a2 + a3)^2