@sdeverywhere/compile 0.7.2 → 0.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdeverywhere/compile",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "The core Vensim to C compiler for the SDEverywhere tool suite.",
   "type": "module",
   "files": [

package/src/_shared/helpers.js

@@ -225,7 +225,7 @@ export let readCsv = (pathname, delimiter = ',') => {
       columns: false,
       trim: true,
       skip_empty_lines: true,
-      skip_lines_with_empty_values: true
+      skip_records_with_empty_values: true
     }
     try {
       let data = B.read(pathname)

package/src/generate/code-gen.js

@@ -42,6 +42,7 @@ let codeGenerator = (parseTree, opts) => {
       } else if (operation === 'generateC') {
         // Generate code for each variable in the proper order.
         let code = emitDeclCode()
+        code += emitGetControlValuesCode()
         code += emitInitLookupsCode()
         code += emitInitConstantsCode()
         code += emitInitLevelsCode()
@@ -79,6 +80,55 @@ ${dimensionMappingsSection()}
 ${section(Model.lookupVars())}
 ${section(Model.dataVars())}
 
+`
+  }
+
+  //
+  // Control value getters section
+  //
+  function emitGetControlValuesCode() {
+    function getConstTimeValue(vensimName) {
+      const v = Model.varWithName(Model.cName(vensimName))
+      if (v && v.varType === 'const') {
+        return v.modelFormula
+      } else {
+        throw new Error(`SDE only supports ${vensimName} defined as a constant value`)
+      }
+    }
+
+    function getSaveperValue() {
+      const v = Model.varWithName('_saveper')
+      if (v && v.varType === 'const') {
+        return v.modelFormula
+      } else if (v && v.varType === 'aux' && v.modelFormula === 'TIME STEP') {
+        return getConstTimeValue('TIME STEP')
+      } else {
+        throw new Error(`SDE only supports SAVEPER defined as TIME STEP or a constant value`)
+      }
+    }
+
+    // For now we only allow models that have:
+    //   INITIAL TIME = a constant value
+    //   FINAL TIME = a constant value
+    //   SAVEPER = a constant value or constant `TIME STEP`
+    // If the model does not meet these expectations, we throw an error.
+    // TODO: Loosen this up to allow for certain common constant expressions
+    const initialTimeValue = getConstTimeValue('INITIAL TIME')
+    const finalTimeValue = getConstTimeValue('FINAL TIME')
+    const saveperValue = getSaveperValue('SAVEPER')
+
+    return `
+// Control parameter accessors
+double getInitialTime() {
+  return ${initialTimeValue};
+}
+double getFinalTime() {
+  return ${finalTimeValue};
+}
+double getSaveper() {
+  return ${saveperValue};
+}
+
 `
   }