support for SLV26

hetalang · Nov 9, 2023 · 482133d · 482133d
1 parent 31bed58
commit 482133d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/export-formats.md b/export-formats.md
@@ -126,6 +126,7 @@ This is the updated version of SLV export format which supports compartment volu
 | ---------|------|----------|---------|-----|-------------|
 | powTransform | "keep" / "operator" / "function" | | "keep" | | This is option describing if the transformation of x^y and pow(x, y) is required. |
 | groupConstBy | string/path | | `tags[0]` | | How to group const in Initial Values of DBSolve file. Should be written in format of JSON path |
+| version | string | | `26` | | SLV file version: `26` (for DBSolveOptimum 2020) or `25` (for earlier versions) |
 
 ### Output files
 

diff --git a/src/dbsolve-export/index.js b/src/dbsolve-export/index.js
@@ -1,6 +1,5 @@
 const { AbstractExport } = require('../core/abstract-export');
 /* global compiledTemplates */
-const _ = require('lodash');
 const _get = require('lodash/get');
 require('./expression');
 const { ajv } = require('../utils');
@@ -10,6 +9,7 @@ const schema = {
   properties: {
     groupConstBy: {type: 'string', pattern: '^[\\w\\d.\\[\\]]+$'},
     powTransform: {type: 'string', enum: ['keep', 'operator', 'function'] },
+    version: {enum: ['25', '26', 25, 26]},
   }
 };
 
@@ -33,6 +33,7 @@ class DBSolveExport extends AbstractExport{
     } else if (typeof q.spaceFilter === 'string') {
       this.spaceFilter = [q.spaceFilter];
     }
+    this.version = q.version ? q.version + '' : '26'; // force string
 
     if (q.defaultTask) this.defaultTask = q.defaultTask;
   }
@@ -254,10 +255,11 @@ class DBSolveExport extends AbstractExport{
       processes,
       matrix,
       powTransform: this.powTransform,
+      version: this.version,
       timeEvents,
       discreteEvents,
       continuousEvents,
-      groupedConst
+      groupedConst,
     };
   }
   getSLVCode(image = {}){

diff --git a/src/matlab-export/index.js b/src/matlab-export/index.js
@@ -170,7 +170,9 @@ class MatlabExport extends AbstractExport {
     });
     // add from events
     let const_len = constants.length;
-    events.forEach((x, i) => pTranslator.push([x.switcher.id + '_', `p(${const_len + i + 1})`]));
+    events.forEach((x, i) => {
+      pTranslator[x.switcher.id + '_'] = `p(${const_len + i + 1})`;
+    });
 
     let functionDefArray = [...ns.container.functionDefStorage.values()];
 

diff --git a/src/templates/dbsolve-model.slv.njk b/src/templates/dbsolve-model.slv.njk
@@ -7,9 +7,13 @@
 {%- set freeConstants = population.selectByClassName('Const') | selectattr('free') %}
 {%- set species = population.selectByInstanceOf('Species') -%}
 {%- set timeScales = population.selectByInstanceOf('TimeScale') | exclude2('id', 't') -%}
-
+{% if version == '26' -%}
+DBSolve Optimum 2020 (new parser) 1 Jul 2006
+SLV26.00*
+{%- else -%}
 DBSolve Optimum (new parser) 1 Jul 2006
 SLV25.00*
+{%- endif %}
 Number of rows in matrix (Number of activities) #{{ processes|length }}
 Number of cols in matrix (Number of compounds) #{{ dynamicRecords|length }}
 Initial System dimension #{{ dynamicRecords|length }}
@@ -856,6 +860,12 @@ k1
 1
 0.000010
 1000000
+{%- if version == '26' %}
+p1
+0.000000
+0.000000
+10
+{%- endif %}
 {{ 0 if eventsOff else 1 }}
 {% block events -%}
 {{ timeEvents.length }}