Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2026-02-15 03:43:49 +01:00
Code Issues Projects Releases Wiki Activity

disable cg by default

Browse source
This commit is contained in:
Val Erastov 2014-11-01 00:11:01 -07:00
parent 178ea85934
commit a38db98017
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
web/app/math/noptim.js
View file

@ -205,7 +205,7 @@ optim.inv = function inv(x) {
Ij = I[i0]; I[i0] = I[j]; I[j] = Ij;
x = Aj[j];
if (x === 0) {
console.log("CAN' INVERSE MATRIX");
//console.log("CAN' INVERSE MATRIX");
x = 1e-32
}
for(k=j;k!==n;++k) Aj[k] /= x;
@ -340,8 +340,8 @@ optim.dog_leg = function(subsys) {
// get the gauss-newton step
// h_gn = n.solve(Jx, n.mul(fx, -1));
//h_gn = lsolve(Jx, n.mul(fx, -1));
h_gn = optim.cg(Jx, h_gn, n.mul(fx, -1), 1e-8, maxIterNumber);
h_gn = lsolve(Jx, n.mul(fx, -1));
//h_gn = optim.cg(Jx, h_gn, n.mul(fx, -1), 1e-8, maxIterNumber);
// solve linear problem using svd formula to get the gauss-newton step
// h_gn = lls(Jx, n.mul(fx, -1));