From ea5458ac69c1a384b6ab5c4bc82798d324180eaa Mon Sep 17 00:00:00 2001 From: Jungzl <13jungzl@gmail.com> Date: Tue, 3 Dec 2024 21:46:56 +0800 Subject: [PATCH 1/2] fix: module entry --- package-lock.json | 4 ++-- package.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0645521..61a816a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "fmin", - "version": "0.0.3", + "version": "0.0.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "fmin", - "version": "0.0.3", + "version": "0.0.4", "license": "BSD-3-Clause", "dependencies": { "contour_plot": "^0.0.1" diff --git a/package.json b/package.json index 9378ea4..a2efeb0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ ], "license": "BSD-3-Clause", "main": "build/fmin.js", + "module": "index.js", "jsnext:main": "index", "homepage": "https://github.com/benfred/fmin", "repository": { From 0e0604f219625b23df863abc00ff3ce5fbb97334 Mon Sep 17 00:00:00 2001 From: Jungzl <13jungzl@gmail.com> Date: Tue, 3 Dec 2024 21:47:56 +0800 Subject: [PATCH 2/2] fix: add fully js extension --- index.js | 10 +++++----- index_vis.js | 14 +++++++------- src/conjugateGradient.js | 4 ++-- src/gradientDescent.js | 4 ++-- src/linesearch.js | 2 +- src/nelderMead.js | 2 +- src/visualizations/animatedContour.js | 4 ++-- src/visualizations/cities.js | 4 ++-- src/visualizations/conjugateGradient.js | 4 ++-- src/visualizations/gradientDescent.js | 4 ++-- src/visualizations/linesearch.js | 6 +++--- src/visualizations/nelderMead.js | 6 +++--- src/visualizations/nelderMead1D.js | 6 +++--- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/index.js b/index.js index cd90f59..1f5580c 100644 --- a/index.js +++ b/index.js @@ -1,11 +1,11 @@ -export { bisect } from './src/bisect'; -export { nelderMead } from './src/nelderMead'; +export { bisect } from './src/bisect.js'; +export { nelderMead } from './src/nelderMead.js'; export { conjugateGradient, conjugateGradientSolve, -} from './src/conjugateGradient'; +} from './src/conjugateGradient.js'; export { gradientDescent, gradientDescentLineSearch, -} from './src/gradientDescent'; -export { zeros, zerosM, norm2, weightedSum, scale } from './src/blas1'; +} from './src/gradientDescent.js'; +export { zeros, zerosM, norm2, weightedSum, scale } from './src/blas1.js'; diff --git a/index_vis.js b/index_vis.js index ffe1476..7c2a3f5 100644 --- a/index_vis.js +++ b/index_vis.js @@ -1,15 +1,15 @@ -export { NelderMead1d } from './src/visualizations/nelderMead1D'; -export { NelderMeadContour } from './src/visualizations/nelderMead'; -export { GradientContour } from './src/visualizations/gradientDescent'; +export { NelderMead1d } from './src/visualizations/nelderMead1D.js'; +export { NelderMeadContour } from './src/visualizations/nelderMead.js'; +export { GradientContour } from './src/visualizations/gradientDescent.js'; export { ConjugateGradientContour, ConjugateGradientSolverContour, -} from './src/visualizations/conjugateGradient'; -export { LineSearchContour } from './src/visualizations/linesearch'; +} from './src/visualizations/conjugateGradient.js'; +export { LineSearchContour } from './src/visualizations/linesearch.js'; export { banana, flower, himmelblau, matyas, -} from './src/visualizations/functions'; -export { createCitiesAnimation } from './src/visualizations/cities'; +} from './src/visualizations/functions.js'; +export { createCitiesAnimation } from './src/visualizations/cities.js'; diff --git a/src/conjugateGradient.js b/src/conjugateGradient.js index a1b0ae7..03456d9 100644 --- a/src/conjugateGradient.js +++ b/src/conjugateGradient.js @@ -1,5 +1,5 @@ -import { dot, gemv, norm2, scale, weightedSum } from './blas1'; -import { wolfeLineSearch } from './linesearch'; +import { dot, gemv, norm2, scale, weightedSum } from './blas1.js'; +import { wolfeLineSearch } from './linesearch.js'; export function conjugateGradient(f, initial, params) { // allocate all memory up front here, keep out of the loop for perfomance diff --git a/src/gradientDescent.js b/src/gradientDescent.js index 872d0bf..6e1181d 100644 --- a/src/gradientDescent.js +++ b/src/gradientDescent.js @@ -1,5 +1,5 @@ -import { dot, norm2, scale, weightedSum, zeros } from './blas1'; -import { wolfeLineSearch } from './linesearch'; +import { dot, norm2, scale, weightedSum, zeros } from './blas1.js'; +import { wolfeLineSearch } from './linesearch.js'; export function gradientDescent(f, initial, params) { params = params || {}; diff --git a/src/linesearch.js b/src/linesearch.js index dabc4a2..dc6e746 100644 --- a/src/linesearch.js +++ b/src/linesearch.js @@ -1,4 +1,4 @@ -import { dot, weightedSum } from './blas1'; +import { dot, weightedSum } from './blas1.js'; /// searches along line 'pk' for a point that satifies the wolfe conditions /// See 'Numerical Optimization' by Nocedal and Wright p59-60 diff --git a/src/nelderMead.js b/src/nelderMead.js index fe38e91..30e2c31 100644 --- a/src/nelderMead.js +++ b/src/nelderMead.js @@ -1,4 +1,4 @@ -import { dot, norm2, weightedSum } from './blas1'; +import { dot, norm2, weightedSum } from './blas1.js'; /** minimizes a function using the downhill simplex method */ export function nelderMead(f, x0, parameters) { diff --git a/src/visualizations/animatedContour.js b/src/visualizations/animatedContour.js index a68f050..baee70b 100644 --- a/src/visualizations/animatedContour.js +++ b/src/visualizations/animatedContour.js @@ -1,6 +1,6 @@ import { ContourPlot } from 'contour_plot'; -import { createDropShadowFilter } from './dropshadow'; -import { banana, booth, flower, himmelblau, matyas } from './functions'; +import { createDropShadowFilter } from './dropshadow.js'; +import { banana, booth, flower, himmelblau, matyas } from './functions.js'; export function AnimatedContour(div) { this.current = this.current || himmelblau; diff --git a/src/visualizations/cities.js b/src/visualizations/cities.js index 882e437..fa3811d 100644 --- a/src/visualizations/cities.js +++ b/src/visualizations/cities.js @@ -1,5 +1,5 @@ -import { createDropShadowFilter } from './dropshadow'; -import { Slider } from './slider'; +import { createDropShadowFilter } from './dropshadow.js'; +import { Slider } from './slider.js'; function mdsGradient(x, distances, fxprime) { let loss = 0; diff --git a/src/visualizations/conjugateGradient.js b/src/visualizations/conjugateGradient.js index 3896b3b..65be141 100644 --- a/src/visualizations/conjugateGradient.js +++ b/src/visualizations/conjugateGradient.js @@ -1,5 +1,5 @@ -import { banana, matyas } from './functions'; -import { GradientContour } from './gradientDescent'; +import { banana, matyas } from './functions.js'; +import { GradientContour } from './gradientDescent.js'; export function ConjugateGradientContour(div) { this.colour = d3.schemeCategory10[2]; diff --git a/src/visualizations/gradientDescent.js b/src/visualizations/gradientDescent.js index d040493..c6ac23c 100644 --- a/src/visualizations/gradientDescent.js +++ b/src/visualizations/gradientDescent.js @@ -1,5 +1,5 @@ -import { AnimatedContour } from './animatedContour'; -import { Slider } from './slider'; +import { AnimatedContour } from './animatedContour.js'; +import { Slider } from './slider.js'; export function GradientContour(div) { this.stepSize = 0.01; diff --git a/src/visualizations/linesearch.js b/src/visualizations/linesearch.js index 384264b..4b17a6d 100644 --- a/src/visualizations/linesearch.js +++ b/src/visualizations/linesearch.js @@ -1,6 +1,6 @@ -import { himmelblau } from './functions'; -import { GradientContour } from './gradientDescent'; -import { Slider } from './slider'; +import { himmelblau } from './functions.js'; +import { GradientContour } from './gradientDescent.js'; +import { Slider } from './slider.js'; export function LineSearchContour(div) { this.duration = 1000; diff --git a/src/visualizations/nelderMead.js b/src/visualizations/nelderMead.js index a717439..c63ca09 100644 --- a/src/visualizations/nelderMead.js +++ b/src/visualizations/nelderMead.js @@ -1,6 +1,6 @@ -import { AnimatedContour } from './animatedContour'; -import { flower } from './functions'; -import { Slider } from './slider'; +import { AnimatedContour } from './animatedContour.js'; +import { flower } from './functions.js'; +import { Slider } from './slider.js'; export function NelderMeadContour(div) { this.colour = d3.schemeCategory10[0]; diff --git a/src/visualizations/nelderMead1D.js b/src/visualizations/nelderMead1D.js index f592387..d71a516 100644 --- a/src/visualizations/nelderMead1D.js +++ b/src/visualizations/nelderMead1D.js @@ -1,6 +1,6 @@ -import { createDropShadowFilter } from './dropshadow'; -import { LineGraph } from './linegraph'; -import { Slider } from './slider'; +import { createDropShadowFilter } from './dropshadow.js'; +import { LineGraph } from './linegraph.js'; +import { Slider } from './slider.js'; export function NelderMead1d(div) { this.div = div;