linny-r 2.0.8 → 2.0.10

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

@@ -32,7 +32,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-// CLASS GUIDatasetManager provides the dataset dialog functionality
+// CLASS GUIDatasetManager provides the dataset dialog functionality.
 class GUIDatasetManager extends DatasetManager {
   constructor() {
     super();
@@ -44,7 +44,7 @@ class GUIDatasetManager extends DatasetManager {
         'click', (event) => UI.toggleDialog(event));
     document.getElementById('ds-new-btn').addEventListener(
          // Shift-click on New button => add prefix of selected dataset
-         // (if any) to the name field of the dialog
+         // (if any) to the name field of the dialog.
         'click', () => DATASET_MANAGER.promptForDataset(event.shiftKey));
     document.getElementById('ds-data-btn').addEventListener(
         'click', () => DATASET_MANAGER.editData());
@@ -58,14 +58,14 @@ class GUIDatasetManager extends DatasetManager {
         'click', () => DATASET_MANAGER.deleteDataset());
     document.getElementById('ds-filter-btn').addEventListener(
         'click', () => DATASET_MANAGER.toggleFilter());
-    // Update when filter input text changes 
+    // Update when filter input text changes.
     this.filter_text = document.getElementById('ds-filter-text');
     this.filter_text.addEventListener(
         'input', () => DATASET_MANAGER.changeFilter());
     this.dataset_table = document.getElementById('dataset-table');
-    // Data properties pane
+    // Data properties pane.
     this.properties = document.getElementById('dataset-properties');
-    // Toggle buttons at bottom of dialog
+    // Toggle buttons at bottom of dialog.
     this.blackbox = document.getElementById('dataset-blackbox');
     this.blackbox.addEventListener(
         'click', () => DATASET_MANAGER.toggleBlackBox());
@@ -75,7 +75,7 @@ class GUIDatasetManager extends DatasetManager {
     this.io_box = document.getElementById('dataset-io');
     this.io_box.addEventListener(
         'click', () => DATASET_MANAGER.toggleImportExport());
-    // Modifier pane buttons
+    // Modifier pane buttons.
     document.getElementById('ds-add-modif-btn').addEventListener(
         'click', () => DATASET_MANAGER.promptForSelector('new'));
     document.getElementById('ds-rename-modif-btn').addEventListener(
@@ -86,9 +86,9 @@ class GUIDatasetManager extends DatasetManager {
         'click', () => DATASET_MANAGER.deleteModifier());
     document.getElementById('ds-convert-modif-btn').addEventListener(
         'click', () => DATASET_MANAGER.promptToConvertModifiers());
-    // Modifier table
+    // Modifier table.
     this.modifier_table = document.getElementById('dataset-modif-table');
-    // Modal dialogs
+    // Modal dialogs.
     this.new_modal = new ModalDialog('new-dataset');
     this.new_modal.ok.addEventListener(
         'click', () => DATASET_MANAGER.newDataset());
@@ -170,7 +170,8 @@ class GUIDatasetManager extends DatasetManager {
   }
   
   enterKey() {
-    // Open "edit" dialog for the selected dataset or modifier expression
+    // Open "edit" dialog for the selected dataset or modifier expression.
+    if(!this.focal_table) this.focal_table = this.dataset_table;
     const srl = this.focal_table.getElementsByClassName('sel-set');
     if(srl.length > 0) {
       const r = this.focal_table.rows[srl[0].rowIndex];
@@ -190,7 +191,8 @@ class GUIDatasetManager extends DatasetManager {
   }
   
   upDownKey(dir) {
-    // Select row above or below the selected one (if possible)
+    // Select row above or below the selected one (if possible).
+    if(!this.focal_table) this.focal_table = this.dataset_table;
     const srl = this.focal_table.getElementsByClassName('sel-set');
     if(srl.length > 0) {
       let r = this.focal_table.rows[srl[0].rowIndex + dir];
@@ -206,12 +208,24 @@ class GUIDatasetManager extends DatasetManager {
     }
   }
   
+  expandToShow(name) {
+    // Expand all prefix rows for dataset having `name` so as to make it visible.
+    const pn = UI.prefixesAndName(name);
+    if(pn.length > 1) {
+      pn.pop();
+      while(pn.length) {
+        addDistinct(pn.join(UI.PREFIXER).toLowerCase(), this.expanded_rows);
+        pn.pop();
+      }
+      this.updateDialog();
+    }
+  }
+  
   hideCollapsedRows() {
-    // Hides all rows except top level and immediate children of expanded
-    for(let i = 0; i < this.dataset_table.rows.length; i++) {
+    // Hide 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
+          // Get the first DIV in the first TD of this row.
           first_div = row.firstChild.firstElementChild,
           btn = first_div.dataset.prefix === 'x';
       let p = row.dataset.prefix,
@@ -219,18 +233,18 @@ class GUIDatasetManager extends DatasetManager {
           show = !p || x;
       if(btn) {
         const btn_div = row.getElementsByClassName('tree-btn')[0];
-        // Special expand/collapse row
+        // Special expand/collapse row.
         if(show) {
-          // Set triangle to point down 
+          // Set triangle to point down.
           btn_div.innerText = '\u25BC';
         } else {
-          // Set triangle to point right 
+          // Set triangle to point right. 
           btn_div.innerText = '\u25BA';
-          // See whether "parent prefix" is expanded
+          // See whether "parent prefix" is expanded.
           p = p.split(UI.PREFIXER);
           p.pop();
           p = p.join(UI.PREFIXER);
-          // If so, then also show the row
+          // If so, then also show the row.
           show = (!p || this.expanded_rows.indexOf(p) >= 0);
         }
       }
@@ -239,7 +253,7 @@ class GUIDatasetManager extends DatasetManager {
   }
   
   togglePrefixRow(e) {
-    // Shows list items of the next prefix level
+    // Show list items of the next prefix level.
     let r = e.target;
     while(r.tagName !== 'TR') r = r.parentNode;
     const
@@ -247,7 +261,7 @@ class GUIDatasetManager extends DatasetManager {
         i = this.expanded_rows.indexOf(p);
     if(i >= 0) {
       this.expanded_rows.splice(i, 1);
-      // Also remove all prefixes that have `p` as prefix
+      // Also remove all prefixes that have `p` as prefix.
       for(let j = this.expanded_rows.length - 1; j >= 0; j--) {
         if(this.expanded_rows[j].startsWith(p + UI.PREFIXER)) {
           this.expanded_rows.splice(j, 1);
@@ -260,7 +274,7 @@ class GUIDatasetManager extends DatasetManager {
   }
   
   rowByPrefix(prefix) {
-    // Returns first table row with the specified prefix
+    // Return the first table row with the specified prefix.
     if(!prefix) return null;
     let lcp = prefix.toLowerCase(),
         pl = lcp.split(': ');
@@ -274,20 +288,17 @@ 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;
   }
 
   selectPrefixRow(e) {
-    // Selects expand/collapse prefix row
+    // Select expand/collapse prefix row.
     this.focal_table = this.dataset_table;
-    // NOTE: `e` can also be a string specifying the prefix to select
+    // NOTE: `e` can also be a string specifying the prefix to select.
     let r = e.target || this.rowByPrefix(e);
     if(!r) return;
-    // Modeler may have clicked on the expand/collapse triangle;
+    // Modeler may have clicked on the expand/collapse triangle.
     const toggle = r.classList.contains('tree-btn');
     while(r.tagName !== 'TR') r = r.parentNode;
     this.selected_prefix_row = r;
@@ -328,8 +339,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);
@@ -851,8 +862,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++;
@@ -949,16 +959,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) {
@@ -976,17 +980,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;
@@ -1008,10 +1011,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,
@@ -1025,10 +1026,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
@@ -1063,7 +1062,7 @@ class GUIDatasetManager extends DatasetManager {
   }
   
   editData() {
-    // Show the Edit time series dialog
+    // Show the Edit time series dialog.
     const
         ds = this.selected_dataset,
         md = this.series_modal,
@@ -1073,7 +1072,7 @@ class GUIDatasetManager extends DatasetManager {
       md.element('unit').value = ds.scale_unit;
       cover.style.display = (ds.array ? 'block' : 'none');
       md.element('time-scale').value = VM.sig4Dig(ds.time_scale);
-      // Add options for time unit selector
+      // Add options for time unit selector.
       const ol = [];
       for(let u in VM.time_unit_shorthand) {
         if(VM.time_unit_shorthand.hasOwnProperty(u)) {
@@ -1083,7 +1082,7 @@ class GUIDatasetManager extends DatasetManager {
         }
       }
       md.element('time-unit').innerHTML = ol.join('');
-      // Add options for(dis)aggregation method selector
+      // Add options for(dis)aggregation method selector.
       ol.length = 0;
       for(let i = 0; i < this.methods.length; i++) {
         ol.push(['<option value="', this.methods[i],
@@ -1091,12 +1090,12 @@ class GUIDatasetManager extends DatasetManager {
             '">', this.method_names[i], '</option>'].join(''));
       }
       md.element('method').innerHTML = ol.join('');
-      // Update the "periodic" box
+      // Update the "periodic" box.
       UI.setBox('series-periodic', ds.periodic);
-      // Update the "array" box
+      // Update the "array" box.
       UI.setBox('series-array', ds.array);
       md.element('url').value = ds.url;
-      // Show data as decimal numbers (JS default notation) on separate lines
+      // Show data as decimal numbers (JS default notation) on separate lines.
       this.series_data.value = ds.data.join('\n');
       md.show('default');
     }
@@ -1181,9 +1180,8 @@ class GUIDatasetManager extends DatasetManager {
         parts = lines[0].split(sep),
         dsn = [];
     let quoted = false;
-    for(let i = 0; i < parts.length; i++) {
+    for(const p of parts) {
       const
-          p = parts[i],
           swq = /^\"(\"\")*($|[^\"])/.test(p),
           ewq = p.endsWith('"');
       if(!quoted && swq && !ewq) {
@@ -1220,7 +1218,8 @@ class GUIDatasetManager extends DatasetManager {
         UI.warn(`Invalid default value "${v}" in column ${i}`);
         return false;
       } else {
-        dsa.push([sf]);
+        // Push empty list, as this will become the actual dataset without default value.
+        dsa.push([]);
       }
     }
     for(let i = 2; i < n; i++) {
@@ -1229,16 +1228,15 @@ class GUIDatasetManager extends DatasetManager {
         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++) {
+      for(let j = 0; j < ncol; 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);
         }
+        dsa[j].push(sf);
       }
     }
     // Add or update datasets.

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