linny-r 2.0.7 → 2.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linny-r",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "Executable graphical language with WYSIWYG editor for MILP models",
   "main": "server.js",
   "scripts": {

package/static/index.html

@@ -1843,6 +1843,8 @@ Each line should represent the points of a different bound line.">
            title="Rename selected dataset">
       <img id="ds-clone-btn" class="btn disab" src="images/clone.png"
            title="Clone selected dataset">
+      <img id="ds-load-btn" class="btn enab" src="images/open.png"
+           title="Load dataset(s) from CSV file">
       <img id="ds-delete-btn" class="btn disab" src="images/delete.png"
            title="Delete selected dataset"
            style="position: absolute; right: 2px">
@@ -1940,6 +1942,19 @@ Start with = to find exact match, with ~ to match first characters">
       <input id="rename-dataset-name" type="text" autocomplete="off">
     </div>
   </div>
+  
+  <!-- the LOAD CSV dialog prompts the user for a CSV file on disk
+       to be loaded -->
+  <div id="load-csv-modal" class="modal">
+    <div id="load-csv-dlg" class="inp-dlg">
+      <div class="dlg-title">
+        Load datasets from CSV file
+        <img class="cancel-btn" src="images/cancel.png">
+        <img class="ok-btn" src="images/ok.png">
+      </div>
+      <input id="load-csv-file" type="file">
+    </div>
+  </div>
 
   <!-- the NEW SELECTOR dialog prompts for a new selector for a dataset -->
   <div id="new-selector-modal" class="modal">
@@ -2495,7 +2510,7 @@ NOTE: * and ? will be interpreted as wildcards"
       <div id="experiment-separator"></div>
       <div id="experiment-default-message">
         To define a meaningful experiment, a model must feature at least
-        one outcome dataset, or a graph having one or more variables.
+        one outcome dataset, or a chart having one or more variables.
       </div>
       <div id="experiment-params-header">(no experiment selected)</div>
       <div id="experiment-params-div">

package/static/linny-r.css

@@ -794,6 +794,7 @@ div.checked.not-same-not-changed {
 
 /* LOAD modal dialog */
 #load-dlg,
+#load-csv-dlg,
 #comparison-dlg {
   width: 430px;
   height: min-content;
@@ -801,6 +802,7 @@ div.checked.not-same-not-changed {
 }
 
 #load-xml-file,
+#load-csv-file,
 #comparison-xml-file {
   padding: 2px;
   max-width: 375px;

package/static/scripts/linny-r-ctrl.js

@@ -446,7 +446,8 @@ class Controller {
     }
     // NOTE: Replace single quotes by Unicode apostrophe so that they
     // cannot interfere with JavaScript strings delimited by single quotes.
-    return name.toLowerCase().replace(/\s/g, '_').replace("'", '\u2019');
+    return name.toLowerCase().replace(/\s/g, '_')
+        .replace("'", '\u2019').replace('"', '\uff02');
   }
   
   htmlEquationName(n) {

package/static/scripts/linny-r-gui-chart-manager.js

@@ -1003,10 +1003,13 @@ class GUIChartManager extends ChartManager {
       if(v.visible) {
         // NOTE: while still solving, display t-1 as N
         const n = Math.max(0, v.N);
-        html.push('<tr><td class="v-name">',
-            [v.displayName, n, data[nr][0], data[nr][1], data[nr][2],
-                data[nr][3], data[nr][4],
-                v.non_zero_tally, v.exceptions].join('</td><td>'),
+        html.push('<tr><td class="v-name">', v.displayName, '</td><td>', n,
+            '</td><td title="', v.minimum.toPrecision(8), '">', data[nr][0],
+            '</td><td title="', v.maximum.toPrecision(8), '">', data[nr][1],
+            '</td><td title="', v.mean.toPrecision(8), '">', data[nr][2],
+            '</td><td title="', Math.sqrt(v.variance).toPrecision(8), '">', data[nr][3],
+            '</td><td title="', v.sum.toPrecision(8), '">', data[nr][4],
+            '</td><td>', v.non_zero_tally, '</td><td>', v.exceptions,
             '</td></tr>');
         nr++;
       }

package/static/scripts/linny-r-gui-dataset-manager.js

@@ -52,6 +52,8 @@ class GUIDatasetManager extends DatasetManager {
         'click', () => DATASET_MANAGER.promptForName());
     document.getElementById('ds-clone-btn').addEventListener(
         'click', () => DATASET_MANAGER.cloneDataset());
+    document.getElementById('ds-load-btn').addEventListener(
+        'click', () => DATASET_MANAGER.load_csv_modal.show());
     document.getElementById('ds-delete-btn').addEventListener(
         'click', () => DATASET_MANAGER.deleteDataset());
     document.getElementById('ds-filter-btn').addEventListener(
@@ -97,6 +99,11 @@ class GUIDatasetManager extends DatasetManager {
         'click', () => DATASET_MANAGER.renameDataset());
     this.rename_modal.cancel.addEventListener(
         'click', () => DATASET_MANAGER.rename_modal.hide());
+    this.load_csv_modal = new ModalDialog('load-csv');
+    this.load_csv_modal.ok.addEventListener(
+        'click', () => FILE_MANAGER.loadCSVFile());
+    this.load_csv_modal.cancel.addEventListener(
+        'click', () => DATASET_MANAGER.load_csv_modal.hide());
     this.conversion_modal = new ModalDialog('convert-modifiers');
     this.conversion_modal.ok.addEventListener(
         'click', () => DATASET_MANAGER.convertModifiers());
@@ -1149,4 +1156,127 @@ class GUIDatasetManager extends DatasetManager {
     this.updateDialog();
   }
   
+  readCSVData(text) {
+    // Parse text from uploaded file and create or overwrite datasets.
+    const
+        lines = text.trim().split(/\n/),
+        n = lines.length;
+    if(n < 2) {
+      UI.warn('Data must have at least 2 lines: dataset names and default values');
+      return false;
+    }
+    // Infer most likely delimiter.
+    const
+        tabs = text.split('\t').length - 1,
+        tab0 = lines[0].split('\t').length - 1,
+        tab1 = lines[1].split('\t').length - 1,
+        semic0 = lines[0].split(';').length - 1,
+        semics = text.split(';').length - 1 - semic0;
+    let sep = '\t';
+    if(!tabs || tab0 !== tab1) {
+      // Tab is most likely NOT the separator.
+      sep = (semics ? ';' : ',');
+    }
+    const
+        parts = lines[0].split(sep),
+        dsn = [];
+    let quoted = false;
+    for(let i = 0; i < parts.length; i++) {
+      const
+          p = parts[i],
+          swq = /^\"(\"\")*($|[^\"])/.test(p),
+          ewq = p.endsWith('"');
+      if(!quoted && swq && !ewq) {
+        dsn.push(p);
+        quoted = true;
+      } else if(quoted) {
+        dsn[dsn.length - 1] += sep + p;
+        quoted = !ewq;
+      } else {
+        dsn.push(p);
+      }
+    }
+    for(let i = 0; i < dsn.length; i++) {
+      const n = unquoteCSV(dsn[i].trim());
+      if(!UI.validName(n)) {
+        UI.warn(`Invalid dataset name "${n}" in column ${i}`);
+        return false;
+      }
+      dsn[i] = n;
+    }
+    const
+        ncol = dsn.length,
+        dsa = [],
+        dsdv = lines[1].split(sep);
+    if(dsdv.length !== ncol) {
+      UI.warn(`Number of default values (${dsdv.length}) does not match number of dataset names (${ncol})`);
+      return false;
+    }
+    for(let i = 0; i < dsdv.length; i++) {
+      const
+          v = dsdv[i].trim(),
+          sf = safeStrToFloat(v, NaN);
+      if(isNaN(sf)) {
+        UI.warn(`Invalid default value "${v}" in column ${i}`);
+        return false;
+      } else {
+        dsa.push([sf]);
+      }
+    }
+    for(let i = 2; i < n; i++) {
+      const dsv = lines[i].trim().split(sep);
+      if(dsv.length !== ncol) {
+        UI.warn(`Number of values (${dsv.length}) on line ${i} does not match number of dataset names (${ncol})`);
+        return false;
+      }
+      for(let j = 0; j < dsv.length; j++) {
+        const
+            v = dsv[j].trim(),
+            sf = safeStrToFloat(v, '');
+        if(sf === '' && v !== '') {
+          UI.warn(`Invalid numerical value "${v}" for <strong>${dsn[j]}</strong> on line ${i}`);
+          return false;
+        } else {
+          dsa[j].push(sf);
+        }
+      }
+    }
+    // Add or update datasets.
+    let added = 0,
+        updated = 0;
+    for(let i = 0; i < dsn.length; i++) {
+      const
+          n = dsn[i],
+          id = UI.nameToID(n),
+          ods = MODEL.namedObjectByID(id),
+          ds = ods || MODEL.addDataset(n);
+      // NOTE: `ds` will now be either a new dataset or an existing one.
+      if(ds) {
+        // Keep track of added/updated datasets.
+        const
+            odv = ds.default_value,
+            odata = ds.dataString;
+        ds.default_value = safeStrToFloat(dsdv[i], 0);
+        ds.data = dsa[i];
+        if(ods) {
+          if(ds.default_value !== odv || odata !== ds.dataString) updated++;
+        } else {
+          added++;
+        }
+        ds.computeStatistics();
+      }
+    }
+    // Notify modeler of changes (if any).
+    let msg = 'No datasets added or updated';
+    if(added) {
+      msg = pluralS(added, 'dataset') + ' added';
+      if(updated) msg += ', ' + pluralS(updated, 'dataset') + ' updated';
+    } else if(updated) {
+      msg = pluralS(updated, 'dataset') + ' updated';
+    }
+    UI.notify(msg);
+    this.updateDialog();
+    return true;
+  }
+  
 } // END of class GUIDatasetManager

package/static/scripts/linny-r-gui-file-manager.js

@@ -391,6 +391,19 @@ class GUIFileManager {
         });
   }
 
+  loadCSVFile() {
+    document.getElementById('load-csv-modal').style.display = 'none';
+    try {
+      const file = document.getElementById('load-csv-file').files[0];
+      if(!file) return;
+      const reader = new FileReader();
+      reader.onload = (event) => DATASET_MANAGER.readCSVData(event.target.result);
+      reader.readAsText(file);
+    } catch(err) {
+      UI.alert('Error while reading file: ' + err);
+    }
+  }
+  
   renderDiagramAsPNG(tight) {
     // When `tight` is TRUE, add no whitespace around the diagram.
     window.localStorage.removeItem('png-url');

package/static/scripts/linny-r-utils.js

@@ -225,6 +225,13 @@ function ellipsedText(text, n=50, m=10) {
   return text.slice(0, n) + ' \u2026 ' + text.slice(text.length - m);
 }
 
+function unquoteCSV(s) {
+  // Returns a double-quoted string `s` without its quotes, and with
+  // quote pairs "" replaced by single " quotes.
+  if(!s.startsWith('"') || !s.endsWith('"')) return s;
+  return s.slice(1, -1).replaceAll('""', '"');
+}
+
 //
 // Functions used when comparing two Linny-R models
 //
@@ -1132,6 +1139,7 @@ if(NODE) module.exports = {
   uniformDecimals: uniformDecimals,
   capitalized: capitalized,
   ellipsedText: ellipsedText,
+  unquoteCSV: unquoteCSV,
   earlierVersion: earlierVersion,
   differences: differences,
   markFirstDifference: markFirstDifference,

package/static/scripts/linny-r-vm.js

@@ -444,6 +444,12 @@ class Expression {
     // expression).
     if(t < 0 || this.isStatic) t = 0;
     if(t >= v.length) return VM.UNDEFINED;
+    // Check for recursive calls.
+    if(v[t] === VM.COMPUTING) {
+      console.log('Already computing expression for', this.variableName);
+      console.log(this.text);
+      return VM.CYCLIC;
+    }
     // NOTES:
     // (1) When VM is setting up a tableau, values computed for the
     //     look-ahead period must be recomputed.