Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions index.js
Original file line number Diff line number Diff line change
@@ -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';
14 changes: 7 additions & 7 deletions index_vis.js
Original file line number Diff line number Diff line change
@@ -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';
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions src/conjugateGradient.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/gradientDescent.js
Original file line number Diff line number Diff line change
@@ -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 || {};
Expand Down
2 changes: 1 addition & 1 deletion src/linesearch.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/nelderMead.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/visualizations/animatedContour.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/visualizations/cities.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/visualizations/conjugateGradient.js
Original file line number Diff line number Diff line change
@@ -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];
Expand Down
4 changes: 2 additions & 2 deletions src/visualizations/gradientDescent.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/visualizations/linesearch.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/visualizations/nelderMead.js
Original file line number Diff line number Diff line change
@@ -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];
Expand Down
6 changes: 3 additions & 3 deletions src/visualizations/nelderMead1D.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down