linny-r 2.0.7 → 2.0.9

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());
@@ -200,10 +207,9 @@ class GUIDatasetManager extends DatasetManager {
   }
   
   hideCollapsedRows() {
-    // Hides all rows except top level and immediate children of expanded
-    for(let i = 0; i < this.dataset_table.rows.length; i++) {
+    // Hides all rows except top level and immediate children of expanded.
+    for(const row of this.dataset_table.rows) {
       const
-          row = this.dataset_table.rows[i],
           // Get the first DIV in the first TD of this row
           first_div = row.firstChild.firstElementChild,
           btn = first_div.dataset.prefix === 'x';
@@ -267,10 +273,7 @@ class GUIDatasetManager extends DatasetManager {
       pl.pop();
     }
     this.hideCollapsedRows();
-    for(let i = 0; i < this.dataset_table.rows.length; i++) {
-      const r = this.dataset_table.rows[i];
-      if(r.dataset.prefix === lcp) return r;
-    }
+    for(const r of this.dataset_table.rows) if(r.dataset.prefix === lcp) return r;
     return null;
   }
 
@@ -321,8 +324,8 @@ class GUIDatasetManager extends DatasetManager {
         names = [],
         pref_names = {},
         xids = [];
-    for(let i = 0; i < dnl.length; i++) {
-      const pref = UI.prefixesAndName(MODEL.datasets[dnl[i]].name);
+    for(const dn of dnl) {
+      const pref = UI.prefixesAndName(MODEL.datasets[dn].name);
       // NOTE: only the name part (so no prefixes at all) will be shown
       names.push(pref.pop());
       indent.push(pref.length);
@@ -844,8 +847,7 @@ class GUIDatasetManager extends DatasetManager {
     // Update all chartvariables referencing this dataset + old selector.
     const vl = MODEL.datasetVariables;
     let cv_cnt = 0;
-    for(let i = 0; i < vl.length; i++) {
-      const v = vl[i];
+    for(const v of vl) {
       if(v.object === this.selected_dataset && v.attribute === oldm.selector) {
         v.attribute = m.selector;
         cv_cnt++;
@@ -942,16 +944,10 @@ class GUIDatasetManager extends DatasetManager {
       return;
     }
     prefix += UI.PREFIXER;
-    const
-        dsn = ds.displayName,
-        pml = ds.inferPrefixableModifiers,
-        xl = MODEL.allExpressions,
-        vl = MODEL.datasetVariables,
-        nl = MODEL.notesWithTags;
-    for(let i = 0; i < pml.length; i++) {
+    const dsn = ds.displayName;
+    for(const m of ds.inferPrefixableModifiers) {
       // Create prefixed dataset with correct default value
       const
-          m = pml[i],
           sel = m.selector,
           newds = MODEL.addDataset(prefix + sel);
       if(newds) {
@@ -969,17 +965,16 @@ class GUIDatasetManager extends DatasetManager {
         const
             from = dsn + UI.OA_SEPARATOR + sel,
             to = newds.displayName;
-        for(let j = 0; j < vl.length; j++) {
-          const v = vl[j];
-          // NOTE: variable should match original dataset + selector
+        for(const v of MODEL.datasetVariables) {
+          // NOTE: variable should match original dataset + selector.
           if(v.displayName === from) {
-            // Change to new dataset WITHOUT selector
+            // Change to new dataset WITHOUT selector.
             v.object = newds;
             v.attribute = '';
             vcount++;
           }
         }
-        // Rename variable in the Sensitivity Analysis
+        // Rename variable in the Sensitivity Analysis.
         for(let j = 0; j < MODEL.sensitivity_parameters.length; j++) {
           if(MODEL.sensitivity_parameters[j] === from) {
             MODEL.sensitivity_parameters[j] = to;
@@ -1001,10 +996,8 @@ class GUIDatasetManager extends DatasetManager {
             // Pattern ends at any character that is invalid for a
             // dataset modifier selector (unlike equation names)
             '\\s*[^a-zA-Z0-9\\+\\-\\%\\_]', 'gi');
-        for(let j = 0; j < xl.length; j++) {
-          const
-              x = xl[j],
-              matches = x.text.match(re);
+        for(const x of MODEL.allExpressions) {
+          const matches = x.text.match(re);
           if(matches) {
             for(let k = 0; k < matches.length; k++) {
               // NOTE: each match will start with the opening bracket,
@@ -1018,10 +1011,8 @@ class GUIDatasetManager extends DatasetManager {
             x.code = null;
           }
         }
-        for(let j = 0; j < nl.length; j++) {
-          const
-              n = nl[j],
-              matches = n.contents.match(re);
+        for(const n of MODEL.notesWithTags) {
+          const matches = n.contents.match(re);
           if(matches) {
             for(let k = 0; k < matches.length; k++) {
               // See NOTE above for the use of `slice` here
@@ -1149,4 +1140,124 @@ 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(const p of parts) {
+      const
+          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;
+        }
+      }
+    }
+    // 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-documentation-manager.js

@@ -280,10 +280,10 @@ class DocumentationManager {
 
   clearEntity(list) {
     // To be called when entities are deleted 
-    if(list.indexOf(this.entity) >= 0) {
+    if(list === true || list.indexOf(this.entity) >= 0) {
       this.stopEditing();
       this.entity = null;
-      this.title.innerHTML = 'Information and documentation';
+      this.title.innerHTML = 'About Linny-R';
       this.viewer.innerHTML = this.about_linny_r;
     }
   }
@@ -540,18 +540,17 @@ class DocumentationManager {
 
   showArrowLinks(arrow) {
     // Show list of links represented by a composite arrow.
-    const
-        n = arrow.links.length,
-        msg = 'Arrow represents ' + pluralS(n, 'link');
+    const msg = 'Arrow represents ' + pluralS(arrow.links.length, 'link');
     UI.setMessage(msg);
     if(this.visible && !this.editing) {
       // Set the dialog title.
       this.title.innerHTML = msg;
       // Show list.
       const lis = [];
-      let l, dn, c, af;
-      for(let i = 0; i < n; i++) {
-        l = arrow.links[i];
+      let dn,
+          c,
+          af;
+      for(const l of arrow.links) {
         dn = l.displayName;
         if(l.from_node instanceof Process) {
           c = UI.color.produced;
@@ -600,9 +599,7 @@ class DocumentationManager {
       this.title.innerHTML = msg;
       // Show list.
       const lis = [];
-      for(let i = 0; i < iol.length; i++) {
-        lis.push(`<li>${iol[i].displayName}</li>`);
-      }
+      for(const io of iol) lis.push(`<li>${io.displayName}</li>`);
       lis.sort(ciCompare);
       this.viewer.innerHTML = `<ul>${lis.join('')}</ul>`;
     }
@@ -714,9 +711,8 @@ class DocumentationManager {
         this.differenceAsTable(d.settings));
     if('units' in d) html.push('<h2>Units</h2>',
         this.differenceAsTable(d.units));
-    for(let i = 0; i < UI.MC.ENTITY_PROPS.length; i++) {
-      const e = UI.MC.ENTITY_PROPS[i];
-      if(e in d) html.push('<h2>' + this.propertyName(e) + '</h2>',
+    for(const e of UI.MC.ENTITY_PROPS) if(e in d) {
+      html.push('<h2>' + this.propertyName(e) + '</h2>',
           this.differenceAsTable(d[e]));
     }
     if('charts' in d) html.push('<h2><em>Charts</em></h2>',
@@ -759,9 +755,7 @@ class DocumentationManager {
       const
           html = ['<table>'],
           keys = Object.keys(d).sort();
-      for(let i = 0; i < keys.length; i++) {
-        html.push(this.differenceAsTableRow(d, keys[i]));
-      }
+      for(const k of keys) html.push(this.differenceAsTableRow(d, k));
       html.push('</table>');
       return html.join('\n');
     }

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

@@ -148,7 +148,7 @@ class EquationManager {
   }
   
   updateDialog() {
-    // Updates equation list, highlighting selected equation (if any)
+    // Updates equation list, highlighting selected equation (if any).
     const
         ed = MODEL.equations_dataset,
         ml = [],
@@ -160,34 +160,36 @@ class EquationManager {
       this.outcome_btn.classList.add('not-selected'); 
     }
     let smid = 'eqmtr';
+    // NOTE> Selector list `msl` contains names, not IDs.
     for(let i = 0; i < msl.length; i++) {
       const
-          m = ed.modifiers[UI.nameToID(msl[i])],
-          wild = (m.selector.indexOf('??') >= 0),
-          method = m.selector.startsWith(':'),
+          id = UI.nameToID(msl[i]),
+          m = ed.modifiers[id],
+          sel = safeDoubleQuotes(m.selector),
+          expr = m.expression,
+          wild = (sel.indexOf('??') >= 0),
+          method = sel.startsWith(':'),
           multi = (this.multi_line ? '-multi' : ''),
-          issue = (m.expression.compile_issue ? ' compile-issue' :
-              (m.expression.compute_issue ? ' compute-issue' : '')),
-          clk = '" onclick="EQUATION_MANAGER.selectModifier(event, \'' +
-              escapedSingleQuotes(m.selector) + '\'',
-          mover = (method ? ' onmouseover="EQUATION_MANAGER.showInfo(\'' +
-              m.identifier + '\', event.shiftKey);"' : '');
+          issue = (expr.compile_issue ? ' compile-issue' :
+              (expr.compute_issue ? ' compute-issue' : '')),
+          clk = `" onclick="EQUATION_MANAGER.selectModifier(event, '${id}'`,
+          mover = (!method ? '' :
+              `onmouseover="EQUATION_MANAGER.showInfo('${id}', event.shiftKey);"`);
       if(m === sm) smid += i;
       ml.push(['<tr id="eqmtr', i, '" class="dataset-modif',
           (m === sm ? ' sel-set' : ''),
           '"><td class="equation-selector',
           (method ? ' method' : ''),
           // Display in gray when method cannot be applied.
-          (m.expression.noMethodObject ? ' no-object' : ''),
-          (m.expression.isStatic ? '' : ' it'), issue,
+          (expr.noMethodObject ? ' no-object' : ''),
+          (expr.isStatic ? '' : ' it'), issue,
           (wild ? ' wildcard' : ''), clk, ', false);"', mover, '>',
           (m.outcome_equation ? '<span class="outcome"></span>' : ''),
-          (wild ? wildcardFormat(m.selector) : m.selector),
+          (wild ? wildcardFormat(sel) : sel),
           '</td><td class="equation-expression', multi, issue,
           (issue ? '"title="' +
-              safeDoubleQuotes(m.expression.compile_issue ||
-                  m.expression.compute_issue) : ''),
-          clk, ');">', m.expression.text, '</td></tr>'].join(''));
+              safeDoubleQuotes(expr.compile_issue || expr.compute_issue) : ''),
+          clk, ');">', expr.text, '</td></tr>'].join(''));
     }
     this.table.innerHTML = ml.join('');
     this.scroll_area.style.display = 'block';
@@ -208,10 +210,10 @@ class EquationManager {
   
   selectModifier(event, id, x=true) {
     // Select modifier, or when Alt- or double-clicked, edit its expression
-    // or the equation name (= name of the modifier)
+    // or the equation name (= name of the modifier).
     if(MODEL.equations_dataset) {
       const
-          m = MODEL.equations_dataset.modifiers[UI.nameToID(id)] || null,
+          m = MODEL.equations_dataset.modifiers[id] || null,
           edit = event.altKey || this.doubleClicked(m);
       this.selected_modifier = m;
       if(m && edit) {
@@ -327,10 +329,8 @@ class EquationManager {
     }
     // Update all chartvariables referencing this dataset + old selector
     let cv_cnt = 0;
-    for(let i = 0; i < MODEL.charts.length; i++) {
-      const c = MODEL.charts[i];
-      for(let j = 0; j < c.variables.length; j++) {
-        const v = c.variables[j];
+    for(const c of MODEL.charts) {
+      for(const v of c.variables) {
         if(v.object === MODEL.equations_dataset && v.attribute === olds) {
           v.attribute = m.selector;
           cv_cnt++;