linny-r 2.1.5 → 2.1.6

package/package.json

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

package/static/index.html

@@ -3178,6 +3178,12 @@ where X can be one or several of these letters: ABCDELPQ">
       <img id="finder-chart-btn" class="btn enab"
            src="images/chart.png"
            title="Add attribute to chart">
+      <img id="finder-experiment-btn" class="btn enab"
+           src="images/experiment.png"
+           title="Only consider experiment outcomes">
+      <img id="finder-table-btn" class="btn enab"
+           src="images/table.png"
+           title="View entity attribute values">
       <img id="finder-copy-btn" class="btn enab"
            src="images/table-to-clpbrd.png"
            title="Copy entity attributes to clipboard">
@@ -3193,6 +3199,14 @@ where X can be one or several of these letters: ABCDELPQ">
       <table id="finder-expression-table">
       </table>
     </div>
+    <div id="finder-data-pane">
+      <table id="finder-data-header">
+      </table>
+      <div id="finder-data-scroll-area">
+        <table id="finder-data-table">
+        </table>
+      </div>
+    </div>
     <div id="finder-resize" class="resizer"></div>
   </div>
 
@@ -3206,8 +3220,10 @@ where X can be one or several of these letters: ABCDELPQ">
         <img class="ok-btn" src="images/ok.png">
       </div>
       <div style="margin: 2px; padding-right: 2px; white-space: nowrap">
-        <select id="confirm-add-chart-variables-attribute"></select>
-        of <span id="confirm-add-chart-variables-count"></span>
+        <div id="confirm-add-chart-variables-attr-of">
+          <select id="confirm-add-chart-variables-attribute"></select> of
+        </div>
+        <span id="confirm-add-chart-variables-count"></span>
       </div>
       <div>
         <div id="confirm-add-chart-variables-absolute" class="box clear"></div>

package/static/linny-r.css

@@ -1167,6 +1167,10 @@ table.power-flow th:not(:first-child) {
   filter: brightness(160%);
 }
 
+#settings-power-btn.ignore {
+  filter: hue-rotate(230deg);
+}
+
 #password-dlg {
   width: min-content;
   height: min-content;
@@ -2660,6 +2664,7 @@ div.io-box {
 #finder-table,
 #finder-item-table,
 #finder-expression-table,
+#finder-data-table,
 #boundline-data-series-table,
 #boundline-data-sel-table,
 #restore-table {
@@ -5160,6 +5165,8 @@ img.finder {
 
 #finder-edit-btn,
 #finder-chart-btn,
+#finder-experiment-btn,
+#finder-table-btn,
 #finder-copy-btn {
   height: 15px;
   width: 15px;
@@ -5211,9 +5218,46 @@ img.finder {
   border-top: 1px solid Silver;
 }
 
+#finder-data-pane {
+  position: absolute;
+  background-color: inherit;
+  top: 23px;
+  left: calc(50% + 4px);
+  width: calc(50% - 4px);
+  height: calc(100% - 30px);
+}
+
+#finder-data-header {
+  height: 20px;
+  font-weight: bold;
+  text-align: right;
+  width: 100%
+}
+
+#finder-data-scroll-area {
+  width: calc(100% - 2px);
+  height: calc(100% - 32px);
+  overflow-y: auto;
+  border-top: 1px solid Silver;
+}
+
+#finder-data-table {
+  text-align: right;
+}
+
+#finder-data-header > tbody > tr > td:last-child,
+#finder-data-table > tbody > tr > td:last-child {
+  padding-right: 3%;
+}
+
 #confirm-add-chart-variables-dlg {
   width: min-content;
   height: min-content;
+  min-width: 135px;
+}
+
+#confirm-add-chart-variables-attr-of {
+  display: inline-block;
 }
 
 #confirm-add-chart-variables-attribute {

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

@@ -209,7 +209,7 @@ class GUIChartManager extends ChartManager {
     this.variable_index = -1;
     this.stretch_factor = 1;
     this.drawing_graph = false;
-    // Clear the model-related DOM elements
+    // Clear the model-related DOM elements.
     this.chart_selector.innerHTML = '';
     this.variables_table.innerHTML = '';
     this.options_shown = true;
@@ -641,7 +641,8 @@ class GUIChartManager extends ChartManager {
     for(const cv of c.variables) {
       const nv = new ChartVariable(nc);
       nv.setProperties(cv.object, cv.attribute, cv.stacked,
-          cv.color, cv.scale_factor, cv.absolute, cv.line_width, cv.sorted);
+          cv.color, cv.scale_factor, cv.absolute, cv.line_width,
+          cv.visible, cv.sorted);
       nc.variables.push(nv);
     }
     this.chart_index = MODEL.indexOfChart(nc.title);

package/static/scripts/linny-r-gui-controller.js

@@ -3078,6 +3078,7 @@ class GUIController extends Controller {
       MODEL.t = Math.max(1, MODEL.t - dt);
       UI.updateTimeStep();
       UI.drawDiagram(MODEL);
+      if(FINDER.visible && FINDER.tabular_view) FINDER.updateTabularView();
     }
   }
   
@@ -3088,6 +3089,7 @@ class GUIController extends Controller {
       MODEL.t = Math.min(MODEL.end_period - MODEL.start_period + 1, MODEL.t + dt);
       UI.updateTimeStep();
       UI.drawDiagram(MODEL);
+      if(FINDER.visible && FINDER.tabular_view) FINDER.updateTabularView();
     }
   }
   
@@ -3096,39 +3098,39 @@ class GUIController extends Controller {
   //
   
   copyStringToClipboard(string) {
-    // Copies string to clipboard and notifies user of #lines copied
-    let msg = pluralS(string.split('\n').length, 'line') +
-            ' copied to clipboard',
-        type = 'notification';
+    // Copy string to clipboard and notifies user of #lines copied.
     if(navigator.clipboard) {
-      navigator.clipboard.writeText(string).catch(
-          () => UI.setMessage('Failed to copy to clipboard', 'warning'));
+      const msg = pluralS(string.split('\n').length, 'line') +
+          ' copied to clipboard';
+      navigator.clipboard.writeText(string)
+          .then(() => UI.setMessage(msg, 'notification'))
+          .catch(() => UI.setMessage('Failed to copy to clipboard', 'warning'));
     } else {
-      // Workaround using deprecated execCommand
-      const ta = document.createElement('textarea');
-      document.body.appendChild(ta);
-      ta.value = string;
-      ta.select();
-      document.execCommand('copy');
-      document.body.removeChild(ta);
+      UI.setMessage('Your browser does not support copying to clipboard',
+          'warning');
     }
-    UI.setMessage(msg, type);
   }
   
-  copyHtmlToClipboard(html) {
-    // Copy HTML to clipboard
-    function listener(event) {
-      event.clipboardData.setData('text/html', html);
-      event.preventDefault();
+  copyHtmlToClipboard(html, plain=false) {
+    // Copy HTML (as such or as plain text) to clipboard and notify user.
+    if(navigator.clipboard) {
+      const
+          item = (plain ? {'text/plain': html} : {'text/html': html}),
+          data = [new ClipboardItem(item)],
+          msg = 'HTML copied to clipboard' + (plain ? ' as plain text' : '');
+      navigator.clipboard.write(data)
+          .then(() => UI.setMessage(msg, 'notification'))
+          .catch((error) => UI.setMessage('Failed to copy HTML to clipboard',
+              'warning', error));
+    } else {
+      UI.setMessage('Your browser does not support copying HTML to clipboard',
+          'warning');
     }
-    document.addEventListener('copy', listener);
-    document.execCommand('copy');
-    document.removeEventListener('copy', listener);
   }
   
   logHeapSize(msg='') {
-    // Logs MB's of used heap memory to console (to detect memory leaks)
-    // NOTE: this feature is supported only by Chrome
+    // Log MB's of used heap memory to console (to detect memory leaks).
+    // NOTE: This feature is supported only by Chrome.
     if(msg) msg += ' -- ';
     if(performance.memory !== undefined) {
       console.log(msg + 'Allocated memory: ' + Math.round(
@@ -4035,11 +4037,16 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     this.setBox('settings-encrypt', model.encrypt);
     const pg_btn = md.element('power-btn');
     pg_btn.style.display = (model.with_power_flow ? 'inline-block' : 'none');
+    if(model.ignore_grid_capacity || model.ignore_KVL || model.ignore_power_losses) {
+      pg_btn.classList.add('ignore');
+    } else {
+      pg_btn.classList.remove('ignore');
+    }
     md.show('name');
   }
   
   updateSettings(model) {
-    // Valdidate inputs
+    // Valdidate inputs.
     const px = this.validNumericInput('settings-grid-pixels', 'grid resolution');
     if(px === false) return false;
     const ts = this.validNumericInput('settings-time-scale', 'time step');

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

@@ -288,7 +288,7 @@ class GUIDatasetManager extends DatasetManager {
     for(const r of this.dataset_table.rows) if(r.dataset.prefix === lcp) return r;
     return null;
   }
-  
+
   selectPrefixRow(e) {
     // Select expand/collapse prefix row.
     this.focal_table = this.dataset_table;
@@ -579,6 +579,13 @@ class GUIDatasetManager extends DatasetManager {
     // NOTE: Updating entire dialog may be very time-consuming
     // when model contains numerous prefixed datasets.
     this.updatePanes();
+    // NOTE: The selected row now has to be highlighted, as the table
+    // HTML is not changed.
+    let r = event.target;
+    while(r && r.tagName !== 'TR') r = r.parentNode;
+    const sel = this.dataset_table.getElementsByClassName('sel-set');
+    if(sel.length > 0) sel[0].classList.remove('sel-set');
+    r.classList.add('sel-set');
   }
   
   selectModifier(event, id, x=true) {

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

@@ -343,6 +343,8 @@ class GUIExperimentManager extends ExperimentManager {
     // NOTE: When UpdateDialog is called after an entity has been renamed,
     // its variable list should be updated.
     this.updateViewerVariable();
+    // NOTE: Finder may need updating as well.
+    if(FINDER.experiment_view) FINDER.updateDialog();
   }
 
   updateParameters() {
@@ -727,6 +729,11 @@ class GUIExperimentManager extends ExperimentManager {
     // Toggle `n` consecutive rows, starting at row `r` (0 = top), to be
     // (no longer) part of the chart combination set.
     // @@TO DO: shift-key indicates "add row(s) to selection"
+    if(MODEL.running_experiment) {
+      // NOTE: do NOT change run selection while VM is solving!
+      UI.notify('Run selection cannot be changed when an experiment is running');
+      return;
+    }
     const
         x = this.selected_experiment,
         // Let `first` be the number of the first run on row `r`.
@@ -751,7 +758,10 @@ class GUIExperimentManager extends ExperimentManager {
         }
       }
       this.updateData();
+      CHART_MANAGER.resetChartVectors();
       CHART_MANAGER.updateDialog();
+      // NOTE: Finder may need updating as well.
+      if(FINDER.experiment_view) FINDER.updateDialog();
     }
   }
 
@@ -761,34 +771,36 @@ class GUIExperimentManager extends ExperimentManager {
   
   toggleChartCombi(n, shift, alt) {
     // Set `n` to be the chart combination, or toggle if Shift-key is pressed,
-    // or execute single run if Alt-key is pressed
+    // or execute single run if Alt-key is pressed.
+    if(MODEL.running_experiment) {
+      // NOTE: do NOT do this while VM is solving, as this would interfere!
+      UI.notify('Run selection cannot be changed when an experiment is running');
+      return;
+    }
     const x = this.selected_experiment;
     if(x && alt && n >= 0) {
       this.startExperiment(n);
       return;
     }
     if(x && n < x.combinations.length) {
-      // Clear current selection unless Shift-key is pressed 
-      if(!shift) x.chart_combinations.length = 0;
-      // Toggle => add if not in selection, otherwise remove
+      // Toggle => add if not in selection, otherwise remove.
       const ci = x.chart_combinations.indexOf(n);
       if(ci < 0) {
+        // Clear current selection unless Shift-key is pressed.
+        if(!shift) x.chart_combinations.length = 0;
         x.chart_combinations.push(n);
       } else {
         x.chart_combinations.splice(ci, 1);
       }
     }
     this.updateData();
-    if(MODEL.running_experiment) {
-      // NOTE: do NOT do this while VM is solving, as this would interfer!
-      UI.notify('Selected run cannot be viewed while running an experiment');
-    } else {
-      // Show the messages for this run in the monitor
-      VM.setRunMessages(n);
-      // Update the chart
-      CHART_MANAGER.resetChartVectors();
-      CHART_MANAGER.updateDialog();
-    }
+    // Show the messages for this run in the monitor.
+    VM.setRunMessages(n);
+    // Update the chart.
+    CHART_MANAGER.resetChartVectors();
+    CHART_MANAGER.updateDialog();
+    // NOTE: Finder may need updating as well.
+    if(FINDER.experiment_view) FINDER.updateDialog();
   }
   
   runInfo(n) {
@@ -839,7 +851,7 @@ class GUIExperimentManager extends ExperimentManager {
       info.html = html.join('');
       return info;
     }
-    // Fall-through (should not occur)
+    // Fall-through (should not occur).
     return null;
   }
   
@@ -848,7 +860,7 @@ class GUIExperimentManager extends ExperimentManager {
     // NOTE: Skip when viewer is showing!
     if(!UI.hidden('experiment-viewer')) return;
     if(n < MODEL.experiments.length) {
-      // NOTE: mouse move over title in viewer passes n = -1 
+      // NOTE: Mouse move over title in viewer passes n = -1.
       const x = (n < 0 ? this.selected_experiment : MODEL.experiments[n]);
       DOCUMENTATION_MANAGER.update(x, shift);
     }

package/static/scripts/linny-r-gui-finder.js

@@ -50,12 +50,27 @@ class Finder {
     this.chart_btn = document.getElementById('finder-chart-btn');
     this.chart_btn.addEventListener(
         'click', () => FINDER.confirmAddChartVariables());
+    this.table_btn = document.getElementById('finder-table-btn');
+    this.table_btn.addEventListener(
+        'click', () => FINDER.toggleViewAttributes());
+    this.experiment_btn = document.getElementById('finder-experiment-btn');
+    this.experiment_btn.addEventListener(
+        'click', () => FINDER.toggleViewExperiment());
     this.copy_btn = document.getElementById('finder-copy-btn');
     this.copy_btn.addEventListener(
         'click', (event) => FINDER.copyAttributesToClipboard(event.shiftKey));
+    this.entity_scroll_area = document.getElementById('finder-scroll-area');
+    this.entity_scroll_area.addEventListener(
+        'scroll', () => FINDER.scrollEntityArea());
     this.entity_table = document.getElementById('finder-table');
     this.item_table = document.getElementById('finder-item-table');
     this.expression_table = document.getElementById('finder-expression-table');
+    this.data_pane = document.getElementById('finder-data-pane');
+    this.data_header = document.getElementById('finder-data-header');
+    this.data_scroll_area = document.getElementById('finder-data-scroll-area');
+    this.data_scroll_area.addEventListener(
+        'scroll', () => FINDER.scrollDataArea());
+    this.data_table = document.getElementById('finder-data-table');
         
     // The Confirm add chart variables modal.
     this.add_chart_variables_modal = new ModalDialog('confirm-add-chart-variables');
@@ -97,6 +112,8 @@ class Finder {
     // Product cluster index "remembers" for which cluster a product was
     // last revealed, so it can reveal the next cluster when clicked again.
     this.product_cluster_index = 0;
+    this.tabular_view = false;
+    this.experiment_view = false;
   }
   
   doubleClicked(obj) {
@@ -150,8 +167,23 @@ class Finder {
     let imgs = '';
     this.entities.length = 0;
     this.filtered_types.length = 0;
-    // No list unless a pattern OR a specified SUB-set of entity types.
-    if(fp || et && et !== VM.entity_letters) {
+    if(this.experiment_view) {
+      // List outcome variables of selected experiment.
+      const x = EXPERIMENT_MANAGER.selected_experiment;
+      if(x) {
+        x.inferVariables();
+        for(const v of x.variables) {
+          const obj = v.object;
+          if(et !== VM.entity_letters && et.indexOf(obj.typeLetter) >= 0) {
+            if(!fp || patternMatch(obj.displayName, this.filter_pattern)) {
+              this.entities.push(v);
+              enl.push(v.displayName);
+            }
+          }
+        }
+      }
+    } else if(fp || et && et !== VM.entity_letters) {
+      // No list unless a pattern OR a specified SUB-set of entity types.
       if(et.indexOf('A') >= 0) {
         imgs += '<img src="images/actor.png">';
         for(let k in MODEL.actors) if(MODEL.actors.hasOwnProperty(k)) {
@@ -315,32 +347,44 @@ class Finder {
           }
         }
       }
+      // NOTE: Pass TRUE to indicate "comparison of identifiers".
       enl.sort((a, b) => UI.compareFullNames(a, b, true));
     }
     document.getElementById('finder-entity-imgs').innerHTML = imgs;
-    let seid = 'etr';
-    for(let i = 0; i < enl.length; i++) {
-      const e = MODEL.objectByID(enl[i]);
-      if(e === se) seid += i;
-      el.push(['<tr id="etr', i, '" class="dataset',
-          (e === se ? ' sel-set' : ''), '" onclick="FINDER.selectEntity(\'',
-          enl[i], '\', event.altKey);" onmouseover="FINDER.showInfo(\'', enl[i],
-          '\', event.shiftKey);"><td draggable="true" ',
-          'ondragstart="FINDER.drag(event);"><img class="finder" src="images/',
-          e.type.toLowerCase(), '.png">', e.displayName,
-          '</td></tr>'].join(''));
+    let n = enl.length,
+        seid = 'etr';
+    for(let i = 0; i < n; i++) {
+      if(this.experiment_view) {
+        el.push(['<tr id="etr', i, '" class="dataset"><td>',
+            '<div class="series">', enl[i], '</div></td></tr>'].join(''));
+      } else {
+        const e = MODEL.objectByID(enl[i]);
+        if(e === se) seid += i;
+        el.push(['<tr id="etr', i, '" class="dataset',
+            (e === se ? ' sel-set' : ''), '" onclick="FINDER.selectEntity(\'',
+            enl[i], '\', event.altKey);" onmouseover="FINDER.showInfo(\'', enl[i],
+            '\', event.shiftKey);"><td draggable="true" ',
+            'ondragstart="FINDER.drag(event);"><img class="finder" src="images/',
+            e.type.toLowerCase(), '.png">', e.displayName,
+            '</td></tr>'].join(''));
+      }
     }
     // NOTE: Reset `selected_entity` if not in the new list.
     if(seid === 'etr') this.selected_entity = null;
     this.entity_table.innerHTML = el.join('');
     UI.scrollIntoView(document.getElementById(seid));
-    document.getElementById('finder-count').innerHTML = pluralS(
-        el.length, 'entity', 'entities');
-    // Only show the edit button if all filtered entities are of the
-    // same type.
-    let n = el.length;
+    document.getElementById('finder-count').innerHTML = pluralS(n,
+        'entity', 'entities');
     this.edit_btn.style.display = 'none';
+    this.chart_btn.style.display = 'none';
+    this.table_btn.style.display = 'none';
     this.copy_btn.style.display = 'none';
+/*
+    // Show the experiment button only when at least 1 experiment exists.
+    this.experiment_btn.style.display = (MODEL.experiments.length ?
+        'inline-block' : 'none');
+*/
+    // Only show other buttons if the set of filtered entities is not empty.
     if(n > 0) {
       this.copy_btn.style.display = 'inline-block';
       if(CHART_MANAGER.visible && CHART_MANAGER.chart_index >= 0) {
@@ -351,13 +395,27 @@ class Finder {
           this.chart_btn.style.display = 'inline-block';
         }
       }
+      // NOTE: Enable editing and tabular view only when filter results
+      // in a single entity type.
       n = this.entityGroup.length;
       if(n > 0) {
         this.edit_btn.title = 'Edit attributes of ' +
             pluralS(n, this.entities[0].type.toLowerCase());
         this.edit_btn.style.display = 'inline-block';
+        this.table_btn.style.display = 'inline-block';
       }
     }
+    // Show toggle button status.
+    if(this.tabular_view) {
+      this.table_btn.classList.add('stay-activ');
+    } else {
+      this.table_btn.classList.remove('stay-activ');
+    }
+    if(this.experiment_view) {
+      this.experiment_btn.classList.add('stay-activ');
+    } else {
+      this.experiment_btn.classList.remove('stay-activ');
+    }
     this.updateRightPane();
   }
   
@@ -379,10 +437,10 @@ class Finder {
     if(this.filtered_types.length === 1 && ft !== 'E') {
       for(const e of this.entities) {
         // Exclude "no actor" and top cluster.
-        if(e.name && e.name !== '(no_actor)' && e.name !== '(top_cluster)' &&
+        if(!e.name || (e.name !== '(no_actor)' && e.name !== '(top_cluster)' &&
             // Also exclude actor cash flow data products because
             // many of their properties should not be changed.
-            !e.name.startsWith('$')) {
+            !e.name.startsWith('$'))) {
           eg.push(e);
         }
       }
@@ -406,7 +464,13 @@ class Finder {
     for(const a of ca) {
       html += `<option value="${a}">${VM.attribute_names[a]}</option>`;
     }
-    md.element('attribute').innerHTML = html;
+    if(html) {
+      md.element('attr-of').style.display = 'inline-block';
+      md.element('attribute').innerHTML = html;
+    } else {
+      md.element('attr-of').style.display = 'none';
+      md.element('attribute').innerHTML = '';
+    }
     md.element('count').innerText = et;
     md.show();
   }
@@ -440,7 +504,33 @@ class Finder {
     md.hide();
   }
   
+  scrollEntityArea() {
+    // When in tabular view, the data table must scroll along with the
+    // entity table.
+    if(this.tabular_view) {
+      this.data_scroll_area.scrollTop = this.entity_scroll_area.scrollTop;
+    }
+  }
+  
+  scrollDataArea() {
+    // When in tabular view, the entity table must scroll along with the
+    // data table.
+    if(this.tabular_view) {
+      this.entity_scroll_area.scrollTop = this.data_scroll_area.scrollTop;
+    }
+  }
+  
   updateRightPane() {
+    // Right pane can display attribute data...
+    if(this.tabular_view) {
+      this.data_pane.style.display = 'block';
+      this.updateTabularView();
+      return;
+    }
+    // ... or no data...
+    this.data_pane.style.display = 'none';
+    this.data_table.innerHTML = '';
+    // ... but information on the occurence of the selected entity.
     const
         se = this.selected_entity,
         occ = [], // list with occurrences (clusters, processes or charts)
@@ -622,6 +712,152 @@ class Finder {
     document.getElementById('finder-expression-hdr').innerHTML =
         pluralS(el.length, 'expression');
   }
+
+  toggleViewAttributes() {
+    // Show/hide tabular display of entity attributes.
+    this.tabular_view = !this.tabular_view;
+    this.updateRightPane();
+    if(this.tabular_view) {
+      this.table_btn.classList.add('stay-activ');
+    } else {
+      this.table_btn.classList.remove('stay-activ');
+    }
+  }
+  
+  toggleViewExperiment() {
+    // Switch between model entities and experiment outcomes.
+    this.experiment_view = !this.experiment_view;
+    if(this.experiment_view) this.tabular_view = true;
+    this.updateDialog();
+  }
+  
+  updateTabularView() {
+    // Display data values when tabular view is active.
+    if(!this.entities.length ||
+        (this.filtered_types.length !== 1 && !this.experiment_view)) {
+      this.data_table.innerHTML = '';
+      return;
+    }
+    const
+        special = ['\u221E', '-\u221E', '\u2047', '\u00A2'],
+        rows = [],
+        etl = this.entities[0].typeLetter,
+        data_list = [],
+        data = {};
+    // Collect data and sort list by name, so it coresponds with the
+    // entities listed in the left pane.
+    if(this.experiment_view) {
+      // Get selected runs.
+      const
+          x = EXPERIMENT_MANAGER.selected_experiment,
+          runs = (x ? x.chart_combinations : []);
+      if(!runs.length) {
+        UI.notify('');
+        this.data_table.innerHTML = '';
+        return;
+      }
+      // Add aray for each run.
+      data[0] = [];
+      for(const e of this.entities) {
+        const run_data = {name: e.object.displayName};
+        // Add value for each run.
+        data_list.push(run_data);
+      }
+      data_list.sort((a, b) => UI.compareFullNames(a.name, b.name));
+    } else {
+      for(const e of this.entities) data_list.push(e.attributes);
+      data_list.sort((a, b) => UI.compareFullNames(a.name, b.name));
+      // The data "matrix" then holds values as an array per attribute code.
+      // NOTE: Datasets are special in that their data is a multi-line
+      // string of tab-separated key-value pairs where the first pair has no
+      // key (dataset default value) and the other pairs have a dataset
+      // modifier selector as key.
+      if(etl === 'D') {
+        // First compile the list of unique selectors.
+        const sel = [];
+        for(const ed of data_list) {
+          // NOTE: Dataset modifier lines start with a tab.
+          const lines = ed.D.split('\n\t');
+          // Store default value in entity data object for second iteration.
+          ed.dv = VM.sig4Dig(safeStrToFloat(lines[0].trim(), 0));
+          for(let i = 1; i < lines.length; i++) {
+            const pair = lines[i].split('\t');
+            if(pair[0]) {
+              addDistinct(pair[0], sel);
+              // Store pair value in entity data object for second iteration.
+              ed[pair[0]] = (pair.length > 1 ? pair[1] : '');
+            }
+          }
+        }
+        sel.sort(compareSelectors);
+        // Initialize arrays for default values and for selectors.
+        // NOTE: The parentheses of '(default)'ensure that there is no doubling
+        // with a selector defined by the modeler.
+        data['(default)'] = [];
+        for(const s of sel) data[s] = [];
+        // Perform second iteration.
+        for(const ed of data_list) {
+          data['(default)'].push(ed.dv);
+          for(const s of sel) {
+            if(ed[s]) {
+              const f = parseFloat(ed[s]);
+              data[s].push(isNaN(f) ? ed[s] : VM.sig4Dig(f));
+            } else {
+              // Empty string to denote "no modifier => not calculated". 
+              data[s].push('\u2047');
+            }
+          }
+        }
+      } else {
+        // Initialize array per selector.
+        let atcodes = VM.attribute_codes[etl];
+        if(!MODEL.solved) atcodes = complement(atcodes, VM.level_based_attr);
+        if(!MODEL.infer_cost_prices) atcodes = complement(atcodes, ['CP', 'HCP', 'SOC']);
+        for(const ac of atcodes) data[ac] = [];
+        for(const ed of data_list) {
+          for(const ac of atcodes) {
+            let v = ed[ac];
+            if(v === '') {
+              // Empty strings denote "undefined". 
+              v = '\u2047';
+            // Keep special values such as infinity and exception codes.
+            } else if(special.indexOf(v) < 0) {
+              // When model is not solved, expression values will be the
+              // expression string, and this is likely to be not parsable. 
+              const f = parseFloat(v);
+              if(isNaN(f)) {
+                v = '\u2297'; // Circled X to denote "not computed".
+              } else {
+                v = VM.sig4Dig(parseFloat(f.toPrecision(4)));
+              }
+            }
+            data[ac].push(v);
+          }
+        }
+      }
+    }
+    // Create header.
+    const
+        keys = Object.keys(data),
+        row = [],
+        perc = (97 / keys.length).toPrecision(3),
+        style = `min-width: ${perc}%; max-width: ${perc}%`;
+    for(const k of keys) {
+      row.push(`<td style="${style}">${k}</td>`);
+    }
+    this.data_header.innerHTML = '<tr>' + row.join('') + '</tr>';
+    // Format each array with uniform decimals.
+    for(const k of keys) uniformDecimals(data[k]);
+    const n = data_list.length;
+    for(let index = 0; index < n; index++) {
+      const row = [];
+      for(const k of keys) {
+        row.push(`<td style="${style}">${data[k][index]}</td>`);
+      }
+      rows.push('<tr>' + row.join('') + '</tr>');
+    }
+    this.data_table.innerHTML = rows.join('');
+  }
   
   drag(ev) {
     // Start dragging the selected entity.
@@ -977,9 +1213,11 @@ class Finder {
     // Also update the draggable dialogs that may be affected.
     UI.updateControllerDialogs('CDEFIJX');
   }
-
+  
   copyAttributesToClipboard(shift) {
     // Copy relevant entity attributes as tab-separated text to clipboard.
+    // When copy button is Shift-clicked, only data for the selected entity
+    // is copied.
     // NOTE: All entity types have "get" method `attributes` that returns an
     // object that for each defined attribute (and if model has been
     // solved also each inferred attribute) has a property with its value.

package/static/scripts/linny-r-gui-power-grid-manager.js

@@ -173,6 +173,12 @@ class PowerGridManager {
     MODEL.ignore_KVL = UI.boxChecked('power-grids-KVL');
     MODEL.ignore_power_losses = UI.boxChecked('power-grids-losses');
     this.dialog.hide();
+    const pg_btn = document.getElementById('settings-power-btn');
+    if(MODEL.ignore_grid_capacity || MODEL.ignore_KVL || MODEL.ignore_power_losses) {
+      pg_btn.classList.add('ignore');
+    } else {
+      pg_btn.classList.remove('ignore');
+    }
   }
 
   selectPowerGrid(event, id, focus) {

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

@@ -581,7 +581,13 @@ module.exports = class MILPSolver {
               col++;
             }
             // Return near-zero values as 0.
-            x_values.push(Math.abs(x_dict[v]) < this.near_zero ? 0 : x_dict[v]);
+            let xv = x_dict[v];
+            const xfv = parseFloat(xv);
+            if(xfv && Math.abs(xfv) < this.near_zero) {
+              console.log('NOTE: Truncated ', xfv, ' to zero for variable', v);
+              xv = '0';
+            }
+            x_values.push(xv);
             col++;
           }
           // Add zeros to vector for remaining columns.

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

@@ -542,7 +542,7 @@ class LinnyRModel {
         e = this.objectByName(en);
     if(!e) return `Unknown model entity "${en}"`;
     const
-        ao = ea[1].split('@'),
+        ao = (ea.length > 1 ? ea[1].split('@') : ['']),
         a = ao[0].trim();
     // Valid if no attribute, as all entity types have a default attribute. 
     if(!a) return true;
@@ -1636,8 +1636,7 @@ class LinnyRModel {
     const ci = this.indexOfChart(title);
     if(ci >= 0) return this.charts[ci];
     // Otherwise, add it. NOTE: Unlike datasets, charts are not "entities".
-    let c = new Chart();
-    c.title = title;
+    let c = new Chart(title);
     if(node) c.initFromXML(node);
     this.charts.push(c);
     // Sort the chart titles alphabetically...
@@ -3323,7 +3322,7 @@ class LinnyRModel {
     vbls.sort((a, b) => UI.compareFullNames(a.displayName, b.displayName));
     // Create a new chart as dummy, so without adding it to this model.
     const
-        c = new Chart(),
+        c = new Chart('__d_u_m_m_y__c_h_a_r_t__'),
         wcdm = [];
     for(const v of vbls) {
       // NOTE: Prevent adding wildcard dataset modifiers more than once.
@@ -6242,19 +6241,19 @@ class Cluster extends NodeBox {
   }
   
   get nestingLevel() {
-    // Return the "depth" of this cluster in the cluster hierarchy
+    // Return the "depth" of this cluster in the cluster hierarchy.
     if(this.cluster) return this.cluster.nestingLevel + 1; // recursion!
     return 0;
   }
   
   get toBeIgnored() {
-    // Return TRUE if this cluster or some parent cluster is set to be ignored
+    // Return TRUE if this cluster or some parent cluster is set to be ignored.
     return this.ignore || MODEL.ignoreClusterInThisRun(this) ||
         (this.cluster && this.cluster.toBeIgnored); // recursion!
   }
   
   get blackBoxed() {
-    // Return TRUE if this cluster or some parent cluster is marked as black box
+    // Return TRUE if this cluster or some parent cluster is marked as black box.
     return this.black_box ||
         (this.cluster && this.cluster.blackBoxed); // recursion!
   }
@@ -7930,6 +7929,7 @@ class Process extends Node {
     const a = {name: this.displayName};
     a.LB = this.lower_bound.asAttribute;
     a.UB = (this.equal_bounds ? a.LB : this.upper_bound.asAttribute);
+    if(this.grid) a.LB = -a.UB;
     a.IL = this.initial_level.asAttribute;
     a.LCF = this.pace_expression.asAttribute;
     if(MODEL.solved) {
@@ -8863,13 +8863,13 @@ class Link {
   }
 
   get identifier() {
-    // NOTE: link IDs are based on the node codes rather than IDs, as this
-    // prevents problems when nodes are renamed
+    // NOTE: Link IDs are based on the node codes rather than IDs, as this
+    // prevents problems when nodes are renamed.
     return this.from_node.code + '___' + this.to_node.code;
   }
 
   get attributes() {
-    // NOTE: link is named by its tab-separated node names
+    // NOTE: Link is named by its tab-separated node names.
     const a = {name: this.from_node.displayName + '\t' + this.to_node.displayName};
     a.R = this.relative_rate.asAttribute;
     if(MODEL.infer_cost_prices) a.SOC = this.share_of_cost;
@@ -9222,7 +9222,7 @@ class Dataset {
   }
   
   get attributes() {
-    // NOTE: modifiers are appended as additional lines of text
+    // NOTE: Modifiers are appended as additional lines of text.
     const a = {name: this.displayName};
     a.D = '\t' + (this.vector ? this.vector[MODEL.t] : this.default_value);
     for(let k in this.modifiers) if(this.modifiers.hasOwnProperty(k)) {
@@ -9981,8 +9981,8 @@ class ChartVariable {
       }
       // Scale the value unless run result (these are already scaled!).
       if(!rr) {
-        v *= this.scale_factor;
         if(this.absolute) v = Math.abs(v);
+        v *= this.scale_factor;
       }
       this.vector.push(v);
       // Do not include values for t = 0 in statistics.
@@ -13051,7 +13051,7 @@ class Constraint {
   }
 
   get typeLetter() {
-    return 'C';
+    return 'B';
   }
 
   get identifier() {

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

@@ -189,11 +189,16 @@ function uniformDecimals(data) {
     }
     maxi = Math.max(maxi, ss[0].length);
   }
-  // STEP 2: Convert the data to a uniform format
+  // STEP 2: Convert the data to a uniform format.
+  const special = ['\u221E', '-\u221E', '\u2047', '\u00A2'];
   for(let i = 0; i < data.length; i++) {
-    const f = parseFloat(data[i]);
+    const
+        v = data[i],
+        f = parseFloat(v);
     if(isNaN(f)) {
-      data[i] = '\u26A0'; // Unicode warning sign
+      // Keep special values such as infinity, and replace error values
+      // by Unicode warning sign.
+      if(special.indexOf(v) < 0) data[i] = '\u26A0'; 
     } else if(maxe > 0) {
     // Convert ALL numbers to exponential notation with two decimals (1.23e+7)
       const v = f.toExponential(2);
@@ -405,51 +410,59 @@ function patternList(str) {
 
 function patternMatch(str, patterns) {
   // Returns TRUE when `str` matches the &|^-pattern.
-  // NOTE: If a pattern starts with equals sign = then `str` must
-  // equal the rest of the pattern to match; if it starts with a tilde
-  // ~ then `str` must start with the rest of the pattern to match.
+  // NOTE: If a pattern starts with an opening bracket [ then `str` must
+  // start with the rest of the pattern to match. If it ends with a closing
+  // bracket ] then `str` must end with the first part of the pattern.
+  // In this way, [pattern] denotes that `str` should exactly match
   for(let i = 0; i < patterns.length; i++) {
     const p = patterns[i];
     // NOTE: `p` is an OR sub-pattern that tests for a set of "plus"
     // sub-sub-patterns (all of which should match) and a set of "min"
     // sub-sub-patters (all should NOT match)
     let pm,
+        swob,
+        ewcb,
         re,
         match = true;
     for(let j = 0; match && j < p.plus.length; j++) {
       pm = p.plus[j];
-      if(pm.startsWith('=')) {
-        match = (str === pm.substring(1));
-      } else if(pm.startsWith('~')) {
+      swob = pm.startsWith('[');
+      ewcb = pm.endsWith(']');
+      if(swob && ewcb) {
+        match = (str === pm.slice(1, -1));
+      } else if(swob) {
         match = str.startsWith(pm.substring(1));
+      } else if(ewcb) {
+        match = str.endsWith(pm.slice(0, -1));
       } else {
         match = (str.indexOf(pm) >= 0);
       }
-      // If no match, check whether pattern contains wildcards 
+      // If no match, check whether pattern contains wildcards.
       if(!match && pm.indexOf('#') >= 0) {
         // If so, rematch using regular expression that tests for a
-        // number or a ?? wildcard
+        // number or a ?? wildcard.
         let res = pm.split('#');
         for(let i = 0; i < res.length; i++) {
           res[i] = escapeRegex(res[i]);
         }
         res = res.join('(\\d+|\\?\\?)');
-        if(pm.startsWith('=')) {
-          res = '^' + res + '$';
-        } else if(pm.startsWith('~')) {
-          res = '^' + res;
-        }
+        if(swob) res = '^' + res;
+        if(ewcb) res += '$';
         re = new RegExp(res, 'g');
         match = re.test(str);
       }
     }
-    // Any "min" match indicates NO match for this sub-pattern,
+    // Any "min" match indicates NO match for this sub-pattern.
     for(let j = 0; match && j < p.min.length; j++) {
       pm = p.min[j];
-      if(pm.startsWith('=')) {
-        match = (str !== pm.substring(1));
-      } else if(pm.startsWith('~')) {
+      swob = pm.startsWith('[');
+      ewcb = pm.endsWith(']');
+      if(swob && ewcb) {
+        match = (str !== pm.slice(1, -1));
+      } else if(swob) {
         match = !str.startsWith(pm.substring(1));
+      } else if(ewcb) {
+        match = !str.endsWith(pm.slice(0, -1));
       } else {
         match = (str.indexOf(pm) < 0);
       }
@@ -461,11 +474,8 @@ function patternMatch(str, patterns) {
           res[i] = escapeRegex(res[i]);
         }
         res = res.join('(\\d+|\\?\\?)');
-        if(pm.startsWith('=')) {
-          res = '^' + res + '$';
-        } else if(pm.startsWith('~')) {
-          res = '^' + res;
-        }
+        if(swob) res = '^' + res;
+        if(ewcb) res += '$';
         re = new RegExp(res, 'g');
         match = !re.test(str);
       }
@@ -973,18 +983,20 @@ function nameToLines(name, actor_name = '') {
   // the node box.
   let m = actor_name.length;
   const
-      d = Math.floor(Math.sqrt(0.3 * name.length)),
+      d = Math.floor(Math.sqrt(0.25 * name.length)),
       // Do not wrap strings shorter than 13 characters (about 50 pixels).
       limit = Math.max(Math.ceil(name.length / d), m, 13),
-      a = name.split(' ');
-  // Split words at '-' when wider than limit
+      // NOTE: Do not split on spaces followed by a number or a single
+      // capital letter.
+      a = name.split(/\s(?!\d+:|\d+$|[A-Z]\W)/);
+  // Split words at '-' when wider than limit.
   for(let j = 0; j < a.length; j++) {
     if(a[j].length > limit) {
       const sw = a[j].split('-');
       if(sw.length > 1) {
-        // Replace j-th word by last fragment of split string
+        // Replace j-th word by last fragment of split string.
         a[j] = sw.pop();
-        // Insert remaining fragments before
+        // Insert remaining fragments before.
         while(sw.length > 0) a.splice(j, 0, sw.pop() + '-');
       }
     }

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

@@ -1364,7 +1364,10 @@ class ExpressionParser {
       const
           parts = name.split(UI.PREFIXER),
           tail = parts.pop();
-      if(parts.length > 0) {
+      if(!tail && parts.length) {
+        // Prefix without its trailing colon+space could identify an entity.
+        obj = MODEL.objectByID(UI.nameToID(parts.join(UI.PREFIXER)));
+      } else if(parts.length > 0) {
         // Name contains at least one prefix => last part *could* be a
         // method name, so look it up after adding a leading colon.
         const method = MODEL.equationByID(UI.nameToID(':' + tail));
@@ -3391,13 +3394,19 @@ class VirtualMachine {
     // Infer cycle basis for combined power grids for which Kirchhoff's
     // voltage law must be enforced.
     if(MODEL.with_power_flow) {
-      MONITOR.logMessage(1, 'POWER FLOW: ' +
+      this.logMessage(1, 'POWER FLOW: ' +
           pluralS(Object.keys(MODEL.power_grids).length, 'grid'));
+      if(MODEL.ignore_grid_capacity) this.logMessage(1,
+          'NOTE: Assuming infinite grid line cacity');
+      if(MODEL.ignore_KVL) this.logMessage(1,
+          'NOTE: Disregarding Kirchhoff\'s Voltage Law');
+      if(MODEL.ignore_power_losses) this.logMessage(1,
+          'NOTE: Disregarding transmission losses');
       POWER_GRID_MANAGER.inferCycleBasis();
       if(POWER_GRID_MANAGER.messages.length > 1) {
         UI.warn('Check monitor for power grid warnings');
       }
-      MONITOR.logMessage(1, POWER_GRID_MANAGER.messages.join('\n'));
+      this.logMessage(1, POWER_GRID_MANAGER.messages.join('\n'));
       if(POWER_GRID_MANAGER.cycle_basis.length) this.logMessage(1,
           'Enforcing Kirchhoff\'s voltage law for ' +
           POWER_GRID_MANAGER.cycleBasisAsString);
@@ -6204,7 +6213,7 @@ Solver status = ${json.status}`);
     } catch(err) {
       const msg = `ERROR while processing solver data for block ${bnr}: ${err}`;
       console.log(msg);      
-      MONITOR.logMessage(bnr, msg);
+      this.logMessage(bnr, msg);
       UI.alert(msg);
       this.stopSolving();
       this.halted = true;
@@ -7340,7 +7349,10 @@ function VMI_push_run_result(x, args) {
     }
   }
   // Truncate near-zero values.
-  if(Math.abs(v) < VM.SIG_DIF_FROM_ZERO) v = 0;
+  if(v && Math.abs(v) < VM.SIG_DIF_FROM_ZERO) {
+    console.log('NOTE: Truncated experiment run result', v, 'to zero');
+    v = 0;
+  }
   x.push(v);
 }
 
@@ -8432,6 +8444,8 @@ function VMI_set_bounds(args) {
     // Check the difference, as this may be negligible.
     if(u - l < VM.SIG_DIF_FROM_ZERO) {
       u = Math.round(u * 1e5) / 1e5;
+      // NOTE: This may result in -0 (minus zero) => then set to 0.
+      if(u < 0 && u > -VM.NEAR_ZERO) u = 0;
     } else {
       // If substantial, warn that "impossible" bounds would have been set.
       const vk = vbl.displayName;