GROK-17514: Diff Studio: DS-lib usage

Implemented the use of of the Diff Studio library
datagrok-ai · Feb 7, 2025 · 748624b · 748624b
1 parent e715f59
commit 748624b
Show file tree

Hide file tree

Showing 39 changed files with 605 additions and 1,733 deletions.
diff --git a/packages/DiffStudio/CHANGELOG.md b/packages/DiffStudio/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Diff Studio changelog
 
-## 1.2.1 (2025-02-10)
+## 1.2.2 (2025-02-10)
+
+* Implemented the use of Diff Studio Lib solvers
+* Added correctness tests
+
+## 1.2.1 (2025-02-01)
 
 Added facet grid plot
 

diff --git a/packages/DiffStudio/files/library/bioreactor.ivp b/packages/DiffStudio/files/library/bioreactor.ivp
@@ -83,7 +83,7 @@
 #argument: t
   t0 = 0.0   {units: min; caption: Initial; category: Time}                       [Initial time of simulation]
   t1 = 1000  {units: min; caption: Final;   category: Time; min: 500; max: 1000}  [Final time of simulation]
-   h = 1     {units: min; caption: Step;    category: Time; min: 0.1; max: 2}     [Time step of simlulation]
+   h = 1     {units: min; caption: Step;    category: Time; min: 0.1; max: 2}     [Time step of simulation]
 
 #inits:  
   FFox     = 0.2   {units: mmol/L; category: Initial values; min: 0.15; max: 0.25; step: 0.01}  [FF oxidized]

diff --git a/packages/DiffStudio/files/library/chem-react.ivp b/packages/DiffStudio/files/library/chem-react.ivp
@@ -31,6 +31,6 @@
 #argument: t
   initial = 0 {units: min; caption: Initial; category: Time; min: 0; max: 5} [Initial time of simulation]
   final = 6 {units: min; caption: Final; category: Time; min: 6; max: 10} [Final time of simulation]
-  step = 0.01 {units: min; caption: Step; category: Time; min: 0.01; max: 0.1; step: 0.001} [Time step of simlulation]
+  step = 0.01 {units: min; caption: Step; category: Time; min: 0.01; max: 0.1; step: 0.001} [Time step of simulation]
 
 #tolerance: 5e-5
diff --git a/packages/DiffStudio/files/library/energy-n-control.ivp b/packages/DiffStudio/files/library/energy-n-control.ivp
@@ -20,7 +20,7 @@
   // simple if-then-else custom function
   func1 = (p, t) => (p < 8) ? ceil(t) : ceil(t**2 / 20)
 
-  // another custom function using the previouse one  
+  // another custom function using the previous one  
   func2 = (p, t) => (p < 5) ? ceil(exp(-t) * 10) : func1(p, t);
 
   // usage of custom function
@@ -44,6 +44,6 @@
 #argument: t
   start = 0 {caption: Initial; category: Time; min: 0; max: 10} [Initial time of simulation]
   finish = 10 {caption: Final; category: Time; min: 10; max: 20} [Final time of simulation]
-  step = 0.01 {caption: Step; category: Time; min: 0.01; max: 0.1; step: 0.001} [Time step of simlulation]
+  step = 0.01 {caption: Step; category: Time; min: 0.01; max: 0.1; step: 0.001} [Time step of simulation]
 
 #tolerance: 5e-5
diff --git a/packages/DiffStudio/files/library/fermentation.ivp b/packages/DiffStudio/files/library/fermentation.ivp
@@ -11,7 +11,7 @@
 #argument: t
   initial = 0 {units: d; caption: Initial; category: Time; min: 0; max: 10} [Initial time of simulation]
   final = 70 {units: d; caption: Final; category: Time; min: 15; max: 100} [Final time of simulation]
-  step = 0.01 {units: d; caption: Step; category: Time; min: 0.01; max: 1} [Time step of simlulation]
+  step = 0.01 {units: d; caption: Step; category: Time; min: 0.01; max: 1} [Time step of simulation]
 
 #inits:  
   P = 4.276 {units: ml/ml; caption: ethanol, P; category: Initials; min: 3; max: 6} [Concentration of ethanol]

diff --git a/packages/DiffStudio/files/library/ga-production.ivp b/packages/DiffStudio/files/library/ga-production.ivp
@@ -14,7 +14,7 @@
 #argument: t, 1-st stage
   start = 0 {units: h; caption: initial; category: Misc} [Start of the process]
   stage1 = 60 {units: h; caption: 1-st stage; category: Durations; min: 20; max: 80} [Duration of the 1-st stage]
-  step = 0.1 {units: h; caption: step; category: Misc; min: 0.01; max: 1} [Time step of simlulation]
+  step = 0.1 {units: h; caption: step; category: Misc; min: 0.01; max: 1} [Time step of simulation]
 
 #update: 2-nd stage
   duration = overall - _t1

diff --git a/packages/DiffStudio/files/library/nimotuzumab.ivp b/packages/DiffStudio/files/library/nimotuzumab.ivp
@@ -14,7 +14,7 @@
 #argument: t
   start = 0 {caption: Initial; category: Time; min: 0; max: 10} [Initial time of simulation]
   finish = 70 {caption: Final; category: Time; min: 50; max: 100} [Final time of simulation]
-  step = 0.01 {caption: Step; category: Time; min: 0.01; max: 1} [Time step of simlulation]
+  step = 0.01 {caption: Step; category: Time; min: 0.01; max: 1} [Time step of simulation]
 
 #inits:
   A1 = 0.43 {category: Initials; min: 0.2; max: 0.6} [Central]

diff --git a/packages/DiffStudio/files/library/pk-pd.ivp b/packages/DiffStudio/files/library/pk-pd.ivp
@@ -18,7 +18,7 @@
 #argument: t
   start = 0 {units: h; caption: begin; category: Dosing; min: 0; max: 1} [Begin of dosing interval]
   final = 12 {units: h; caption: end; category: Dosing; min: 5; max: 15} [End of dosing interval]
-  step = 0.1 {units: h; caption: step; category: Dosing; min: 0.01; max: 0.1} [Time step of simlulation]  
+  step = 0.1 {units: h; caption: step; category: Dosing; min: 0.01; max: 0.1} [Time step of simulation]  
 
 #inits:  
   depot = 0 {category: Initial values}

diff --git a/packages/DiffStudio/files/library/pk.ivp b/packages/DiffStudio/files/library/pk.ivp
@@ -15,7 +15,7 @@
 #argument: t
   start = 0 {units: h; caption: begin; category: Dosing; min: 0; max: 1} [Begin of dosing interval]
   final = 12 {units: h; caption: end; category: Dosing; min: 5; max: 15} [End of dosing interval]
-  step = 0.01 {units: h; caption: step; category: Dosing; min: 0.01; max: 0.1} [Time step of simlulation]  
+  step = 0.01 {units: h; caption: step; category: Dosing; min: 0.01; max: 0.1} [Time step of simulation]  
 
 #inits:  
   depot = 0 {category: Initial values}

diff --git a/packages/DiffStudio/files/library/pollution.ivp b/packages/DiffStudio/files/library/pollution.ivp
@@ -98,7 +98,7 @@
 #argument: t
   t0 = 0   {units: min; caption: Initial; category: Time; min: 0; max: 0.9} [Initial time of simulation]
   t1 = 60  {units: min; caption: Final; category: Time; min: 1; max: 100; step: 1} [Final time of simulation]
-  h = 0.1  {units: min; caption: Step; category: Time; min: 0.001; max: 0.1; step: 0.001} [Time step of simlulation]
+  h = 0.1  {units: min; caption: Step; category: Time; min: 0.001; max: 0.1; step: 0.001} [Time step of simulation]
 
 
 #inits:  

diff --git a/packages/DiffStudio/files/library/robertson.ivp b/packages/DiffStudio/files/library/robertson.ivp
@@ -15,6 +15,6 @@
 #argument: t
   start = 0 {units: sec; caption: Initial; category: Time; min: 0; max: 1} [Initial time of simulation]
   finish = 40 {units: sec; caption: Final; category: Time; min: 2; max: 50} [Final time of simulation]
-  step = 0.01 {units: sec; caption: Step; category: Time; min: 0.01; max: 0.1} [Time step of simlulation]
+  step = 0.01 {units: sec; caption: Step; category: Time; min: 0.01; max: 0.1} [Time step of simulation]
 
 #tolerance: 1e-7
diff --git a/packages/DiffStudio/files/templates/extended.ivp b/packages/DiffStudio/files/templates/extended.ivp
@@ -27,6 +27,6 @@
 #argument: t
   start = 0 {caption: Initial; category: Time; min: 0; max: 10} [Initial time of simulation]
   finish = 10 {caption: Final; category: Time; min: 10; max: 20} [Final time of simulation]
-  step = 0.01 {caption: Step; category: Time; min: 0.01; max: 0.1; step: 0.001} [Time step of simlulation]
+  step = 0.01 {caption: Step; category: Time; min: 0.01; max: 0.1; step: 0.001} [Time step of simulation]
 
 #tolerance: 5e-5
diff --git a/packages/DiffStudio/package-lock.json b/packages/DiffStudio/package-lock.json
diff --git a/packages/DiffStudio/package.json b/packages/DiffStudio/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@datagrok/diff-studio",
   "friendlyName": "Diff Studio",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "WebAutoSolver tools for solving ODEs in a browser.",
   "author": {
     "name": "Viktor Makarichev",
@@ -21,7 +21,8 @@
     "css-loader": "^6.10.0",
     "datagrok-api": "^1.23.0",
     "dayjs": "=1.11.10",
-    "style-loader": "^3.3.4"
+    "style-loader": "^3.3.4",
+    "@datagrok/diff-studio-tools": "../../../DiffStudioLib/ds-tools"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.62.0",
@@ -53,9 +54,7 @@
   "canView": [
     "All users"
   ],
-  "sources": [
-    "wasm/matrix-operations.js"
-  ],
+  "sources": [],
   "repository": {
     "type": "git",
     "url": "https://github.com/datagrok-ai/public.git",

diff --git a/packages/DiffStudio/src/app.ts b/packages/DiffStudio/src/app.ts
@@ -23,7 +23,7 @@ import {getIVP, getScriptLines, getScriptParams, IVP, Input, SCRIPTING,
   BRACE_OPEN, BRACE_CLOSE, BRACKET_OPEN, BRACKET_CLOSE, ANNOT_SEPAR,
   CONTROL_SEP, STAGE_COL_NAME, ARG_INPUT_KEYS, DEFAULT_SOLVER_SETTINGS} from './scripting-tools';
 
-import {CallbackAction, DEFAULT_OPTIONS} from './solver-tools/solver-defs';
+  import {CallbackAction, DEFAULT_OPTIONS} from './solver-tools';
 
 import {unusedFileName, getTableFromLastRows, getInputsTable, getLookupsInfo, hasNaN, getCategoryWidget,
   getReducedTable, closeWindows, getRecentModelsTable, getMyModelFiles, getEquationsFromFile,

diff --git a/...c/solver-tools/callbacks/callback-base.ts → ...DiffStudio/src/callbacks/callback-base.ts b/...c/solver-tools/callbacks/callback-base.ts → ...DiffStudio/src/callbacks/callback-base.ts
diff --git a/.../solver-tools/callbacks/callback-tools.ts → ...iffStudio/src/callbacks/callback-tools.ts b/.../solver-tools/callbacks/callback-tools.ts → ...iffStudio/src/callbacks/callback-tools.ts
@@ -1,6 +1,6 @@
 // Manager of callbacks
 
-import {SolverOptions} from '../solver-defs';
+import {SolverOptions} from '@datagrok/diff-studio-tools';
 import {Callback} from './callback-base';
 import {TimeCheckerCallback} from './time-checker-callback';
 import {IterCheckerCallback} from './iter-checker-callback';

diff --git a/...-tools/callbacks/iter-checker-callback.ts → ...io/src/callbacks/iter-checker-callback.ts b/...-tools/callbacks/iter-checker-callback.ts → ...io/src/callbacks/iter-checker-callback.ts
@@ -1,5 +1,5 @@
 import {Callback} from './callback-base';
-import {CallbackAction} from '../solver-defs';
+import {CallbackAction} from '../solver-tools';
 
 /** This callback terminates computations if the maximum iterations is exceeded */
 export class IterCheckerCallback extends Callback {

diff --git a/...-tools/callbacks/time-checker-callback.ts → ...io/src/callbacks/time-checker-callback.ts b/...-tools/callbacks/time-checker-callback.ts → ...io/src/callbacks/time-checker-callback.ts
@@ -1,5 +1,5 @@
 import {Callback} from './callback-base';
-import {CallbackAction} from '../solver-defs';
+import {CallbackAction} from '../solver-tools';
 
 /** This callback terminates computations if the maximum calculation time is exceeded */
 export class TimeCheckerCallback extends Callback {

diff --git a/packages/DiffStudio/src/demo-models.ts b/packages/DiffStudio/src/demo-models.ts
@@ -4,7 +4,7 @@ import * as grok from 'datagrok-api/grok';
 import * as ui from 'datagrok-api/ui';
 import * as DG from 'datagrok-api/dg';
 
-import {ros34prw} from './solver-tools/ros34prw-method';
+import {solveDefault} from './solver-tools';
 import '../css/app-styles.css';
 import {LINK} from './ui-constants';
 
@@ -113,7 +113,7 @@ export function getBioreactorSim(t0: number, t1: number, h: number, FFox: number
       'FKox(t)', 'MEA(t)', 'CO2(t)', 'yO2P(t)', 'CYST(t)', 'VL(t)'],
   }; // odes
 
-  return ros34prw(odes);
+  return solveDefault(odes);
 } // getBioreactorSim
 
 /** Return dataframe with the PK-PD simulation */
@@ -157,7 +157,7 @@ export function getPkPdSim(dose: number, count: number, interval: number, KA: nu
       solutionColNames: ['Depot', 'Central', 'Periferal', 'Effect'],
     }; // odes
 
-    return ros34prw(odes);
+    return solveDefault(odes);
   }; // oneStagePkPd
 
   // solution dataframe
@@ -307,7 +307,7 @@ function getBallFlightTable(t1: number, velocity: number, angle: number, dB: num
     solutionColNames: ['x', 'y', 'vx', 'vy'],
   };
 
-  return ros34prw(odes);
+  return solveDefault(odes);
 } // getBallFlightTable
 
 /** Clip numeric table by min value of the specified column */