From 57f9fcdf9be99f3364abd0b2bacf13867fba097c Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Thu, 25 Sep 2014 01:51:04 -0700 Subject: [PATCH] multi solve --- src/cad/fx/App2DCtrl.java | 6 +++--- src/cad/gcs/constr/P2LDistance.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cad/fx/App2DCtrl.java b/src/cad/fx/App2DCtrl.java index 876f8346..b5e45ddb 100644 --- a/src/cad/fx/App2DCtrl.java +++ b/src/cad/fx/App2DCtrl.java @@ -175,7 +175,7 @@ public class App2DCtrl implements Initializable { }; - List constrs = Arrays.asList(parallel); + List constrs = Arrays.asList(p2l2, parallel, perpendicular, p2l1); // List constrs = Arrays.asList(p2l1); Solver.SubSystem subSystem = new Solver.SubSystem(constrs); // Solver.optimize(subSystem); @@ -186,8 +186,8 @@ public class App2DCtrl implements Initializable { globalSolve(subSystem, () -> Platform.runLater(update)); if (true) return; while (subSystem.error() > 0.0001) { - Solver.solve_LM(subSystem); -// solveLM_COMMONS(subSystem); +// Solver.solve_LM(subSystem); + solveLM_COMMONS(subSystem); // Solver.solve_DL(subSystem); // Solver.solve_BFGS(subSystem, true); Platform.runLater(update); diff --git a/src/cad/gcs/constr/P2LDistance.java b/src/cad/gcs/constr/P2LDistance.java index 706e40ee..e9977357 100644 --- a/src/cad/gcs/constr/P2LDistance.java +++ b/src/cad/gcs/constr/P2LDistance.java @@ -113,7 +113,7 @@ public class P2LDistance implements Constraint { } - public void gradient(double[] out) { + public void gradient2(double[] out) { double x0 = p0x(), x1 = p1x(), x2 = p2x(); double y0 = p0y(), y1 = p1y(), y2 = p2y(); double dx = x2 - x1; @@ -157,7 +157,7 @@ public class P2LDistance implements Constraint { return a*a; } - public void gradient2(double[] out) { + public void gradient(double[] out) { double x0 = p0x(), x1 = p1x(), x2 = p2x(); double y0 = p0y(), y1 = p1y(), y2 = p2y(); double dx = x2 - x1;