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

only one pass is necessary

Browse source
This commit is contained in:
Val Erastov 2014-10-01 18:54:45 -07:00
parent fc792a64f2
commit 333e608988
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/cad/gcs/GlobalSolver.java
View file

@ -29,18 +29,22 @@ public class GlobalSolver {
double eps = 0.0001;
java.lang.System.out.println("Solve system with error: " + subSystem.value());
int count = 0;
solveLM_COMMONS(subSystem);
if (true) return;
while (subSystem.valueSquared() > eps && (count++ < 1)) {
solveLM_COMMONS(subSystem);
// Solver.solve_BFGS(subSystem, false);
// Solver.solve_DL(subSystem);
// Solver.solve_LM(subSystem);
// if (Math.abs(subSystem.valueSquared()) > eps) {
//// solveWorse(subSystem, eps);
// if(subSystem.constraints.size() > 1) {
// Solver.SubSystem shrunk = shrink(subSystem);
// globalSolve(shrunk, linearSolvedCallback);
// }
// }
if (Math.abs(subSystem.valueSquared()) > eps) {
// solveWorse(subSystem, eps);
if(subSystem.constraints.size() > 1) {
Solver.SubSystem shrunk = shrink(subSystem);
globalSolve(shrunk, linearSolvedCallback);
}
}
linearSolvedCallback.run();
}
}
@ -76,8 +80,8 @@ public class GlobalSolver {
double[] wieght = new double[subSystem.cSize()];
Arrays.fill(wieght, 1);
PointVectorValuePair result = optimizer.optimize(
new MaxEval(10000),
new MaxIter(10000),
new MaxEval(100000),
new MaxIter(100000),
new InitialGuess(subSystem.getParams().toArray()),
new Target(new double[subSystem.cSize()]),
new Weight(wieght),