@sdeverywhere/cli 0.7.6 → 0.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdeverywhere/cli",
-  "version": "0.7.6",
+  "version": "0.7.8",
   "description": "Contains the `sde` command line interface for the SDEverywhere tool suite.",
   "type": "module",
   "files": [
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@sdeverywhere/build": "^0.3.0",
-    "@sdeverywhere/compile": "^0.7.3",
+    "@sdeverywhere/compile": "^0.7.5",
     "bufx": "^1.0.5",
     "byline": "^5.0.0",
     "ramda": "^0.27.0",

package/src/c/model.c

@@ -23,6 +23,49 @@ size_t savePointIndex = 0;
 
 int step = 0;
 
+void initControlParamsIfNeeded() {
+  static bool controlParamsInitialized = false;
+  if (controlParamsInitialized) {
+    return;
+  }
+
+  // Some models may define the control parameters as variables that are
+  // dependent on other values that are only known at runtime (after running
+  // the initializers and/or one step of the model), so we need to perform
+  // those steps once before the parameters are accessed
+  // TODO: This approach doesn't work if one or more control parameters are
+  // defined in terms of some value that is provided at runtime as an input
+  initConstants();
+  initLevels();
+  _time = _initial_time;
+  evalAux();
+  controlParamsInitialized = true;
+}
+
+/**
+ * Return the constant or computed value of `INITIAL TIME`.
+ */
+double getInitialTime() {
+  initControlParamsIfNeeded();
+  return _initial_time;
+}
+
+/**
+ * Return the constant or computed value of `FINAL TIME`.
+ */
+double getFinalTime() {
+  initControlParamsIfNeeded();
+  return _final_time;
+}
+
+/**
+ * Return the constant or computed value of `SAVEPER`.
+ */
+double getSaveper() {
+  initControlParamsIfNeeded();
+  return _saveper;
+}
+
 char* run_model(const char* inputs) {
   // run_model does everything necessary to run the model with the given inputs.
   // It may be called multiple times. Call finish() after all runs are complete.

package/src/c/sde.h

@@ -50,7 +50,10 @@ EXTERN double _final_time;
 EXTERN double _time_step;
 EXTERN double _saveper;
 
-// API (defined in model.h)
+// API (defined in model.c)
+double getInitialTime(void);
+double getFinalTime(void);
+double getSaveper(void);
 char* run_model(const char* inputs);
 void runModelWithBuffers(double* inputs, double* outputs);
 void run(void);
@@ -58,11 +61,6 @@ void startOutput(void);
 void outputVar(double value);
 void finish(void);
 
-// API (defined by the generated model)
-double getInitialTime(void);
-double getFinalTime(void);
-double getSaveper(void);
-
 // Functions implemented by the generated model
 void initConstants(void);
 void initLevels(void);

package/src/sde-compare.js

@@ -79,6 +79,10 @@ export let compare = async (vensimfile, sdefile, opts) => {
   }
   if (noDATDifference) {
     pr(`Data were the same for ${vensimfile} and ${sdefile}`)
+    return true
+  } else {
+    pr(`Data differences detected for ${vensimfile} and ${sdefile}`)
+    return false
   }
 }
 let isZero = value => {

package/src/sde-test.js

@@ -53,7 +53,12 @@ export let test = async (model, opts) => {
     let vensimPathname = path.join(modelDirname, `${modelName}.dat`)
     let p = path.parse(logPathname)
     let sdePathname = path.format({ dir: p.dir, name: p.name, ext: '.dat' })
-    await compare(vensimPathname, sdePathname, opts)
+    let noDiffs = await compare(vensimPathname, sdePathname, opts)
+    if (!noDiffs) {
+      // Exit with a non-zero error code if differences were detected
+      console.error()
+      process.exit(1)
+    }
   } catch (e) {
     // Exit with a non-zero error code if any step failed
     console.error(`ERROR: ${e.message}\n`)