linny-r 1.6.2 → 1.6.4

package/package.json

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

package/static/index.html

@@ -1300,6 +1300,23 @@ NOTE: Unit symbols are case-sensitive, so BTU ≠ Btu">
     </div>
   </div>
 
+  <!-- BOUNDLINE POINT modal -->
+  <div id="boundline-point-modal" class="modal">
+    <div id="boundline-point-dlg" class="inp-dlg">
+      <div class="dlg-title">
+        Precise point coordinates
+        <img class="cancel-btn" src="images/cancel.png">
+        <img class="ok-btn" src="images/ok.png">
+      </div>
+      <div id="boundline-point-x-lbl">X =</div>
+      <input id="boundline-point-x" type="text" autocomplete="off">
+      <div id="boundline-point-x-percent">%</div>
+      <div id="boundline-point-y-lbl">Y =</div>
+      <input id="boundline-point-y" type="text" autocomplete="off">
+      <div id="boundline-point-y-percent">%</div>
+    </div>
+  </div>
+
   <!-- PROCESS properties dialog -->
   <div id="process-modal" class="modal">
     <div id="process-dlg" class="inp-dlg">
@@ -1765,6 +1782,8 @@ NOTE: * and ? will be interpreted as wildcards"
       <img id="eq-delete-btn" class="btn disab" src="images/delete.png"
            title="Delete selected equation">
     </div>
+    <img id="equation-outcome" class="not-selected" src="images/outcome.png"
+         title="Click to consider/ignore selected equation as experiment outcome">
     <div id="equation-scroll-area">
       <table id="equation-table">
       </table>
@@ -2011,6 +2030,22 @@ NOTE: * and ? will be interpreted as wildcards"
     </div>
   </div>
   
+  <!-- the ADD WILDCARD VARIABLES dialog allows selecting wildcard
+       variables from a list to be added to the current chart -->
+  <div id="add-wildcard-variables-modal" class="modal">
+    <div id="add-wildcard-variables-dlg" class="inp-dlg">
+      <div class="dlg-title">
+        Add wildcard matches
+        <img class="cancel-btn" src="images/cancel.png">
+        <img class="ok-btn" src="images/ok.png">
+      </div>
+      <div id="add-wildcard-variables-scroll-area">
+        <table id="add-wildcard-variables-table">
+        </table>
+      </div>
+    </div>
+  </div>
+  
   <!-- the RENAME CHART dialog prompts for the new title for a chart -->
   <div id="rename-chart-modal" class="modal">
     <div id="rename-chart-dlg" class="inp-dlg">

package/static/linny-r.css

@@ -1922,8 +1922,8 @@ div.menu-item:hover {
 #constraint-point {
   position: absolute;
   top: 393px;
-  left: 160px;
-  width: 75px;  
+  left: 100px;
+  width: 175px;  
   text-align: center;
 }
 
@@ -2009,6 +2009,50 @@ div.menu-item:hover {
   right: 0px;
 }
 
+/* the BOUNDLINE POINT DIALOG allows entering precise coordinates */
+#boundline-point-dlg {
+  width: 200px;
+  height: 67px;
+}
+
+#boundline-point-x-lbl {
+  position: absolute;
+  top: 25px;
+  left: 2px;
+}
+
+#boundline-point-x {
+  position: absolute;
+  top: 23px;
+  left: 24px;
+  width: 160px;
+}
+
+#boundline-point-x-percent {
+  position: absolute;
+  top: 25px;
+  left: 188px;
+}
+
+#boundline-point-y-lbl {
+  position: absolute;
+  top: 47px;
+  left: 2px;
+}
+
+#boundline-point-y {
+  position: absolute;
+  top: 45px;
+  left: 24px;
+  width: 160px;
+}
+
+#boundline-point-y-percent {
+  position: absolute;
+  top: 47px;
+  left: 188px;
+}
+
 /* NOTE: The following dialogs are not modal, but "stay-on-top",
          i.e., windows that remain open (until dismissed) and above
          the main window, and they are draggable and resizable.
@@ -2161,7 +2205,8 @@ div.io-box {
   cursor: pointer;
 }
 
-#dataset-outcome.not-selected {
+#dataset-outcome.not-selected,
+#equation-outcome.not-selected {
   filter: saturate(0) contrast(50%) brightness(170%);
 }
 
@@ -2273,10 +2318,12 @@ div.modif::before {
   margin-right: 2px;
 }
 
-div.outcome::before {
+div.outcome::before,
+span.outcome::before {
   content: ' \25C8';
   color: #b00080;
   margin-right: 1px;
+  font-style: normal;
 }
 
 div.array::before {
@@ -2449,6 +2496,15 @@ td.equation-expression {
   border-top: 1px solid Silver;
 }
 
+#equation-outcome {
+  position: absolute;
+  top: 25px;
+  right: 4px;
+  width: 16px;
+  height: 16px;
+  cursor: pointer;
+}
+
 /* NOTE: Rename equation modal must be above Edit variable modal */
 #rename-equation-modal {
   z-index: 110;
@@ -3098,6 +3154,31 @@ img.v-disab {
   width: calc(100% - 6px);
 }
 
+#add-wildcard-variables-dlg {
+  width: 250px;
+  min-height: 42px;
+  max-height: 50vh;
+}
+
+#add-wildcard-variables-scroll-area {
+  position: absolute;
+  top: 22px;
+  left: 2px;
+  width: calc(100% - 4px);
+  height: calc(100% - 26px);
+  overflow-y: auto;
+  border-top: 1px solid Silver;
+}
+
+#add-wildcard-variables-table {
+  width: 100%;
+  border-collapse: collapse;
+  line-height: 16px;
+  background-color: white;
+  border: 1px solid Silver;
+  border-top: none;
+}
+
 /* the SENSITIVITY DIALOG displays the sensitivity analysis */
 #sensitivity-dlg {
   display: none;

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

@@ -834,12 +834,19 @@ class ChartManager {
   }
   
   resetChartVectors() {
-    // Reset vectors of all charts
+    // Reset vectors of all charts.
     for(let i = 0; i < MODEL.charts.length; i++) {
       MODEL.charts[i].resetVectors();
     }
   }
 
+  promptForWildcardIndices(chart, dsm) {
+    // No GUI dialog, so add *all* vectors for wildcard dataset modifier
+    // `dsm` as variables to `chart`.
+    const indices = Object.keys(dsm.expression.wildcard_vectors);
+    chart.addWildcardVariables(dsm, indices);
+  }
+
   setRunsChart(show) {
     // Indicate whether the chart manager should display a run result chart.
     this.runs_chart = show;

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

@@ -131,7 +131,7 @@ class GUIChartManager extends ChartManager {
     document.getElementById('chart-narrow-btn').addEventListener(
         'click', () => CHART_MANAGER.stretchChart(-1));
 
-    // The Add variable modal
+    // The Add variable modal.
     this.add_variable_modal = new ModalDialog('add-variable');
     this.add_variable_modal.ok.addEventListener(
         'click', () => CHART_MANAGER.addVariable());
@@ -143,7 +143,7 @@ class GUIChartManager extends ChartManager {
     this.add_variable_modal.element('name').addEventListener(
         'change', () => X_EDIT.updateAttributeSelector('add-'));
 
-    // The Edit variable modal
+    // The Edit variable modal.
     this.variable_modal = new ModalDialog('variable');
     this.variable_modal.ok.addEventListener(
         'click', () => CHART_MANAGER.modifyVariable());
@@ -160,7 +160,7 @@ class GUIChartManager extends ChartManager {
         'mouseleave', () => CHART_MANAGER.hidePasteColor());
     document.getElementById('variable-color').addEventListener(
         'click', (event) => CHART_MANAGER.copyPasteColor(event));
-    // NOTE: uses the color picker developed by James Daniel
+    // NOTE: Uses the color picker developed by James Daniel.
     this.color_picker = new iro.ColorPicker("#color-picker", {
         width: 92,
         height: 92,
@@ -179,13 +179,20 @@ class GUIChartManager extends ChartManager {
             CHART_MANAGER.color_picker.color.hexString;
       });
 
-    // The Rename chart modal
+    // The Rename chart modal.
     this.rename_chart_modal = new ModalDialog('rename-chart');
     this.rename_chart_modal.ok.addEventListener(
         'click', () => CHART_MANAGER.renameChart());
     this.rename_chart_modal.cancel.addEventListener(
         'click', () => CHART_MANAGER.rename_chart_modal.hide());
     
+    // The Add wildcard variables modal.
+    this.add_wildcard_modal = new ModalDialog('add-wildcard-variables');
+    this.add_wildcard_modal.ok.addEventListener(
+        'click', () => CHART_MANAGER.addSelectedWildcardVariables());
+    this.add_wildcard_modal.cancel.addEventListener(
+        'click', () => CHART_MANAGER.add_wildcard_modal.hide());
+    
     // Do not display the time step until cursor moves over chart
     this.time_step.style.display = 'none';
     document.getElementById('table-only-buttons').style.display = 'none';
@@ -326,16 +333,25 @@ class GUIChartManager extends ChartManager {
   }
   
   updateSelector() {
-    // Adds one option to the selector for each chart defined for the model
-    // NOTE: add the "new chart" option if still absent
+    // Adds one option to the selector for each chart defined for the model.
+    // NOTE: Add the "new chart" option if it is not in the list.
     MODEL.addChart(this.new_chart_title);
     if(this.chart_index < 0) this.chart_index = 0;
     const ol = [];
     for(let i = 0; i < MODEL.charts.length; i++) {
-      ol.push('<option value="', i,
-        (i == this.chart_index ? '"selected="selected' : ''),
-        '">', MODEL.charts[i].title , '</option>');
+      const t = MODEL.charts[i].title;
+      ol.push(['<option value="', i,
+          (i == this.chart_index ? '" selected="selected' : ''),
+          '">', t , '</option>'].join(''));
     }
+    // Sort option list by chart title.
+    ol.sort((a, b) => {
+        const
+            re = /<option value="\d+"( selected="selected")?>(.+)<\/option>/,
+            ta = a.replace(re, '$2'),
+            tb = b.replace(re, '$2');
+        return UI.compareFullNames(ta, tb);
+      });
     this.chart_selector.innerHTML = ol.join('');
   }
   
@@ -379,6 +395,11 @@ class GUIChartManager extends ChartManager {
     } else {
       this.variable_index = -1;
     }
+    // Just in case variable index has not been adjusted after some
+    // variables have been deleted
+    if(this.variable_index >= c.variables.length) {
+      this.variable_index = -1;
+    }
     // Set the image of the sort type button.
     if(this.variable_index >= 0) {
       const
@@ -392,11 +413,6 @@ class GUIChartManager extends ChartManager {
         u_btn = 'chart-variable-up ',
         d_btn = 'chart-variable-down ',
         ed_btns = 'chart-edit-variable chart-sort-variable chart-delete-variable ';
-    // Just in case variable index has not been adjusted after some
-    // variables have been deleted
-    if(this.variable_index >= c.variables.length) {
-      this.variable_index = -1;
-    }
     if(this.variable_index < 0) {
       UI.disableButtons(ed_btns + u_btn + d_btn);
     } else {
@@ -713,15 +729,63 @@ class GUIChartManager extends ChartManager {
     }
   }
   
+  promptForWildcardIndices(chart, dsm) {
+    // Prompt modeler with list of vectors for wildcard dataset modifier
+    // `dsm` as variables to `chart`.
+    const
+        md = this.add_wildcard_modal,
+        indices = Object.keys(dsm.expression.wildcard_vectors);
+    // First hide the "Add variable" modal.
+    this.add_variable_modal.hide();
+    // Do not prompt for selection if there is only 1 match.
+    if(indices.length < 2) chart.addWildcardVariables(dsm, indices);
+    md.chart = chart;
+    md.modifier = dsm;
+    md.indices = indices;
+    const
+        tr = [],
+        dn = dsm.displayName,
+        tbl = md.element('table');
+    for(let i = 0; i < indices.length; i++) {
+      tr.push('<tr><td class="v-box"><div id="wcv-box-', indices[i],
+          '" class="box clear" onclick="UI.toggleBox(event);"></td>',
+          '<td class="vname">', dn.replace('??', indices[i]),
+          '</td></tr>');
+      tbl.innerHTML = tr.join('');
+    }
+    md.dialog.style.height = (22 + indices.length * 16) + 'px';
+    md.show();
+  }
+  
+  addSelectedWildcardVariables() {
+    // Let the chart add selected wildcard matches (if any) as chart
+    // variables.
+    const
+        md = this.add_wildcard_modal,
+        c = md.chart,
+        dsm = md.modifier,
+        il = md.indices,
+        indices = [];
+    if(c && dsm && il) {
+      for(let i = 0; i < il.length; i++) {
+        if(UI.boxChecked('wcv-box-'+ il[i])) indices.push(il[i]);
+      }
+    }
+    if(indices.length) c.addWildcardVariables(dsm, indices);
+    // Always hide the dialog.
+    md.hide();
+    this.updateDialog();
+  }
+  
   selectVariable(vi) {
-    // Select variable, and edit it when double-clicked
+    // Select variable, and edit it when double-clicked.
     const
         now = Date.now(),
         dt = now - this.last_time_selected;
     if(vi >= 0 && this.chart_index >= 0) {
       this.last_time_selected = now;
       if(vi === this.variable_index) {
-        // Consider click to be "double" if it occurred less than 300 ms ago
+        // Consider click to be "double" if it occurred less than 300 ms ago.
         if(dt < 300) {
           this.last_time_selected = 0;
           this.editVariable();

package/static/scripts/linny-r-gui-constraint-editor.js

@@ -56,7 +56,7 @@ class ConstraintEditor {
     this.container.addEventListener('mousemove',
         (event) => CONSTRAINT_EDITOR.mouseMove(event));
     this.container.addEventListener('mousedown',
-        () => CONSTRAINT_EDITOR.mouseDown());
+        () => CONSTRAINT_EDITOR.mouseDown(event));
     this.container.addEventListener('mouseup',
         () => CONSTRAINT_EDITOR.mouseUp());
     // NOTE: interpret leaving the area as a mouse-up so that dragging ceases
@@ -84,6 +84,11 @@ class ConstraintEditor {
     this.delete_bl_btn = document.getElementById('del-bl-btn');
     this.delete_bl_btn.addEventListener('click',
         () => CONSTRAINT_EDITOR.deleteBoundLine());
+    this.point_modal = new ModalDialog('boundline-point');
+    this.point_modal.ok.addEventListener(
+        'click', () => CONSTRAINT_EDITOR.setPointPosition());
+    this.point_modal.cancel.addEventListener(
+        'click', () => CONSTRAINT_EDITOR.point_modal.hide());
     // The chart is stored as an SVG string
     this.svg = '';
     // Scale, origin X and Y assume a 300x300 px square chart area
@@ -93,7 +98,7 @@ class ConstraintEditor {
     // 0 => silver, LE => orange/red, GE => cyan/blue, EQ => purple
     this.line_color = ['#a0a0a0', '#c04000', '#0040c0', '#9000a0'];
     // Use brighter shades if selected (darker for gray) 
-    this.selected_color = ['#808080', '#ff8040', '#00ffff', '#a800ff'];
+    this.selected_color = ['#808080', '#ff8040', '#00b0d0', '#a800ff'];
     // The selected bound line object (NULL => no line selected)
     this.selected = null;
     // Cursor position in chart coordinates (100 x 100 grid)
@@ -105,6 +110,7 @@ class ConstraintEditor {
     this.on_point = -1;
     this.dragged_point = -1;
     this.selected_point = -1;
+    this.last_time_clicked = 0;
     this.cursor = 'default';
     // Properties for tracking which constraint is being edited.
     this.edited_constraint = null;
@@ -118,6 +124,21 @@ class ConstraintEditor {
     // NOTE: All edits will be ignored unless the modeler clicks OK.
   }
   
+  get doubleClicked() {
+    const
+        now = Date.now(),
+        dt = now - this.last_time_clicked;
+    this.last_time_clicked = now;
+    if(this.on_point === this.selected_point) {
+      // Consider click to be "double" if it occurred less than 300 ms ago
+      if(dt < 300) {
+        this.last_time_clicked = 0;
+        return true;
+      }
+    }
+    return false;
+  }
+  
   mouseMove(e) {
     // The onMouseMove response of the constraint editor's graph area
     // Calculate cursor point without restricting it to 100x100 grid
@@ -132,16 +153,18 @@ class ConstraintEditor {
     this.pos_y = Math.min(100, Math.max(0, y));
     this.updateStatus();
     if(this.dragged_point >= 0) {
-      this.movePoint();
+      this.movePoint(this.pos_x, this.pos_y);
     } else {
       this.checkLines();
     }
   }
   
-  mouseDown() {
-    // The onMouseDown response of the constraint editor's graph area
+  mouseDown(e) {
+    // The onMouseDown response of the constraint editor's graph area.
     if(this.adding_point) {
       this.doAddPointToLine();
+    } else if((e.altKey || this.doubleClicked) && this.on_point >= 0) {
+      this.positionPoint();
     } else if(this.on_line) {
       this.selectBoundLine(this.on_line);
       this.dragged_point = this.on_point;
@@ -155,7 +178,7 @@ class ConstraintEditor {
   }
   
   mouseUp() {
-    // The onMouseUp response of the constraint editor's graph area
+    // The onMouseUp response of the constraint editor's graph area.
     this.dragged_point = -1;
     this.container.style.cursor = this.cursor;
     this.updateStatus();
@@ -179,36 +202,85 @@ class ConstraintEditor {
     this.container.style.cursor = this.cursor;
   }
   
-  arrowKey(k) {
+  arrowKey(e) {
+    // Move point by 1 grid unit (1/3 pixel), or more precisely when
+    // Shift, Ctrl and/or Alt are pressed. Shift resolution is 1/10,
+    // Ctrl resolution = 1/100, combined => 1/1000. Just Alt resolution
+    // is 1/10000, and with Shift + Ctrl becomes 1e-7.
     if(this.selected && this.selected_point >= 0) {
+      const custom = e.shiftKey || e.ctrlKey || e.altKey;
+      let divisor = 3;
+      if(e.shiftKey) {
+        divisor = 10;
+        if(e.ctrlKey) divisor = 1000;
+      } else if(e.ctrlKey) {
+        divisor = 100;
+      }
+      if(e.altKey) {
+        if(divisor === 3) {
+          divisor = 10000;
+        } else {
+          divisor *= 10000;
+        }
+      }
       const
+          k = e.keyCode,
           i = this.selected_point,
           pts = this.selected.points,
           li = pts.length - 1,
           p = pts[this.selected_point],
           minx = (i === 0 ? 0 : (i === li ? 100 : pts[i - 1][0])),
           maxx = (i === 0 ? 0 : (i === li ? 100 : pts[i + 1][0]));
+      let cx = false,
+          cy = false;
       if(k === 37) {
-        p[0] = Math.max(minx, p[0] - 1/3);
-      } else if (k === 38 && p[1] <= 299/3) {
-        p[1] += 1/3;
+        p[0] = Math.max(minx, p[0] - 1 / divisor);
+        cx = true;
+      } else if (k === 38 && p[1] <= 100 - 1 / divisor) {
+        p[1] += 1 / divisor;
+        cy = true;
       } else if (k === 39) {
-        p[0] = Math.min(maxx, p[0] + 1/3);
-      } else if (k === 40 && p[1] >= 1/3) {
-        p[1] -= 1/3;
+        p[0] = Math.min(maxx, p[0] + 1 / divisor);
+        cx = true;
+      } else if (k === 40 && p[1] >= 1 / divisor) {
+        p[1] -= 1 / divisor;
+        cy = true;
+      }
+      // NOTE: Compensate for small numerical errors
+      const cp = this.customPoint(p[0], p[1]);
+      if(cx) {
+        if(cp & 1 && custom) {
+          p[0] = Math.round(divisor * p[0]) / divisor;
+        } else {
+          p[0] = Math.round(3 * p[0]) / 3;
+        }
+      }
+      if(cy) {
+        if(cp & 2 && custom) {
+          p[1] = Math.round(divisor * p[1]) / divisor;
+        } else {
+          p[1] = Math.round(3 * p[1]) / 3;
+        }
       }
-      // NOTE: compensate for small numerical errors
-      p[0] = Math.round(3 * p[0]) / 3; 
-      p[1] = Math.round(3 * p[1]) / 3; 
       this.draw();
       this.updateEquation();
     }
   }
   
+  customPoint(x, y) {
+    // Return 0 if `x` and `y` both are "regular" points on the pixel
+    // grid. For these regular points, X and Y are multiples of 1/3,
+    // so 3*X and 3*Y should both be integer (apart from numerical
+    // imprecision). If only X is custom, return 1, if only Y is custom,
+    // return 2, and if both are custom, return 3.
+    return (Math.abs(3*x - Math.round(3*x)) > VM.NEAR_ZERO ? 1 : 0) +
+        (Math.abs(3*y - Math.round(3*y)) > VM.NEAR_ZERO ? 2 : 0);
+  }
+  
   point(x, y) {
-    // Returns a string denoting the point (x, y) in SVG notation, assuming
+    // Return a string denoting the point (x, y) in SVG notation, assuming
     // that x and y are mathematical coordinates (y-axis pointing UP) and
-    // scaled to the constraint editor chart area, cf. global constants
+    // scaled to the constraint editor chart area, cf. global constants.
     // defined for the constraint editor.
     return (this.oX + x * this.scale) + ',' + (this.oY - y * this.scale);
   }
@@ -396,10 +468,52 @@ class ConstraintEditor {
     }
     this.equation_div.innerHTML = segeq;
   }
+  
+  positionPoint() {
+    // Prompt modeler for precise point coordinates.
+    if(this.selected_point < 0) return;
+    const
+        md = this.point_modal,
+        pc = this.point_div.innerHTML.split(', ');
+    md.element('x').value = pc[0].substring(1);
+    md.element('y').value = pc[1].substring(0, pc[1].length - 1);
+    md.show('x');
+  }
+  
+  validPointCoordinate(c) {
+    // Return floating point for coordinate `c` (= 'x' or 'y') or FALSE
+    // if input is invalid.
+    const
+        md = this.point_modal,
+        e = md.element(c),
+        v = safeStrToFloat(e.value, false);
+    if(v === false || v < 0 || v > 100) {
+      UI.warn('Invalid boundline point coordinate');
+      e.select();
+      e.focus();
+      return false;
+    }
+    return v;
+  }
+
+  setPointPosition() {
+    // Check coordinates, and if valid update those of the selected point.
+    // Otherwise, warn user and select offending input field.
+    if(this.selected_point < 0) return;
+    const
+        x = this.validPointCoordinate('x'),
+        y = this.validPointCoordinate('y');
+    if(x !== false && y !== false) {
+      this.dragged_point = this.selected_point;
+      this.movePoint(x, y);
+      this.dragged_point = -1;
+      this.point_modal.hide();
+    }
+  }
 
-  movePoint() {
-    // Moves the dragged point of the selected bound line
-    // Use l as shorthand for the selected line
+  movePoint(x, y) {
+    // Move the dragged point of the selected bound line.
+    // Use `l` as shorthand for the selected line.
     const
         l = this.selected,
         pi = this.dragged_point,
@@ -411,8 +525,8 @@ class ConstraintEditor {
         py = p[1],
         minx = (pi === 0 ? 0 : (pi === lpi ? 100 : l.points[pi - 1][0])),
         maxx = (pi === 0 ? 0 : (pi === lpi ? 100 : l.points[pi + 1][0])),
-        newx = Math.min(maxx, Math.max(minx, this.pos_x)),
-        newy = Math.min(100, Math.max(0, this.pos_y));
+        newx = Math.min(maxx, Math.max(minx, x)),
+        newy = Math.min(100, Math.max(0, y));
     // No action needed unless point has been moved 
     if(newx !== px || newy !== py) {
       p[0] = newx;
@@ -424,17 +538,22 @@ class ConstraintEditor {
 
   updateStatus() {    
     // Displays cursor position as X and Y (in chart coordinates), and updates
-    // controls
+    // controls.
     this.pos_x_div.innerHTML = 'X = ' + this.pos_x.toPrecision(3);
     this.pos_y_div.innerHTML = 'Y = ' + this.pos_y.toPrecision(3);
+    this.point_div.innerHTML = '';
     const blbtns = 'add-point del-bl';
     if(this.selected) {
       if(this.selected_point >= 0) {
         const p = this.selected.points[this.selected_point];
-        this.point_div.innerHTML =
-            `(${p[0].toPrecision(3)}, ${p[1].toPrecision(3)})`;
-      } else {
-        this.point_div.innerHTML = '';
+        let px = p[0].toPrecision(3),
+            py = p[1].toPrecision(3),
+            cp = this.customPoint(p[0], p[1]);
+        if(cp & 1) px = p[0].toPrecision(10).replace(/[0]+$/, '')
+            .replace(/\.$/, '');
+        if(cp & 2) py = p[1].toPrecision(10).replace(/[0]+$/, '')
+            .replace(/\.$/, '');
+        this.point_div.innerHTML = `(${px}, ${py})`;
       }
       // Check whether selected point is an end point
       const ep = this.selected_point === 0 ||
@@ -591,13 +710,19 @@ class ConstraintEditor {
       width = 1.5;
       color = this.line_color[l.type];
     }
-    const cfs = `fill="${color}" stroke="${color}" stroke-width="${width}"`;
+    const
+        cfs = `fill="${color}" stroke="${color}" stroke-width="${width}"`,
+        icfs = 'fill="white" stroke="white" stroke-width="1"';
     for(let i = 0; i < l.points.length; i++) {
       const
           px = l.points[i][0],
           py = l.points[i][1];
       pp.push(this.point(px, py));
       dots += `<circle ${this.circleCenter(px, py)} r="3" ${cfs}></circle>`;
+      // Draw "custom points" with a white inner circle.
+      if(this.customPoint(px, py)) {
+        dots += `<circle ${this.circleCenter(px, py)} r="1.5" ${icfs}></circle>`;      
+      }
     }
     const cp = 'M' + pp.join('L');
     // For EQ bound lines, the line path is the contour; this will be

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

@@ -109,7 +109,7 @@ class GroupPropertiesDialog extends ModalDialog {
     // input fields this means `onkeydown` events.
     const fnc = (event) => {
         const id = event.target.id.split('-').shift();
-        // NOTE: add a short delay to permit checkboxes to update their
+        // NOTE: Add a short delay to permit checkboxes to update their
         // status first, before checking for change.
         setTimeout(() => UI.modals[id].highlightModifiedFields(), 100);
       };
@@ -819,8 +819,8 @@ class GUIController extends Controller {
 
     // Add all draggable stay-on-top dialogs as controller properties.
     
-    // Make checkboxes respond to click
-    // NOTE: checkbox-specific events must be bound AFTER this general setting
+    // Make checkboxes respond to click.
+    // NOTE: Checkbox-specific events must be bound AFTER this general setting.
     const
         cbs = document.getElementsByClassName('box'),
         cbf = (event) => UI.toggleBox(event);
@@ -2154,7 +2154,7 @@ class GUIController extends Controller {
       if(topmod && topmod.id === 'constraint-modal') {
         if([37, 38, 39, 40].indexOf(e.keyCode) >= 0) {
           e.preventDefault();
-          CONSTRAINT_EDITOR.arrowKey(e.keyCode);
+          CONSTRAINT_EDITOR.arrowKey(e);
           return;
         }
       }

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

@@ -54,6 +54,9 @@ class EquationManager {
         'click', () => EQUATION_MANAGER.editEquation());
     document.getElementById('eq-delete-btn').addEventListener(
         'click', () => EQUATION_MANAGER.deleteEquation());
+    this.outcome_btn = document.getElementById('equation-outcome');
+    this.outcome_btn.addEventListener(
+        'click', () => EQUATION_MANAGER.toggleOutcome());
     
     // Create modal dialogs
     this.new_modal = new ModalDialog('new-equation');
@@ -134,6 +137,11 @@ class EquationManager {
         ml = [],
         msl = ed.selectorList,
         sm = this.selected_modifier;
+    if(sm && sm.outcome_equation) {
+      this.outcome_btn.classList.remove('not-selected'); 
+    } else {
+      this.outcome_btn.classList.add('not-selected'); 
+    }
     let smid = 'eqmtr';
     for(let i = 0; i < msl.length; i++) {
       const
@@ -155,6 +163,7 @@ class EquationManager {
           (m.expression.noMethodObject ? ' no-object' : ''),
           (m.expression.isStatic ? '' : ' it'), issue,
           (wild ? ' wildcard' : ''), clk, ', false);"', mover, '>',
+          (m.outcome_equation ? '<span class="outcome"></span>' : ''),
           (wild ? wildcardFormat(m.selector) : m.selector),
           '</td><td class="equation-expression', issue,
           (issue ? '"title="' +
@@ -201,6 +210,16 @@ class EquationManager {
     this.updateDialog();
   }
   
+  toggleOutcome() {
+    const m = this.selected_modifier;
+    // NOTE: Methods cannot be outcomes.
+    if(m && !m.selector.startsWith(':')) {
+      m.outcome_equation = !m.outcome_equation;
+      this.updateDialog();
+      if(!UI.hidden('experiment-dlg')) EXPERIMENT_MANAGER.updateDialog();
+    }
+  }
+  
   promptForEquation(add=false) {
     this.add_to_chart = add;
     this.new_modal.element('name').value = '';

package/static/scripts/linny-r-gui-expression-editor.js

@@ -377,7 +377,7 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
       }
       va.innerHTML = options.join('');
       // NOTE: Chart Manager variable dialog is 60px wider
-      va.style.width = (prefix ? 'calc(100% - 82px)' : 'calc(100% - 142px)');
+      va.style.width = (prefix ? 'calc(100% - 84px)' : 'calc(100% - 142px)');
       return;
     }
     // Add "empty" as first and initial option, as it denotes "use default"

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

@@ -280,6 +280,7 @@ class GUIMonitor {
 
   hideCallStack() {
     document.getElementById('call-stack-modal').style.display = 'none';
+    this.call_stack_shown = false;    
   }
 
   logMessage(block, msg) {

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

@@ -170,11 +170,11 @@ class LinnyRModel {
         olist.push(ds.displayName);
       }
     }
-    // ALL equation results are stored, so add all equation selectors...
+    // Also add all outcome equation selectors.
     const dsm = this.equations_dataset.modifiers;
-    // ... except selectors starting with a colon (methods).
+    // Exclude selectors starting with a colon (methods) -- just in case.
     for(let k in dsm) if(dsm.hasOwnProperty(k) && !k.startsWith(':')) {
-      olist.push(dsm[k].selector);
+      if(dsm[k].outcome_equation) olist.push(dsm[k].selector);
     }
     return olist;
   }
@@ -1593,8 +1593,8 @@ class LinnyRModel {
             nbp = note.nearby_pos;
         if(nbp) {
           // Adjust (x, y) so as to retain the relative position.
-          note.x += nbp.node.x - npb.oldx;
-          note.y += nbp.node.y - npb.oldy;
+          note.x += nbp.node.x - nbp.oldx;
+          note.y += nbp.node.y - nbp.oldy;
           note.nearby_pos = null;
         }
       }
@@ -3155,8 +3155,8 @@ class LinnyRModel {
           const
               dm = ds.modifiers[ms],
               n = dm.displayName;
-          // Do not add if already in the list.
-          if(names.indexOf(n) < 0) {
+          // Do not add if already in the list, or equation is not outcome.
+          if(names.indexOf(n) < 0 && (!eq || dm.outcome_equation)) {
             // Here, too, NULL can be used as "owner chart". 
             const cv = new ChartVariable(null);
             // NOTE: For equations, the object is the dataset modifier.
@@ -3169,10 +3169,17 @@ class LinnyRModel {
     // Sort variables by their name.
     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();
+    const
+        c = new Chart(),
+        wcdm = [];
     for(let i = 0; i < vbls.length; i++) {
       const v = vbls[i];
-      c.addVariable(v.object.displayName, v.attribute);
+      // NOTE: Prevent adding wildcard dataset modifiers more than once.
+      if(wcdm.indexOf(v.object) < 0) {
+        if(v.object instanceof DatasetModifier &&
+            v.object.selector.indexOf('??') >= 0) wcdm.push(v.object);
+        c.addVariable(v.object.displayName, v.attribute);
+      }
     }
     // NOTE: Call `draw` with FALSE to prevent display in the chart manager.
     c.draw(false);
@@ -8477,7 +8484,7 @@ class DatasetModifier {
     this.dataset = dataset;
     this.selector = selector;
     this.expression = new Expression(dataset, selector, '');
-    this.expression_cache = {};
+    this.outcome_equation = false;
   }
   
   get type() {
@@ -8507,12 +8514,21 @@ class DatasetModifier {
     // NOTE: For some reason, selector may become empty string, so prevent
     // saving such unidentified modifiers.
     if(this.selector.trim().length === 0) return '';
-    return ['<modifier><selector>', xmlEncoded(this.selector),
+    const oe = (this.outcome_equation ? ' outcome="1"' : '');
+    return ['<modifier', oe, '><selector>', xmlEncoded(this.selector),
       '</selector><expression>', xmlEncoded(this.expression.text),
       '</expression></modifier>'].join('');
   }
 
   initFromXML(node) {
+    // NOTE: Up to version 1.6.2, all equations were considered as
+    // outcomes. To maintain upward compatibility, check for the model
+    // version number.
+    if(earlierVersion(MODEL.version, '1.6.3')) {
+      this.outcome_equation = true;
+    } else {
+      this.outcome_equation = nodeParameterValue(node, 'outcome') === '1';
+    }
     this.expression.text = xmlDecoded(nodeContentByTag(node, 'expression'));
     if(IO_CONTEXT) {
       // Contextualize the included expression.
@@ -8824,12 +8840,19 @@ class Dataset {
       this.max = Math.max(this.max, this.data[i]);
       sum += this.data[i];
     }
-    this.mean = sum / this.data.length;
-    let sumsq = 0;
-    for(let i = 0; i < this.data.length; i++) {
-      sumsq += Math.pow(this.data[i] -  this.mean, 2);
+    // NOTE: Avoid small differences due to numerical imprecision.
+    if(this.max - this.min < VM.NEAR_ZERO) {
+      this.max = this.min;
+      this.mean = this.min;
+      this.standard_deviation = 0;
+    } else {
+      this.mean = sum / this.data.length;
+      let sumsq = 0;
+      for(let i = 0; i < this.data.length; i++) {
+        sumsq += Math.pow(this.data[i] -  this.mean, 2);
+      }
+      this.standard_deviation = Math.sqrt(sumsq / this.data.length);
     }
-    this.standard_deviation = Math.sqrt(sumsq / this.data.length);
   }
   
   get statisticsAsString() {
@@ -9081,7 +9104,6 @@ class Dataset {
     for(let m in this.modifiers) if(this.modifiers.hasOwnProperty(m)) {
       // NOTE: "empty" expressions for modifiers default to dataset default.
       this.modifiers[m].expression.reset(this.defaultValue);
-      this.modifiers[m].expression_cache = {};
     }
   }
 
@@ -9141,6 +9163,8 @@ class ChartVariable {
     this.non_zero_tally = 0;
     this.exceptions = 0;
     this.bin_tallies = [];
+    // The actual wildcard index is set for each variable that is added
+    // during this "expansion".
     this.wildcard_index = false;
   }
   
@@ -9210,6 +9234,8 @@ class ChartVariable {
     }
     const xml = ['<chart-variable', (this.stacked ? ' stacked="1"' : ''),
         (this.visible ? ' visible="1"' : ''),
+        (this.wildcard_index !== false ?
+            ` wildcard-index="${this.wildcard_index}"` : ''),
         ` sorted="${this.sorted}"`,
         '><object-id>', xmlEncoded(id),
         '</object-id><attribute>', this.attribute,
@@ -9255,6 +9281,9 @@ class ChartVariable {
       UI.warn(`No chart variable entity with ID "${id}"`);
       return false;
     }
+    // For wildcard variables, a subset of wildcard indices may be specified.
+    const wci = nodeParameterValue(node, 'wildcard-index');
+    this.wildcard_index = (wci ? parseInt(wci) : false);
     this.setProperties(
         obj,
         nodeContentByTag(node, 'attribute'),
@@ -9327,7 +9356,7 @@ class ChartVariable {
     for(let t = 0; t <= t_end; t++) {
       // Get the result, store it, and incorporate it in statistics.
       if(!av) {
-        // Undefined attribute => zero (no error)
+        // Undefined attribute => zero (no error).
         v = 0;
       } else if(Array.isArray(av)) {
         // Attribute value is a vector.
@@ -9339,19 +9368,19 @@ class ChartVariable {
         // this index as context number.
         v = av.result(t, this.wildcard_index);
       } else {
-        // Attribute value must be a number
+        // Attribute value must be a number.
         v = av;
       }
-      // Map undefined values and all errors to 0
+      // Map undefined values and all errors to 0.
       if(v < VM.MINUS_INFINITY || v > VM.PLUS_INFINITY) {
-        // Do not include values for t = 0 in statistics
+        // Do not include values for t = 0 in statistics.
         if(t > 0) this.exceptions++;
         v = 0;
       }
-      // Scale the value unless run result (these are already scaled!)
+      // Scale the value unless run result (these are already scaled!).
       if(!rr) v *= this.scale_factor;
       this.vector.push(v);
-      // Do not include values for t = 0 in statistics
+      // Do not include values for t = 0 in statistics.
       if(t > 0) {
         if(Math.abs(v) > VM.NEAR_ZERO) {
           this.sum += v;
@@ -9361,17 +9390,24 @@ class ChartVariable {
         this.maximum = Math.max(this.maximum, v);
       }
     }
-    // Compute the mean
-    this.mean = this.sum / t_end;
-    // Compute the variance for t=1, ..., N
-    let sumsq = 0;
-    for(let t = 1; t <= t_end; t++) {
-      v = this.vector[t];
-      // Here, too, ignore exceptional values, and use 0 instead
-      if(v < VM.MINUS_INFINITY || v > VM.PLUS_INFINITY) v = 0;
-      sumsq += Math.pow(v - this.mean, 2);
+    if(this.maximum - this.minimum < VM.NEAR_ZERO) {
+      // Ignore minute differences.
+      this.maximum = this.minimum;
+      this.mean = this.minimum;
+      this.variance = 0;
+    } else {
+      // Compute the mean.
+      this.mean = this.sum / t_end;
+      // Compute the variance for t=1, ..., N.
+      let sumsq = 0;
+      for(let t = 1; t <= t_end; t++) {
+        v = this.vector[t];
+        // Here, too, ignore exceptional values, and use 0 instead.
+        if(v < VM.MINUS_INFINITY || v > VM.PLUS_INFINITY) v = 0;
+        sumsq += Math.pow(v - this.mean, 2);
+      }
+      this.variance = sumsq / t_end;
     }
-    this.variance = sumsq / t_end;
   }
   
   tallyVector() {
@@ -9540,16 +9576,16 @@ class Chart {
   }
 
   addVariable(n, a) {
-    // Adds variable [entity name `n`|attribute `a`] to the chart unless it
-    // is already in the variable list.
+    // 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;
-    // Adapt display name for special cases
+    // Adapt display name for special cases.
     if(n === UI.EQUATIONS_DATASET_NAME) {
-      // For equations only the attribute (modifier selector)
+      // For equations only the attribute (modifier selector).
       dn = a;
       n = a;
     } else if(!a) {
-      // If no attribute specified (=> dataset) only the entity name
+      // If no attribute specified (=> dataset) only the entity name.
       dn = n;
     }
     let vi = this.variableIndexByName(dn);
@@ -9564,17 +9600,14 @@ class Chart {
     // No equation and no attribute specified? Then assume default.
     if(!eq && a === '') a = obj.defaultAttribute;
     if(eq && (n.indexOf('??') >= 0 || obj.expression.isMethod)) {
-      // Special case: for wildcard equations and methods, add dummy
-      // variables for each vector in the wildcard vector set of the
-      // expression.
-      const
-          clr = this.nextAvailableDefaultColor,
-          indices = Object.keys(obj.expression.wildcard_vectors);
-      for(let i = 0; i < indices.length; i++) {
-        const v = new ChartVariable(this);
-        v.setProperties(obj, dn, false, clr);
-        v.wildcard_index = parseInt(indices[i]);
-        this.variables.push(v);
+      // Special case: for wildcard equations and methods, prompt the
+      // modeler which wildcard possibilities to add UNLESS this is an
+      // untitled "dummy" chart used to report outcomes.
+      if(this.title) {
+        CHART_MANAGER.promptForWildcardIndices(this, obj);
+      } else {
+        this.addWildcardVariables(obj,
+            Object.keys(obj.expression.wildcard_vectors));
       }
     } else {
       const v = new ChartVariable(this);
@@ -9583,6 +9616,19 @@ class Chart {
     }
     return this.variables.length - 1;
   }
+  
+  addWildcardVariables(dsm, indices) {
+    // For dataset modifier `dsm`, add dummy variables for those vectors
+    // in the wildcard vector set of the expression that are indicated
+    // by the list `indices`.
+    const dn = dsm.displayName;
+    for(let i = 0; i < indices.length; i++) {
+      const v = new ChartVariable(this);
+      v.setProperties(dsm,  dn, false, this.nextAvailableDefaultColor);
+      v.wildcard_index = parseInt(indices[i]);
+      this.variables.push(v);
+    }    
+  }
 
   addSVG(lines) {
     // Appends a string or an array of strings to the SVG
@@ -10401,7 +10447,7 @@ class Chart {
     if(CHART_MANAGER.drawing_chart) {
       return '(chart statistics not calculated yet)';
     }
-    // NOTE: unlike statistics, series data is output in columns
+    // NOTE: Unlike statistics, series data is output in columns.
     const data = [], vbl = [], line = ['t'];
     // First line: column labels (variable names, but time step in first column)
     for(let i = 0; i < this.variables.length; i++) {

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

@@ -394,11 +394,12 @@ class Expression {
       vmi[0](this, vmi[1]);
       this.program_counter++;
     }
-    // Stack should now have length 1.
+    // Stack should now have length 1. If not, report error unless the
+    // length is due to some other error.
     if(this.stack.length > 1) {
-      v[t] = VM.OVERFLOW;
+      if(v[t] > VM.ERROR) v[t] = VM.OVERFLOW;
     } else if(this.stack.length < 1) {
-      v[t] = VM.UNDERFLOW;
+      if(v[t] > VM.ERROR) v[t] = VM.UNDERFLOW;
     } else {
       v[t] = this.stack.pop();
     }
@@ -2476,7 +2477,7 @@ class VirtualMachine {
     // Return number `n` formatted so as to show 2-3 significant digits
     // NOTE: as `n` should be a number, a warning sign will typically
     // indicate a bug in the software.
-    if(n === undefined) return '\u26A0'; // Warning sign
+    if(n === undefined || isNaN(n)) return '\u26A0'; // Warning sign
     const sv = this.specialValue(n);
     // If `n` has a special value, return its representation.
     if(sv[0]) return sv[1];
@@ -2972,10 +2973,10 @@ class VirtualMachine {
     if(vcnt == 0) return '(no variables)';
     let l = '';
     for(let i = 0; i < vcnt; i++) {
-      const obj = this.variables[i][1];
-      let v = 'X' + (i+1).toString().padStart(z, '0');
-      v += '     '.slice(v.length) + obj.displayName;
-      const p = (obj instanceof Process && obj.pace > 1 ? ' 1/' + obj.pace : '');
+      const
+          obj = this.variables[i][1],
+          v = 'X' + (i+1).toString().padStart(z, '0') + ' ' + obj.displayName,
+          p = (obj instanceof Process && obj.pace > 1 ? ' 1/' + obj.pace : '');
       l += v + ' [' + this.variables[i][0] + p + ']\n';
     }
     if(this.chunk_variables.length > 0) {
@@ -6953,7 +6954,7 @@ function VMI_log(x) {
   if(d !== false) {
     if(DEBUGGING) console.log('LOG (' + d.join(', ') + ')');
     try {
-      d = Math.exp(Math.log(d[1]) / Math.log(d[0]));
+      d = Math.log(d[1]) / Math.log(d[0]);
     } catch(err) {
       d = VM.BAD_CALC;
     }
@@ -8092,9 +8093,9 @@ const
       '%', '^', 'log', '|'],
   DYADIC_CODES = [
       VMI_concat, VMI_if_then, VMI_if_else, VMI_or, VMI_and,
-      VMI_eq, VMI_ne, VMI_ne,
-      VMI_gt, VMI_lt, VMI_ge, VMI_le, VMI_add, VMI_sub, VMI_mul, VMI_div,
-      VMI_mod, VMI_power, VMI_log, VMI_replace_undefined],
+      VMI_eq, VMI_ne, VMI_ne, VMI_gt, VMI_lt, VMI_ge, VMI_le,
+      VMI_add, VMI_sub, VMI_mul, VMI_div, VMI_mod,
+      VMI_power, VMI_log, VMI_replace_undefined],
 
   // Compiler checks for random codes as they make an expression dynamic
   RANDOM_CODES = [VMI_binomial, VMI_exponential, VMI_normal, VMI_poisson,