Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2025-12-15 21:05:22 +01:00
Code Issues Projects Releases Wiki Activity

fallback to levenberg marquardt if dog leg fails

Browse source
This commit is contained in:
Val Erastov (xibyte) 2020-07-17 17:38:43 -07:00
parent 504843e83d
commit 8100cb758f
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
web/app/sketcher/constr/solver.js
View file

@ -1,5 +1,4 @@
import * as utils from '../../utils/utils'
import * as math from '../../math/math'
import QR from '../../math/qr'
import LMOptimizer from '../../math/lm'
import {ConstantWrapper, EqualsTo} from './solverConstraints'
@ -171,6 +170,12 @@ System.prototype.getValues = function() {
return values;
};
System.prototype.rollback = function() {
for (var p = 0; p < this.params.length; p++) {
this.params[p].rollback();
}
};
function wrapConstants(constrs) {
for (let i = 0; i < constrs.length; i++) {
const c = constrs[i];
@ -247,13 +252,14 @@ var prepare = function(constrs, locked) {
if (constrs.length === 0) return nullResult;
if (sys.params.length === 0) return nullResult;
// return solve_lm(sys, model, jacobian, rough);
switch (alg) {
case 2:
return solve_lm(sys, model, jacobian, rough);
case 1:
default:
return dog_leg(sys, rough);
let result = dog_leg(sys, rough);
if (!result.success) {
console.log('dog leg failed, giving levenberg marquardt a shot');
sys.rollback();
result = solve_lm(sys, model, jacobian, rough)
}
return result;
}
var systemSolver = {
diagnose : function() {return diagnose(sys)},
@ -287,11 +293,11 @@ var solve_lm = function(sys, model, jacobian, rough) {
if (returnCode === 1) {
sys.setParams(res[0]);
}
console.log("LM result: ")
console.log({
evalCount : opt.evalCount,
error : sys.error(),
});
// console.log("LM result: ")
// console.log({
// evalCount : opt.evalCount,
// error : sys.error(),
// });
return {
evalCount : opt.evalCount,