linny-r 2.1.4 → 2.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linny-r",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "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:
@@ -3201,10 +3209,16 @@ where X can be one or several of these letters: ABCDELPQ">
         <select id="confirm-add-chart-variables-attribute"></select>
         of <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

@@ -2918,8 +2918,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 +2964,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 +3429,9 @@ td.vbl-desc-lead::after {
   color: #b00080;
 }
 
+td.vbl-abs {
+  color: #0050d0 !important;
+}
 
 #chart-variables {
   position: absolute;
@@ -3604,8 +3608,8 @@ img.v-disab {
 }
 
 #variable-dlg {
-  width: 215px;
-  height: 148px;
+  width: 245px;
+  height: 170px;
 }
 
 #variable-dlg-name {

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,
@@ -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,7 @@ 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.sorted);
       nc.variables.push(nv);
     }
     this.chart_index = MODEL.indexOfChart(nc.title);
@@ -844,6 +844,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 +929,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 +1094,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-finder.js

@@ -424,13 +424,17 @@ class Finder {
     const
         c = MODEL.charts[ci],
         a = md.element('attribute').value,
-        s = UI.boxChecked('confirm-add-chart-variables-stacked'),
+        abs = UI.boxChecked('confirm-add-chart-variables-absolute'),
+        stack = UI.boxChecked('confirm-add-chart-variables-stacked'),
         enl = [];
     for(const e of this.entities) enl.push(e.name);
     enl.sort((a, b) => UI.compareFullNames(a, b, true));
     for(const en of enl) {
       const vi = c.addVariable(en, a);
-      if(vi !== null) c.variables[vi].stacked = s;
+      if(vi !== null) {
+        c.variables[vi].absolute = abs;
+        c.variables[vi].stacked = stack;
+      }
     }
     CHART_MANAGER.updateDialog();
     md.hide();

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

@@ -395,6 +395,9 @@ class Paper {
     id = 'i_n_a_c_t_i_v_e__t_r_i_a_n_g_l_e__t_i_p__ID';
     this.inactive_triangle = `url(#${id})`;
     this.addMarker(defs, id, tri, 8, 'silver');
+    id = 'i_g_n_o_r_e__t_r_i_a_n_g_l_e__t_i_p__ID';
+    this.ignore_triangle = `url(#${id})`;
+    this.addMarker(defs, id, tri, 8, this.palette.ignore);
     id = 'o_p_e_n__t_r_i_a_n_g_l_e__t_i_p__ID*';
     this.open_triangle = `url(#${id})`;
     this.addMarker(defs, id, tri, 7.5, 'white');
@@ -1034,9 +1037,9 @@ class Paper {
     
     // Arrows having both "from" and "to" are displayed as "real" arrows
     // The hidden nodes list must contain the nodes that have no position
-    // in the cluster being drawn
-    // NOTE: products are "hidden" typically when this arrow represents multiple
-    // links, but also if it is a single link from a cluster to a process
+    // in the cluster being drawn.
+    // NOTE: Products are "hidden" typically when this arrow represents multiple
+    // links, but also if it is a single link from a cluster to a process.
     const
         from_c = from_nb instanceof Cluster,
         to_c = to_nb instanceof Cluster,
@@ -1049,12 +1052,12 @@ class Paper {
             fn = lnk.from_node,
             tn = lnk.to_node;
         if(fn instanceof Product && fn != from_nb && fn != to_nb) {
-          // Add node only if they not already shown at EITHER end of the arrow
+          // Add node only if they not already shown at EITHER end of the arrow.
           addDistinct(fn, arrw.hidden_nodes);
-          // Count number of data flows represented by arrow
+          // Count number of data flows represented by arrow.
           if(tn.is_data) data_flows++;
         }
-        // NOTE: no ELSE IF, because BOTH link nodes can be products
+        // NOTE: No ELSE IF, because BOTH link nodes can be products.
         if(tn instanceof Product && tn != from_nb && tn != to_nb)  {
           addDistinct(tn, arrw.hidden_nodes);
           // Count number of data flows represented by arrow
@@ -1063,7 +1066,7 @@ class Paper {
       }
     }
 
-    // NEXT: some more local variables
+    // NEXT: Some more local variables.
     fnx = from_nb.x + dx;
     fny = from_nb.y + dy;
     fnw = from_nb.width;
@@ -1088,19 +1091,19 @@ class Paper {
       tnh = 24;
     }
     
-    // Do not draw arrow if so short that it is hidden by its FROM and TO nodes
+    // Do not draw arrow if so short that it is hidden by its FROM and TO nodes.
     if((Math.abs(fnx - tnx) < (fnw + tnw)/2) &&
        (Math.abs(fny - tny) <= (fnh + tnh)/2)) {
       return false;
     }
     
-    // Adjust node heights if nodes are thick-rimmed
+    // Adjust node heights if nodes are thick-rimmed.
     if((from_nb instanceof Product) && from_nb.is_buffer) fnh += 2;
     if((to_nb instanceof Product) && to_nb.is_buffer) tnh += 2;
-    // Get horizontal distance dx and vertical distance dy of the node centers
+    // Get horizontal distance dx and vertical distance dy of the node centers.
     dx = tnx - fnx;
     dy = tny - fny;
-    // If dx is less than half a pixel, draw a vertical line
+    // If dx is less than half a pixel, draw a vertical line.
     if(Math.abs(dx) < 0.5) {
       arrw.from_x = fnx;
       arrw.to_x = fnx;
@@ -1112,11 +1115,11 @@ class Paper {
         arrw.to_y = tny + tnh/2;
       }
     } else {
-      // Now dx > 0, so no division by zero can occur when calculating dy/dx
-      // First compute X and Y of tail (FROM node)
+      // Now dx > 0, so no division by zero can occur when calculating dy/dx.
+      // First compute X and Y of tail (FROM node).
       w = (from_nb instanceof Product ? from_nb.frame_width : fnw);
       if(Math.abs(dy / dx) >= Math.abs(fnh / w)) {
-        // Arrow connects to horizontal edge
+        // Arrow connects to horizontal edge.
         arrw.from_y = (dy > 0 ? fny + fnh/2 : fny - fnh/2);
         arrw.from_x = fnx + fnh/2 * dx / Math.abs(dy);
       } else if(from_nb instanceof Product) {
@@ -1127,7 +1130,7 @@ class Paper {
         dd = fnw/2;
         nn = (-dd - Math.sqrt(rr - aa * dd * dd + aa * rr)) / (1 + aa);
         if(dx > 0) {
-          // link points towards the right
+          // link points towards the right.
           arrw.from_x = fnx - nn;
           arrw.from_y = fny - nn * dy / dx;
         } else {
@@ -1135,28 +1138,28 @@ class Paper {
           arrw.from_y = fny + nn * dy / dx;
         }
       } else {
-        // Rectangular box
+        // Rectangular box.
         arrw.from_x = (dx > 0 ? fnx + w/2 : fnx - w/2);
         arrw.from_y = fny + w/2 * dy / Math.abs(dx);
       }
-      // Then compute X and Y of head (TO node)
+      // Then compute X and Y of head (TO node).
       w = (to_nb instanceof Product ? to_nb.frame_width : tnw);
       dx = arrw.from_x - tnx;
       dy = arrw.from_y - tny;
       if(Math.abs(dx) > 0) {
         if(Math.abs(dy / dx) >= Math.abs(tnh / w)) {
-          // Connects to horizontal edge
+          // Connects to horizontal edge.
           arrw.to_y = (dy > 0 ? tny + tnh/2 : tny - tnh/2);
           arrw.to_x = tnx + tnh/2 * dx / Math.abs(dy);
         } else if(to_nb instanceof Product) {
-          // Node with semicircular sides}
+          // Node with semicircular sides.
           tnw = to_nb.frame_width;
           rr = (tnh/2) * (tnh/2);  // R square
           aa = (dy / dx) * (dy / dx);  // A square
           dd = tnw/2;
           nn = (-dd - Math.sqrt(rr - aa*(dd*dd - rr))) / (1 + aa);
           if(dx > 0) {
-            // Link points towards the right
+            // Link points towards the right.
             arrw.to_x = tnx - nn;
             arrw.to_y = tny - nn * dy / dx;
           } else {
@@ -1164,30 +1167,30 @@ class Paper {
             arrw.to_y = tny + nn * dy / dx;
           }
         } else {
-          // Rectangular node
+          // Rectangular node.
           arrw.to_x = (dx > 0 ? tnx + w/2 : tnx - w/2);
           arrw.to_y = tny + w/2 * dy / Math.abs(dx);
         }
       }
     }
 
-    // Assume default arrow properties
+    // Assume default arrow properties.
     sda = 'none';
     stroke_color = (ignored ? this.palette.ignore : this.palette.node_rim);
     stroke_width = 1.5;
     arrow_start = 'none';
-    arrow_end = this.triangle;
-    // Default multi-flow values are: NO multiflow, NOT congested or reversed
+    arrow_end = (ignored ? this.ignore_triangle : this.triangle);
+    // Default multi-flow values are: NO multiflow, NOT congested or reversed.
     let mf = [0, 0, 0, false, false],
         reversed = false;
     // These may need to be modified due to actual flow, etc.
     if(arrw.links.length === 1) {
-      // Display link properties of a specific link if arrow is plain
+      // Display link properties of a specific link if arrow is plain.
       luc = arrw.links[0];
-      ignored = MODEL.ignored_entities[luc.identifier];
+      ignored = ignored || MODEL.ignored_entities[luc.identifier];
       if(MODEL.solved && !ignored) {
         // Draw arrow in dark blue if a flow occurs, or in a lighter gray
-        // if NO flow occurs
+        // if NO flow occurs.
         af = luc.actualFlow(MODEL.t);
         if(Math.abs(af) > VM.SIG_DIF_FROM_ZERO) {
           // NOTE: negative flow should affect arrow heads only when link has
@@ -1203,12 +1206,13 @@ class Paper {
             arrow_end = this.active_triangle;
           }
         } else {
-          stroke_color = (MODEL.ignored_entities[luc.identifier] ?
-              this.palette.ignore : 'silver');
+          stroke_color = 'silver';
           arrow_end = this.inactive_triangle;
         }
-      } else {
+      } else if(ignored) {
         af = VM.UNDEFINED;
+        stroke_color = this.palette.ignore;
+        arrow_end = this.ignore_triangle;
       }
       if(luc.from_node instanceof Process) {
         proc = luc.from_node;
@@ -1225,12 +1229,12 @@ class Paper {
           arrow_end = this.feedback_triangle;
         }
       }
-      // Data link => dotted line
+      // Data link => dotted line.
       if(luc.dataOnly) {
         sda = UI.sda.dot;
       }
       if(luc.selected) {
-        // Draw arrow line thick and in red
+        // Draw arrow line thick and in red.
         stroke_color = this.palette.select;
         stroke_width = 2;
         if(arrow_end == this.open_wedge) {
@@ -1239,7 +1243,6 @@ class Paper {
           arrow_end = this.selected_triangle;
         }
       }
-      if(ignored) stroke_color = this.palette.ignore;
     } else {
       // A composite arrow is visualized differently, depending on the number
       // of related products and the direction of the underlying links:
@@ -1264,23 +1267,23 @@ class Paper {
       if(arrw.bidirectional) arrow_start = arrow_end;
     }
     // Correct the start and end points of the shaft for the stroke width
-    // and size and number of the arrow heads
-    // NOTE: re-use of dx and dy for different purpose!
+    // and size and number of the arrow heads.
+    // NOTE: Re-use of dx and dy for different purpose!
     dx = arrw.to_x - arrw.from_x;
     dy = arrw.to_y - arrw.from_y;
     l = Math.sqrt(dx * dx + dy * dy);
     let cdx = 0, cdy = 0;
     if(l > 0) {
-      // Amount to shorten the line to accommodate arrow head
-      // NOTE: for thicker arrows, subtract a bit more
+      // Amount to shorten the line to accommodate arrow head.
+      // NOTE: For thicker arrows, subtract a bit more.
       cdx = (4 + 1.7 * (stroke_width - 1.5)) * dx / l;
       cdy = (4 + 1.7 * (stroke_width - 1.5)) * dy / l;
     }
     if(reversed) {
-      // Adjust end points by 1/2 px for rounded stroke end
+      // Adjust end points by 1/2 px for rounded stroke end.
       bpx = arrw.to_x - 0.5*dx / l;
       bpy = arrw.to_y - 0.5*dy / l;
-      // Adjust start points for arrow head(s)
+      // Adjust start points for arrow head(s).
       epx = arrw.from_x + cdx;
       epy = arrw.from_y + cdy;
       if(arrw.bidirectional) {
@@ -1288,10 +1291,10 @@ class Paper {
         bpy -= cdy;
       }
     } else {
-      // Adjust start points by 1/2 px for rounded stroke end
+      // Adjust start points by 1/2 px for rounded stroke end.
       bpx = arrw.from_x + 0.5*dx / l;
       bpy = arrw.from_y + 0.5*dy / l;
-      // Adjust end points for arrow head(s)
+      // Adjust end points for arrow head(s).
       epx = arrw.to_x - cdx;
       epy = arrw.to_y - cdy;
       if(arrw.bidirectional) {
@@ -1299,8 +1302,8 @@ class Paper {
         bpy += cdy;
       }
     }
-    // Calculate actual (multi)flow, as this co-determines the color of the arrow
-    if(MODEL.solved) {
+    // Calculate actual (multi)flow, as this co-determines the color of the arrow.
+    if(MODEL.solved && !ignored) {
       if(!luc) {
         mf = arrw.multiFlows;
         af = mf[1] + mf[2];
@@ -1315,22 +1318,20 @@ class Paper {
         } else {
           arrow_end = this.active_triangle;
         }
-        if(arrw.bidirectional) {
-          arrow_start = arrow_end;
-        }          
       } else {
         if(stroke_color != this.palette.select) stroke_color = 'silver';
         if(arrow_end === this.double_triangle) {
           arrow_end = this.inactive_double_triangle;
-          if(arrw.bidirectional) {
-            arrow_start = this.inactive_double_triangle;
-          }
         }
       }
     } else {
       af = VM.UNDEFINED;
+      if(ignored && stroke_color != this.palette.select) {
+        stroke_color = this.palette.ignore;
+        arrow_end = this.ignore_triangle;
+      }
     }
-
+    if(arrw.bidirectional) arrow_start = arrow_end;         
     // Draw arrow shaft
     if(stroke_width === 3 && data_flows) {
       // Hollow shaft arrow: dotted when *all* represented links are
@@ -1509,7 +1510,7 @@ class Paper {
     
     // Draw the actual flow
     const absf = Math.abs(af);
-    if(l > 0 && af < VM.UNDEFINED && absf > VM.SIG_DIF_FROM_ZERO) {
+    if(!ignored && l > 0 && af < VM.UNDEFINED && absf > VM.SIG_DIF_FROM_ZERO) {
       const ffill = {fill:'white', opacity:0.8};
       if(luc || mf[0] == 1) {
         // Draw flow data halfway the arrow only if calculated and non-zero.

package/static/scripts/linny-r-gui-sensitivity-analysis.js

@@ -124,7 +124,7 @@ class GUISensitivityAnalysis extends SensitivityAnalysis {
     this.color_scales.rb.addEventListener('click', csf);
     this.color_scales.no.addEventListener('click', csf);
     document.getElementById('sa-copy-btn').addEventListener(
-        'click', () => SENSITIVITY_ANALYSIS.copyTableToClipboard());
+        'click', (event) => SENSITIVITY_ANALYSIS.copyTableToClipboard(event.shiftKey));
     document.getElementById('sa-copy-data-btn').addEventListener(
         'click', () => SENSITIVITY_ANALYSIS.copyDataToClipboard());
     this.outcome_name = document.getElementById('sa-outcome-name');
@@ -255,7 +255,7 @@ class GUISensitivityAnalysis extends SensitivityAnalysis {
     // Otherwise, display list of all dataset selectors in docu-viewer.
     if(DOCUMENTATION_MANAGER.visible) {
       const
-          ds_dict = MODEL.listOfAllSelectors,
+          ds_dict = MODEL.dictOfAllSelectors,
           html = [],
           sl = Object.keys(ds_dict).sort((a, b) => UI.compareFullNames(a, b, true));
       for(const s of sl) {
@@ -346,7 +346,7 @@ class GUISensitivityAnalysis extends SensitivityAnalysis {
         sl = this.base_selectors.value.replace(/[\;\,]/g, ' ').trim().replace(
             /[^a-zA-Z0-9\+\-\%\_\s]/g, '').split(/\s+/),
         bs = sl.join(' '),
-        sd = MODEL.listOfAllSelectors,
+        sd = MODEL.dictOfAllSelectors,
         us = [];
     for(const s of sl) if(s.length > 0 && !(s in sd)) us.push(s);
     if(us.length > 0) {
@@ -760,9 +760,8 @@ class GUISensitivityAnalysis extends SensitivityAnalysis {
     this.updateData();
   }
   
-  copyTableToClipboard() {
-    UI.copyHtmlToClipboard(this.scroll_area.innerHTML);
-    UI.notify('Table copied to clipboard (as HTML)');
+  copyTableToClipboard(plain) {
+    UI.copyHtmlToClipboard(this.scroll_area.innerHTML, plain);
   }
   
   copyDataToClipboard() {

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

@@ -488,6 +488,8 @@ module.exports = class MILPSolver {
     } else {
       inttol = Math.max(1e-9, Math.min(0.1, inttol));
     }
+    // Use integer tolerance setting as "near zero" threshold.
+    this.near_zero = inttol;
     // Default relative MIP gap is 1e-4.
     if(isNaN(mipgap)) {
       mipgap = 1e-4;
@@ -578,7 +580,8 @@ module.exports = class MILPSolver {
               x_values.push(0);
               col++;
             }
-            x_values.push(x_dict[v]);
+            // Return near-zero values as 0.
+            x_values.push(Math.abs(x_dict[v]) < this.near_zero ? 0 : x_dict[v]);
             col++;
           }
           // Add zeros to vector for remaining columns.

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

@@ -1037,11 +1037,11 @@ class LinnyRModel {
     // NOTE: A dimension is a list of one or more relevant selectors.
     this.dimensions.length = 0;
     // NOTE: Ignore the equations dataset.
-    for(let d in this.datasets) if(this.datasets.hasOwnProperty(d) &&
-        this.datasets[d] !== this.equations_dataset) {
+    for(let k in this.datasets) if(this.datasets.hasOwnProperty(k) &&
+        this.datasets[k] !== this.equations_dataset) {
       // Get the selector list for this dataset.
       // NOTE: Ignore wildcard selectors!
-      this.processSelectorList(this.datasets[d].plainSelectors);
+      this.processSelectorList(this.datasets[k].plainSelectors);
     }
     // Analyze constraint bound lines in the same way.
     for(let k in this.constraints) if(this.constraints.hasOwnProperty(k)) {
@@ -3075,10 +3075,12 @@ class LinnyRModel {
       if(n) {
         // NOTE: Use a "dummy experiment object" as parent for SA runs.
         const dummy = {title: SENSITIVITY_ANALYSIS.experiment_title};
+        let r = 0;
         for(const c of n.childNodes) if(c.nodeName === 'experiment-run') {
-          const xr = new ExperimentRun(dummy, i);
+          const xr = new ExperimentRun(dummy, r);
           xr.initFromXML(c);
           this.sensitivity_runs.push(xr);
+          r++;
         }
       }
       n = childNodeByTag(node, 'experiments');
@@ -3337,9 +3339,9 @@ class LinnyRModel {
     return [c.dataAsString, c.statisticsAsString];
   }
     
-  get listOfAllSelectors() {
-    // Returns list of all dataset modifier selectors as a "dictionary"
-    // like so: {selector_1: [list of datasets], ...}
+  get dictOfAllSelectors() {
+    // Returns "dictionary" of all dataset modifier selectors like so:
+    // {selector_1: [list of datasets], ...}
     const ds_dict = {};
     for(let k in this.datasets) if(this.datasets.hasOwnProperty(k)) {
       const ds = this.datasets[k];
@@ -9755,13 +9757,14 @@ class ChartVariable {
     this.wildcard_index = false;
   }
   
-  setProperties(obj, attr, stck, clr, sf=1, lw=1, vis=true, sort='not') {
+  setProperties(obj, attr, stck, clr, sf=1, abs=false, lw=1, vis=true, sort='not') {
     // Sets the defining properties for this chart variable.
     this.object = obj;
     this.attribute = attr;
     this.stacked = stck;
     this.color = clr;
     this.scale_factor = sf;
+    this.absolute = abs;
     this.line_width = lw;
     this.visible = vis;
     this.sorted = sort;
@@ -9777,9 +9780,11 @@ class ChartVariable {
     // Returns the display name for this variable. This is the name of
     // the Linny-R entity and its attribute, followed by its scale factor
     // unless it equals 1 (no scaling).
-    const sf = (this.scale_factor === 1 ? '' :
-        // NOTE: Pass tiny = TRUE to permit very small scaling factors.
-        ` (x${VM.sig4Dig(this.scale_factor, true)})`);
+    const
+        bar = (this.absolute ? '\u2503' : ''),
+        sf = (this.scale_factor === 1 ? '' :
+            // NOTE: Pass tiny = TRUE to permit very small scaling factors.
+            ` (x${VM.sig4Dig(this.scale_factor, true)})`);
     // Display name of equation is just the equations dataset selector. 
     if(this.object instanceof DatasetModifier) {
       let eqn = this.object.selector;
@@ -9795,7 +9800,7 @@ class ChartVariable {
         // method name (leading colon replaced by the prefixer ": ").
         eqn = this.chart.prefix + UI.PREFIXER + eqn.substring(1);
       }
-      return eqn + sf;
+      return bar + eqn + bar + sf;
     }
     // NOTE: Same holds for "dummy variables" added for wildcard
     // dataset selectors.
@@ -9804,11 +9809,13 @@ class ChartVariable {
       if(this.wildcard_index !== false) {
         eqn = eqn.replace('??', this.wildcard_index);
       }
-      return eqn + sf;
+      return bar + eqn + bar + sf;
     }
     // NOTE: Do not display the vertical bar if no attribute is specified.
-    if(!this.attribute) return this.object.displayName + sf;
-    return this.object.displayName + UI.OA_SEPARATOR + this.attribute + sf;
+    if(!this.attribute) {
+      return bar + this.object.displayName + bar + sf;
+    }
+    return bar + this.object.displayName + '|' + this.attribute + bar + sf;
   }
   
   get asXML() {
@@ -9818,7 +9825,9 @@ class ChartVariable {
     if(MODEL.black_box_entities.hasOwnProperty(id)) {
       id = UI.nameToID(MODEL.black_box_entities[id]);
     }
-    const xml = ['<chart-variable', (this.stacked ? ' stacked="1"' : ''),
+    const xml = ['<chart-variable',
+        (this.stacked ? ' stacked="1"' : ''),
+        (this.absolute ? ' absolute="1"' : ''),
         (this.visible ? ' visible="1"' : ''),
         (this.wildcard_index !== false ?
             ` wildcard-index="${this.wildcard_index}"` : ''),
@@ -9876,6 +9885,7 @@ class ChartVariable {
         nodeParameterValue(node, 'stacked') === '1',
         nodeContentByTag(node, 'color'),
         safeStrToFloat(nodeContentByTag(node, 'scale-factor')),
+        nodeParameterValue(node, 'absolute') === '1',
         safeStrToFloat(nodeContentByTag(node, 'line-width')),
         nodeParameterValue(node, 'visible') === '1',
         nodeParameterValue(node, 'sorted') || 'not');
@@ -9970,7 +9980,10 @@ class ChartVariable {
         v = 0;
       }
       // Scale the value unless run result (these are already scaled!).
-      if(!rr) v *= this.scale_factor;
+      if(!rr) {
+        v *= this.scale_factor;
+        if(this.absolute) v = Math.abs(v);
+      }
       this.vector.push(v);
       // Do not include values for t = 0 in statistics.
       if(t > 0) {
@@ -10184,7 +10197,7 @@ class Chart {
     return '#c00000';
   }
 
-  addVariable(n, a) {
+  addVariable(n, a='') {
     // Add variable [entity name `n`|attribute `a`] to the chart unless
     // it is already in the variable list.
     let dn = n + UI.OA_SEPARATOR + a;
@@ -10220,7 +10233,7 @@ class Chart {
       }
     } else {
       const v = new ChartVariable(this);
-      v.setProperties(obj, a, false, this.nextAvailableDefaultColor, 1, 1);
+      v.setProperties(obj, a, false, this.nextAvailableDefaultColor);
       this.variables.push(v);
     }
     return this.variables.length - 1;
@@ -11197,9 +11210,9 @@ class ExperimentRunResult {
       this.x_variable = true;
       this.object_id = v.object.identifier;
       this.attribute = v.attribute;
-      this.was_ignored = MODEL.ignored_entities[this.object_id];
+      this.was_ignored = MODEL.ignored_entities[this.object_id] || false;
       if(this.was_ignored) {
-        // Chart variable entity was ignored => all results are undefined
+        // Chart variable entity was ignored => all results are undefined.
         this.vector = [];
         this.N = VM.UNDEFINED;
         this.sum = VM.UNDEFINED;
@@ -11236,6 +11249,11 @@ class ExperimentRunResult {
         // statistic.
         this.last = (this.vector.length > 0 ?
             this.vector[this.vector.length - 1] : VM.UNDEFINED);
+        // NOTE: For sensitivity analyses, the vector is NOT stored because
+        // the SA reports only the descriptive statistics.
+        if(this.run.experiment === SENSITIVITY_ANALYSIS.experiment) {
+          this.vector.length = 0;
+        }
       }
     } else if(v instanceof Dataset) {
       // This dataset will be an "outcome" dataset => store statistics only
@@ -11329,12 +11347,12 @@ class ExperimentRunResult {
     }
     // The vector MAY need to be scaled to model time by different methods,
     // but since this is likely to be rare, such scaling is performed
-    // "lazily", so the method-specific vectors are initially set to NULL.
+    // "lazily", so the method-specific vectors are initially empty.
     this.resetScaledVectors();
   }
 
   resetScaledVectors() {
-    // Set the special vectors to null, so they will be recalculated.
+    // Clear the special vectors, so they will be recalculated.
     this.scaled_vectors = {'NEAREST': [], 'MEAN': [], 'SUM': [], 'MAX': []};
   }
   
@@ -11612,8 +11630,12 @@ class ExperimentRun {
     // NOTE: All equations are also considered to be outcomes EXCEPT
     // methods (selectors starting with a colon).
     this.eq_list = [];
-    const eml = Object.keys(MODEL.equations_dataset.modifiers);
-    for(const em of eml) if(!em.startsWith(':')) this.eq_list.push(em);
+    // NOTE: For sensitivity analyses, equations are NOT outcomes, as all
+    // SA outcomes must be specified explicitly.
+    if(this.experiment !== SENSITIVITY_ANALYSIS.experiment) {
+      const eml = Object.keys(MODEL.equations_dataset.modifiers);
+      for(const em of eml) if(!em.startsWith(':')) this.eq_list.push(em);
+    }
     const
         cv = this.experiment.variables.length,
         oc = this.oc_list.length,
@@ -11918,7 +11940,7 @@ class Experiment {
     }
     return index;
   }
-
+  
   isDimensionSelector(s) {
     // Return TRUE if `s` is a dimension selector in this experiment.
     for(const dim of this.dimensions) if(dim.indexOf(s) >= 0) return true;
@@ -11928,6 +11950,15 @@ class Experiment {
     return false;
   }
   
+  get allDimensionSelectors() {
+    // Return list of all dimension selectors in this experiment.
+    const
+        dict = MODEL.dictOfAllSelectors,
+        dims = [];
+    for(let s in dict) if(this.isDimensionSelector(s)) dims.push(s);
+    return dims;
+  }
+
   get asXML() {
     let d = '';
     for(const dim of this.dimensions) {
@@ -12152,12 +12183,6 @@ class Experiment {
     }
   }
   
-  get allDimensionSelectors() {
-    const sl = Object.keys(MODEL.listOfAllSelectors);
-    // Add selectors of actor, iterator and settings dimensions.
-    return sl;
-  }
-
   orthogonalSelectors(c) {
     // Return TRUE iff the selectors in set `c` all are elements of
     // different experiment dimensions.

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

@@ -885,7 +885,7 @@ class ExpressionParser {
             // of commas, semicolons and spaces.
             x.r = run_spec.split(/[\,\;\/\s]+/g);
             // NOTE: The VMI instruction accepts `x.r` to be a list of selectors
-            // or an integer number.
+            // or an integer number. 
           } else {
             // If the specifier does start with a #, trim it...
             run_spec = run_spec.substring(1);
@@ -933,6 +933,20 @@ class ExpressionParser {
             x.x = MODEL.experiments[n];
           }
         }
+        // If run specifier `x.r` is a list, check whether all elements in the
+        // list are selectors in a dimension of experiment `x.x` (if specified).
+        // If experiment is unknown, check against the list of all selectors
+        // defined in the model.
+        if(Array.isArray(x.r)) {
+          const
+              sl = (x.x instanceof Experiment ? x.x.allDimensionSelectors :
+                  Object.keys(MODEL.dictOfAllSelectors)),
+              unknown = complement(x.r, sl);
+          if(unknown.length) {
+            msg = pluralS(unknown.length, 'unknown selector') + ': <tt>' +
+                unknown.join(' ') + '</tt>';
+          }
+        }
         // END of code for parsing an experiment result specifier.
         // Now proceed with parsing the variable name.
         
@@ -7269,12 +7283,12 @@ function VMI_push_run_result(x, args) {
               rr = r.results[rri],
               tsd = r.time_step_duration,
               // Get the delta-t multiplier: divide model time step duration
-              // by time step duration of the experiment run if they differ 
+              // by time step duration of the experiment run if they differ.
               dtm = (Math.abs(tsd - model_dt) < VM.NEAR_ZERO ? 1 : model_dt / tsd);
           let stat = rrspec.s;
-          // For outcome datasets without specific statistic, default to LAST
+          // For outcome datasets without specific statistic, default to LAST.
           if(!(stat || rr.x_variable)) stat = 'LAST';
-          // For a valid experiment variable, the default value is 0
+          // For a valid experiment variable, the default value is 0.
           v = 0;
           if(stat) {
             if(stat === 'LAST') {
@@ -7302,14 +7316,14 @@ function VMI_push_run_result(x, args) {
               console.log(trc.join(''));
             }
           } else {
-            // No statistic => return the vector for local time step
+            // No statistic => return the vector for local time step,
             // using here, too, the delta-time-modifier to adjust the offsets
             // for different time steps per experiment.
             const tot = twoOffsetTimeStep(x.step[x.step.length - 1],
                 args[1], args[2], args[3], args[4], dtm, x);
             // Scale the (midpoint) time step (at current model run time scale)
             // to the experiment run time scale and get the run result value.
-            // NOTE: the .m property specifies the time scaling method, and
+            // NOTE: The .m property specifies the time scaling method, and
             // the .p property whether the run result vector should be used as
             // a periodic time series.
             v = rr.valueAtModelTime(tot[0], model_dt, rrspec.m, rrspec.p);
@@ -7325,6 +7339,8 @@ function VMI_push_run_result(x, args) {
       }
     }
   }
+  // Truncate near-zero values.
+  if(Math.abs(v) < VM.SIG_DIF_FROM_ZERO) v = 0;
   x.push(v);
 }
 
@@ -8413,11 +8429,16 @@ function VMI_set_bounds(args) {
       VM.variables[vi - 1][0],'] t = ', VM.t, ' LB = ', VM.sig4Dig(l),
       ', UB = ', VM.sig4Dig(u), fixed].join(''), l, u, inf_val);
   } else if(u < l) {
-    // Warn that "impossible" bounds would have been set...
-    const vk = vbl.displayName;
-    if(!VM.bound_issues[vk]) VM.bound_issues[vk] = [];
-    VM.bound_issues[vk].push(VM.t);
-    // ... and set LB to UB, so that lowest value is bounding.
+    // Check the difference, as this may be negligible.
+    if(u - l < VM.SIG_DIF_FROM_ZERO) {
+      u = Math.round(u * 1e5) / 1e5;
+    } else {
+      // If substantial, warn that "impossible" bounds would have been set.
+      const vk = vbl.displayName;
+      if(!VM.bound_issues[vk]) VM.bound_issues[vk] = [];
+      VM.bound_issues[vk].push(VM.t);
+    }
+    // Set LB to UB, so that lowest value is bounding.
     l = u;
   }
   // NOTE: Since the VM vectors for lower bounds and upper bounds are