linny-r 2.1.4 → 2.1.6

package/package.json

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

package/static/index.html

@@ -2381,6 +2381,14 @@ NOTE: * and ? will be interpreted as wildcards"
           <div id="variable-color" title="Click to copy, Shift-click to paste"></div>
           <div id="variable-paste-color"></div>
         </div>
+        <div id="variable-absolute-div"
+             title="Plot the absolute value of this variable"
+             style="margin: 2px -2px">
+          <div id="variable-absolute" class="box clear"></div>
+          <div style="display:inline-block; vertical-align:top; margin-top: 3px">
+            Absolute
+          </div>
+        </div>
         <div id="variable-scale-div" style="margin-top: 3px">
           <div style="display:inline-block; vertical-align:top; margin-top: 2px">
             Scale by:
@@ -3170,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">
@@ -3185,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>
 
@@ -3198,13 +3220,21 @@ 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>
+        <div style="display:inline-block; vertical-align:top; margin-top: 3px">
+          Plot absolute values
+        </div>
       </div>
       <div>
         <div id="confirm-add-chart-variables-stacked" class="box clear"></div>
         <div style="display:inline-block; vertical-align:top; margin-top: 3px">
-          Display as stacked areas
+          Plot as stacked areas
         </div>
       </div>
     </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 {
@@ -2918,8 +2923,8 @@ td.dataset-selector {
 }
 
 td.equation-selector {
-  min-width: 120px;
-  max-width: 240px;
+  padding-right: 6px;
+  max-width: 200px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -2964,11 +2969,12 @@ td.equation-expression {
 }
 
 td.equation-expression {
-  min-width: 60%;
+  width: 85%;
 }
 
 td.equation-expression-multi {
   border-left: solid 1px Silver;
+  width: 85%;
   white-space: normal;
   overflow-x: hidden;
   overflow-y: auto;
@@ -3428,6 +3434,9 @@ td.vbl-desc-lead::after {
   color: #b00080;
 }
 
+td.vbl-abs {
+  color: #0050d0 !important;
+}
 
 #chart-variables {
   position: absolute;
@@ -3604,8 +3613,8 @@ img.v-disab {
 }
 
 #variable-dlg {
-  width: 215px;
-  height: 148px;
+  width: 245px;
+  height: 170px;
 }
 
 #variable-dlg-name {
@@ -5156,6 +5165,8 @@ img.finder {
 
 #finder-edit-btn,
 #finder-chart-btn,
+#finder-experiment-btn,
+#finder-table-btn,
 #finder-copy-btn {
   height: 15px;
   width: 15px;
@@ -5207,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-ctrl.js

@@ -986,11 +986,14 @@ class SensitivityAnalysis {
           UI.alert(`Parameter ${p} is not a dataset or expression`);
         }
       }
+      // Create the SA chart having a variable for each SA outcome.
       this.chart = new Chart(this.chart_title);
       for(const o of MODEL.sensitivity_outcomes) {
         this.chart.addVariable(...o.split(UI.OA_SEPARATOR));
       }
+      // Create the SA experiment.
       this.experiment = new Experiment(this.experiment_title);
+      // Add the SA chart so the outcomes become result variables.
       this.experiment.charts = [this.chart];
       this.experiment.inferVariables();
       // This experiment always uses the same combination: the base selectors.

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

@@ -125,7 +125,7 @@ class GUIChartManager extends ChartManager {
     document.getElementById('chart-copy-data-btn').addEventListener(
         'click', () => CHART_MANAGER.copyData());
     document.getElementById('chart-copy-table-btn').addEventListener(
-        'click', () => CHART_MANAGER.copyTable());
+        'click', (event) => CHART_MANAGER.copyTable(event.shiftKey));
     document.getElementById('chart-save-btn').addEventListener(
         'click', () => CHART_MANAGER.downloadChart(event.shiftKey));
     document.getElementById('chart-widen-btn').addEventListener(
@@ -164,8 +164,8 @@ class GUIChartManager extends ChartManager {
         'click', (event) => CHART_MANAGER.copyPasteColor(event));
     // NOTE: Uses the color picker developed by James Daniel.
     this.color_picker = new iro.ColorPicker("#color-picker", {
-        width: 92,
-        height: 92,
+        width: 115,
+        height: 115,
         color: '#a00',
         markerRadius: 10,
         padding: 1,
@@ -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;
@@ -391,7 +391,7 @@ class GUIChartManager extends ChartManager {
           (cv.visible ? ' checked' : ' clear'),
           '" onclick="CHART_MANAGER.toggleVariable(', i,
           ');"></div></td><td class="v-name vbl-', cv.sorted,
-          '">', cv.displayName,
+          (cv.absolute ? ' vbl-abs' : ''), '">', cv.displayName,
           '</td></tr>'].join(''));
       }
       this.variables_table.innerHTML = ol.join('');
@@ -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.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);
@@ -844,6 +845,7 @@ class GUIChartManager extends ChartManager {
       const cv = MODEL.charts[this.chart_index].variables[this.variable_index];
       document.getElementById('variable-dlg-name').innerHTML = cv.displayName;
       UI.setBox('variable-stacked', cv.stacked);
+      UI.setBox('variable-absolute', cv.absolute);
       // Pass TRUE tiny flag to permit very small scaling factors.
       this.variable_modal.element('scale').value = VM.sig4Dig(cv.scale_factor, true);
       this.variable_modal.element('width').value = VM.sig4Dig(cv.line_width);
@@ -928,6 +930,7 @@ class GUIChartManager extends ChartManager {
           c = MODEL.charts[this.chart_index],
           cv = c.variables[this.variable_index];
       cv.stacked = UI.boxChecked('variable-stacked');
+      cv.absolute = UI.boxChecked('variable-absolute');
       cv.scale_factor = s;
       // Prevent negative or near-zero line width.
       cv.line_width = Math.max(0.001, w);
@@ -1092,9 +1095,9 @@ class GUIChartManager extends ChartManager {
     }
   }
   
-  copyTable() {
-    UI.copyHtmlToClipboard(this.table_panel.innerHTML);
-    UI.notify('Table copied to clipboard (as HTML)');
+  copyTable(plain) {
+    UI.copyHtmlToClipboard(this.table_panel.innerHTML, plain);
+    UI.notify('Table copied to clipboard (as ', (plain ? 'text' : 'HTML'), ')');
   }
   
   copyStatistics() {

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);
     }