@sdeverywhere/compile 0.7.1 → 0.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdeverywhere/compile",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "The core Vensim to C compiler for the SDEverywhere tool suite.",
   "type": "module",
   "files": [
@@ -13,7 +13,7 @@
     "antlr4-vensim": "0.6.0",
     "bufx": "^1.0.5",
     "byline": "^5.0.0",
-    "csv-parse": "^4.15.4",
+    "csv-parse": "^5.3.3",
     "js-yaml": "^3.13.1",
     "ramda": "^0.27.0",
     "split-string": "^6.0.0",

package/src/_shared/helpers.js

@@ -1,6 +1,6 @@
 import util from 'util'
 import B from 'bufx'
-import parseCsv from 'csv-parse/lib/sync.js'
+import { parse as parseCsv } from 'csv-parse/sync'
 import R from 'ramda'
 import split from 'split-string'
 import XLSX from 'xlsx'
@@ -124,9 +124,29 @@ export let listConcat = (a, x, addSpaces = false) => {
     return a + (R.isEmpty(a) ? '' : `,${s}`) + x
   }
 }
+// Convert a number or string into a C double constant string.
+// A blank string is converted to zero, following Excel.
+// A string that cannot be converted throws an exception.
 export let cdbl = x => {
-  // Convert a number into a C double constant.
-  let s = x.toString()
+  function throwError() {
+    throw new Error(`ERROR: cannot convert "${x}" to a number`)
+  }
+  let s = '0.0'
+  if (typeof x === 'number') {
+    s = x.toString()
+  } else if (typeof x === 'string') {
+    if (x.trim() !== '') {
+      let f = parseFloat(x)
+      if (!Number.isNaN(f)) {
+        s = f.toString()
+      } else {
+        throwError()
+      }
+    }
+  } else {
+    throwError()
+  }
+  // Format as a C double literal with a decimal point.
   if (!s.includes('.') && !s.toLowerCase().includes('e')) {
     s += '.0'
   }
@@ -205,10 +225,14 @@ 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)
+      csv = parseCsv(data, CSV_PARSE_OPTS)
+    } catch (err) {
+      console.error(`ERROR: readCsv ${pathname} ${err.message}`)
     }
-    let data = B.read(pathname)
-    csv = parseCsv(data, CSV_PARSE_OPTS)
     csvData.set(pathname, csv)
   }
   return csv

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};
+}
+
 `
   }
 

package/src/generate/equation-gen.js

@@ -383,7 +383,15 @@ export default class EquationGen extends ModelReader {
         let csvPathname = path.resolve(this.modelDirname, file)
         let data = readCsv(csvPathname, tab)
         if (data) {
-          getCellValue = (c, r) => (data[r] != null && data[r][c] != null ? cdbl(data[r][c]) : null)
+          getCellValue = (c, r) => {
+            let value = '0.0'
+            try {
+              value = data[r] != null && data[r][c] != null ? cdbl(data[r][c]) : null
+            } catch (error) {
+              console.error(`${error.message} in ${csvPathname}`)
+            }
+            return value
+          }
         }
       }
       // If the data was found, convert it to a lookup.
@@ -463,7 +471,15 @@ export default class EquationGen extends ModelReader {
     let csvPathname = path.resolve(this.modelDirname, file)
     let data = readCsv(csvPathname, tab)
     if (data) {
-      let getCellValue = (c, r) => (data[r] != null && data[r][c] != null ? cdbl(data[r][c]) : null)
+      let getCellValue = (c, r) => {
+        let value = '0.0'
+        try {
+          value = data[r] != null && data[r][c] != null ? cdbl(data[r][c]) : null
+        } catch (error) {
+          console.error(`${error.message} in ${csvPathname}`)
+        }
+        return value
+      }
       // Get C subscripts in text form for the LHS in normal order.
       let modelLHSReader = new ModelLHSReader()
       modelLHSReader.read(this.var.modelLHS)