Merge pull request #16 from mrc-ide/update-odin-js

use latest js

.gitignore

@@ -1,3 +1,4 @@
+.idea
 node_modules
 dist
 lib

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@reside-ic/dust",
-    "version": "0.0.4",
+    "version": "0.0.5",
     "description": "Dust-like interface for js",
     "main": "index.js",
     "scripts": {
@@ -38,7 +38,7 @@
         "webpack-cli": "^4.10.0"
     },
     "dependencies": {
-        "@reside-ic/odinjs": "^0.1.1",
+        "@reside-ic/odinjs": "^0.1.3",
         "@reside-ic/random": "^0.0.3",
         "ndarray": "^1.0.19"
     }

src/versions.ts

@@ -2,7 +2,7 @@
 export function versions() {
     return {
         random: "0.0.3",
-        odinjs: "0.1.1",
-        dust: "0.0.4",
+        odinjs: "0.1.3",
+        dust: "0.0.5",
     };
 }

test/wodin.test.ts

@@ -168,10 +168,13 @@ describe("can run batch", () => {
         const tEnd = 10;
         const dt = 0.1;
         const nParticles = 7;
+        const sdValues = [0, 1, 10, 100];
         const pars = {
             base: {n: 1, sd: 0},
-            name: "sd",
-            values: [0, 1, 10, 100]
+            varying: [{
+                name: "sd",
+                values: sdValues
+            }]
         };
         const res = batchRunDiscrete(models.Walk, pars, 0, tEnd, dt, nParticles);
         res.run();
@@ -187,13 +190,19 @@ describe("can run batch", () => {
         expect(traces1.values[0].y.slice(1).every((x) => x !== 0)).toBe(true);
 
         const end = res.valueAtTime(10);
-        expect(end.x).toStrictEqual(pars.values);
+        const sdValuesUserTypes = [
+            { sd: 0 },
+            { sd: 1 },
+            { sd: 10 },
+            { sd: 100 },
+        ];
+        expect(end.x).toStrictEqual(sdValuesUserTypes);
         expect(end.values.length).toBe(1);
         expect(end.values[0].name).toBe("x");
         expect(end.values[0].y).toStrictEqual(res.solutions.map((el) => el(allTimes).values[0].y[100]));
 
         const max = res.extreme("yMax");
-        expect(max.x).toStrictEqual(pars.values);
+        expect(max.x).toStrictEqual(sdValuesUserTypes);
         expect(max.values.length).toBe(1);
         expect(max.values[0].name).toBe("x");
         expect(max.values[0].y).toStrictEqual(
@@ -207,10 +216,13 @@ describe("can run batch", () => {
         const tEnd = 10;
         const dt = 0.1;
         const nParticles = 7;
+        const sdValues = [0, 1, 10, 100];
         const pars = {
             base: {n: 1, sd: 0},
-            name: "sd",
-            values: [0, 1, 10, 100]
+            varying: [{
+                name: "sd",
+                values: sdValues
+            }]
         };
         const res = batchRunDiscrete(models.Walk, pars, 0, tEnd, dt, nParticles);
         res.run();
@@ -223,14 +235,21 @@ describe("can run batch", () => {
         const tEnd = 10;
         const dt = 0.1;
         const nParticles = 7;
+        const sdValues = [-2, -1, 0, 1, 2];
         const pars = {
             base: {n: 1, sd: 0},
-            name: "sd",
-            values: [-2, -1, 0, 1, 2]
+            varying: [{
+                name: "sd",
+                values: sdValues
+            }]
         };
         const res = batchRunDiscrete(models.Walk, pars, 0, tEnd, dt, nParticles);
         res.run();
-        expect(res.pars.values).toStrictEqual([0, 1, 2]);
+        expect(res.successfulVaryingParams).toStrictEqual([
+            { sd: 0 },
+            { sd: 1 },
+            { sd: 2 }
+        ]);
         expect(res.solutions.length).toBe(3);
     });
 
@@ -240,8 +259,10 @@ describe("can run batch", () => {
         const nParticles = 7;
         const pars = {
             base: {n: 1, sd: 0},
-            name: "sd",
-            values: [-3, -2, -1]
+            varying: [{
+                name: "sd",
+                values: [-3, -2, -1]
+            }]
         };
         const res = batchRunDiscrete(models.Walk, pars, 0, tEnd, dt, nParticles);
         expect(() => res.run())
@@ -260,10 +281,13 @@ describe("can run batch", () => {
         const tEnd = 10;
         const dt = 0.1;
         const nParticles = 7;
+        const sdValues = [0, 1, 10, 100];
         const pars = {
             base: {n: 1, sd: 0},
-            name: "sd",
-            values: [0, 1, 10, 100]
+            varying: [{
+                name: "sd",
+                values: sdValues
+            }]
         };
         const res = batchRunDiscrete(models.Walk, pars, 0, tEnd, dt, nParticles,
                                      summary);
@@ -290,7 +314,13 @@ describe("can run batch", () => {
         expect(ordered.every((x) => x)).toBe(true);
 
         const end = res.valueAtTime(10);
-        expect(end.x).toStrictEqual(pars.values);
+        const sdValuesUserTypes = [
+            { sd: 0 },
+            { sd: 1 },
+            { sd: 10 },
+            { sd: 100 },
+        ];
+        expect(end.x).toStrictEqual(sdValuesUserTypes);
         expect(end.values.length).toBe(3);
         expect(end.values[0].name).toBe("x");
         expect(end.values[0].description).toBe("Min");
@@ -305,7 +335,7 @@ describe("can run batch", () => {
         expect(end.values.map((el) => el.y)).toStrictEqual(yend);
 
         const ymax = res.extreme("yMax");
-        expect(ymax.x).toStrictEqual(pars.values);
+        expect(ymax.x).toStrictEqual(sdValuesUserTypes);
         expect(ymax.values.length).toBe(3);
 
         expect(ymax.values[0].name).toBe("x");