diff --git a/web/app/math/lm.js b/modules/math/optim/lm.js similarity index 100% rename from web/app/math/lm.js rename to modules/math/optim/lm.js diff --git a/web/app/math/optim.js b/modules/math/optim/optim.js similarity index 99% rename from web/app/math/optim.js rename to modules/math/optim/optim.js index 03fa55e1..7f779d14 100644 --- a/web/app/math/optim.js +++ b/modules/math/optim/optim.js @@ -1,5 +1,5 @@ import numeric from 'numeric'; -import {_vec, _matrix} from '../../../modules/math/commons' +import {_vec, _matrix} from 'math/commons' const SUCCESS = 1, ITER_LIMIT = 2, SMALL_DELTA = 3, SMALL_STEP = 4, DIVERGENCE = 5, INVALID_STATE = 6; diff --git a/web/app/brep/geom/impl/curve/curves-isec.js b/web/app/brep/geom/impl/curve/curves-isec.js index 21bb3f4e..d442e03f 100644 --- a/web/app/brep/geom/impl/curve/curves-isec.js +++ b/web/app/brep/geom/impl/curve/curves-isec.js @@ -1,7 +1,7 @@ import * as vec from "math/vec"; import {TOLERANCE, TOLERANCE_SQ} from '../../tolerance'; -import * as math from '../../../../../../modules/math/commons' -import {fmin_bfgs} from "../../../../math/optim"; +import * as math from 'math/commons' +import {fmin_bfgs} from "math/optim/optim"; export default function curveIntersect(curve1, curve2, isecRange1, isecRange2, tesselator) { diff --git a/web/app/brep/geom/impl/nurbs-ext.ts b/web/app/brep/geom/impl/nurbs-ext.ts index 5bb89888..0dda7b67 100644 --- a/web/app/brep/geom/impl/nurbs-ext.ts +++ b/web/app/brep/geom/impl/nurbs-ext.ts @@ -1,7 +1,7 @@ import * as vec from "math/vec"; import * as math from 'math/commons' import {eqEps, TOLERANCE, TOLERANCE_01, TOLERANCE_SQ} from '../tolerance'; -import {fmin_bfgs} from "../../../math/optim"; +import {fmin_bfgs} from "math/optim/optim"; import {Vec3} from "math/l3space"; export interface NurbsCurveData { diff --git a/web/app/sketcher/constr/solver.js b/web/app/sketcher/constr/solver.js index e095d49f..2f09e5b1 100644 --- a/web/app/sketcher/constr/solver.js +++ b/web/app/sketcher/constr/solver.js @@ -1,8 +1,8 @@ import * as utils from '../../utils/utils' import QR from '../../math/qr' -import LMOptimizer from '../../math/lm' +import LMOptimizer from 'math/optim/lm' import {ConstantWrapper, EqualsTo} from './solverConstraints' -import {dog_leg} from '../../math/optim' +import {dog_leg} from 'math/optim/optim' import {newVector} from 'math/vec'; diff --git a/web/app/sketcher/tools/drag.js b/web/app/sketcher/tools/drag.js index a228877f..899f91c7 100644 --- a/web/app/sketcher/tools/drag.js +++ b/web/app/sketcher/tools/drag.js @@ -1,6 +1,5 @@ import {Tool} from './tool' -import {optim} from '../../math/optim' -import * as math from '../../../../modules/math/commons' +import * as math from 'math/commons' import {toast} from "react-toastify"; export class DragTool extends Tool {