linny-r 2.1.0 → 2.1.2

package/package.json

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

package/static/index.html

@@ -2352,10 +2352,13 @@ NOTE: * and ? will be interpreted as wildcards"
                title="Download chart as bitmap image (PNG)
 ✎ Shift-click to download chart as Scalable Vector Graphics (SVG)">
           <img id="chart-widen-btn" class="btn enab" src="images/stretch.png"
-               title="Widen chart" style="margin-left: 24px">
+               title="Widen chart" style="margin-left: 12px">
           <img id="chart-narrow-btn" class="btn enab" src="images/compress.png"
                title="Narrow chart">
         </div>
+        <div id="chart-prefix-div">
+          <select id="chart-prefix"></select>
+        </div>
       </div>
       <div id="chart-time-div">
         <div id="chart-time-step"></div>

package/static/linny-r.css

@@ -3029,6 +3029,14 @@ td.equation-expression-multi {
   cursor: pointer;
 }
 
+#equation-info {
+  position: absolute;
+  bottom: 2px;
+  left: 2px;
+  color: Gray;
+  font-style: italic;
+}
+
 /* NOTE: Rename equation modal must be above Edit variable modal */
 #rename-equation-modal {
   z-index: 110;
@@ -3559,6 +3567,16 @@ img.v-disab {
   margin-left: 4px;
 }
 
+#chart-prefix-div {
+  display: inline-block;
+  margin-left: 12px;
+}
+
+#chart-prefix {
+  font-size: 9px !important;
+  max-width: 80px;
+}
+
 #chart-time-div {
   position: absolute;
   bottom: 0px;

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

@@ -112,6 +112,10 @@ class GUIChartManager extends ChartManager {
     this.svg_container.addEventListener(
         'mouseleave', (event) => CHART_MANAGER.updateTimeStep(event, false));
     this.time_step = document.getElementById('chart-time-step');
+    this.prefix_div = document.getElementById('chart-prefix-div');
+    this.prefix_selector = document.getElementById('chart-prefix');
+    this.prefix_selector.addEventListener(
+        'change', () => CHART_MANAGER.selectPrefix());
     document.getElementById('chart-toggle-chevron').addEventListener(
         'click', () => CHART_MANAGER.toggleControlPanel());
     document.getElementById('chart-stats-btn').addEventListener(
@@ -354,8 +358,9 @@ class GUIChartManager extends ChartManager {
   }
   
   updateDialog() {
-    // Refreshe all dialog fields to display actual MODEL chart properties.
+    // Refresh all dialog fields to display actual MODEL chart properties.
     this.updateSelector();
+    this.prefix_div.style.display = 'none';
     let c = null;
     if(this.chart_index >= 0) {
       c = MODEL.charts[this.chart_index];
@@ -390,6 +395,19 @@ class GUIChartManager extends ChartManager {
           '</td></tr>'].join(''));
       }
       this.variables_table.innerHTML = ol.join('');
+      const
+          cp = c.prefix,
+          pp = c.possiblePrefixes,
+          html = [];
+      if(pp.length) {
+        for(const p of pp) {
+          const cap = capitalized(p);
+          html.push('<option value="', cap, '"', (cap === cp ? ' selected' : ''), '>',
+              cap, '</option>');
+        }
+        this.prefix_div.style.display = 'inline-block';
+      }
+      this.prefix_selector.innerHTML = html.join('');
     } else {
       this.variable_index = -1;
     }
@@ -439,6 +457,15 @@ class GUIChartManager extends ChartManager {
     this.stretchChart(0);
   }
   
+  selectPrefix() {
+    // Set the preferred prefix for this chart. This will override the
+    // title prefix (if any).
+    if(this.chart_index >= 0) {
+      MODEL.charts[this.chart_index].preferred_prefix = this.prefix_selector.value;
+    }
+    this.updateDialog();
+  }
+  
   showSortingMenu() {
     // Show the pane with sort type buttons only if variable is selected.
     this.sorting_menu.style.display =
@@ -594,27 +621,31 @@ class GUIChartManager extends ChartManager {
   
   cloneChart() {
     // Create a new chart that is identical to the current one.
-    if(this.chart_index >= 0) {
-      let c = MODEL.charts[this.chart_index],
-          nt = c.title + '-copy';
-      while(MODEL.indexOfChart(nt) >= 0) {
-        nt += '-copy';
-      }
-      const nc = MODEL.addChart(nt);
-      // Copy properties of `c` to `nc`;
-      nc.histogram = c.histogram;
-      nc.bins = c.bins;
-      nc.show_title = c.show_title;
-      nc.legend_position = c.legend_position;
-      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);
-        nc.variables.push(nv);
-      }
-      this.chart_index = MODEL.indexOfChart(nc.title);
-      this.updateDialog();
-    }    
+    if(this.chart_index < 0) return;
+    const
+        c = MODEL.charts[this.chart_index],
+        pp = c.possiblePrefixes;
+    let nt = c.title;
+    if(pp) {
+      // Remove title prefix (if any), and add selected one.
+      nt = c.prefix + UI.PREFIXER + nt.split(UI.PREFIXER).pop();
+    }
+    // If title is not new, keep adding a suffix until it is new.
+    while(MODEL.indexOfChart(nt) >= 0) nt += '-copy';
+    const nc = MODEL.addChart(nt);
+    // Copy properties of `c` to `nc`;
+    nc.histogram = c.histogram;
+    nc.bins = c.bins;
+    nc.show_title = c.show_title;
+    nc.legend_position = c.legend_position;
+    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);
+      nc.variables.push(nv);
+    }
+    this.chart_index = MODEL.indexOfChart(nc.title);
+    this.updateDialog();
   }
 
   toggleRunResults() {
@@ -736,9 +767,6 @@ class GUIChartManager extends ChartManager {
     if(indices.length < 2) {
       if(indices.length) {
         chart.addWildcardVariables(dsm, indices);
-      } else if(dsm.selector.startsWith(':')) {
-        UI.notify('Plotting methods is work-in-progress!');
-        console.log('HERE dsm', dsm, 'expr', dsm.expression.text, 'indices', indices);
       } else {
         UI.notify(`Variable "${dsm.displayName}" cannot be plotted`);
       }

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

@@ -726,7 +726,7 @@ class GUIController extends Controller {
     this.dbl_clicked_node = null;
     this.target_cluster = null;
     this.constraint_under_cursor = null;
-    this.last_up_down_without_move = Date.now();
+    this.last_up_down_without_move = {up: 0, down: 0};
     // Keyboard shortcuts: Ctrl-x associates with menu button ID.
     this.shortcuts = {
       'A': 'actors',
@@ -1672,15 +1672,15 @@ class GUIController extends Controller {
     }
   }
 
-  get doubleClicked() {
-    // Return TRUE when a "double-click" occurred
+  doubleClicked(ud) {
+    // Return TRUE when a "double-click" occurred.
     const
         now = Date.now(),
-        dt = now - this.last_up_down_without_move;
-    this.last_up_down_without_move = now;
+        dt = now - this.last_up_down_without_move[ud];
+    this.last_up_down_without_move[ud] = now;
     // Consider click to be "double" if it occurred less than 300 ms ago
     if(dt < 300) {
-      this.last_up_down_without_move = 0;
+      this.last_up_down_without_move[ud] = 0;
       return true;
     }
     return false;
@@ -2230,7 +2230,9 @@ class GUIController extends Controller {
       }
       // When dragging a selection over a cluster, change cursor to "cell" to
       // indicate that selected process(es) will be moved into the cluster.
-      if(this.dragged_node) {
+      // NOTE: Do not do this when the dragged selection is just a single note!
+      if(this.dragged_node &&
+          !(this.dragged_node instanceof Note && MODEL.selection.length < 2)) {
         // NOTE: Cursor will always be over the dragged node, so do not indicate
         // "drop here?" unless dragged over a different cluster.
         if(this.on_cluster &&  this.on_cluster !== this.dragged_node) {
@@ -2312,14 +2314,8 @@ class GUIController extends Controller {
       return;
     } // END IF Ctrl
   
-    // Clear selection unless SHIFT pressed or mouseDown while hovering
-    // over a SELECTED node or link.
-    if(!(e.shiftKey ||
-        (this.on_node && MODEL.selection.indexOf(this.on_node) >= 0) ||
-        (this.on_cluster && MODEL.selection.indexOf(this.on_cluster) >= 0) ||
-        (this.on_note && MODEL.selection.indexOf(this.on_note) >= 0) ||
-        (this.on_link && MODEL.selection.indexOf(this.on_link) >= 0) ||
-        (this.on_constraint && MODEL.selection.indexOf(this.on_constraint) >= 0))) {
+    // Clear selection unless SHIFT pressed or double-clicking.
+    if(!(this.doubleClicked('down') || e.shiftKey)) {
       MODEL.clearSelection();
       UI.drawDiagram(MODEL);
     }
@@ -2538,7 +2534,7 @@ class GUIController extends Controller {
           absdx = Math.abs(this.net_move_x),
           absdy = Math.abs(this.net_move_y),
           sigmv = (MODEL.align_to_grid ? MODEL.grid_pixels / 4 : 2.5);
-      if(this.doubleClicked) {
+      if(this.doubleClicked('up')) {
         // Ignore insignificant move.
         if(absdx < sigmv && absdy < sigmv) {
           // Undo the move and remove the action from the UNDO-stack.
@@ -2584,13 +2580,15 @@ class GUIController extends Controller {
         this.paper.container.style.cursor = 'pointer';
         // NOTE: Cursor will always be over the selected cluster (while dragging).
         if(this.on_cluster && !this.on_cluster.selected) {
-          UNDO_STACK.push('drop', this.on_cluster);
-          MODEL.dropSelectionIntoCluster(this.on_cluster);
-          this.on_node = null;
-          this.on_note = null;
-          this.target_cluster = null;
-          // Redraw cluster to erase its orange "target corona".
-          UI.paper.drawCluster(this.on_cluster);
+          if(!(this.dragged_node instanceof Note && MODEL.selection.length < 2)) {
+            UNDO_STACK.push('drop', this.on_cluster);
+            MODEL.dropSelectionIntoCluster(this.on_cluster);
+            // Redraw cluster to erase its orange "target corona".
+            UI.paper.drawCluster(this.on_cluster);
+            this.on_node = null;
+            this.on_note = null;
+            this.target_cluster = null;
+          }
         }
         // Only now align to grid.
         MODEL.alignToGrid();
@@ -2599,11 +2597,11 @@ class GUIController extends Controller {
   
     // Then check whether the user is clicking on a link.
     } else if(this.on_link) {
-      if(this.doubleClicked) {
+      if(this.doubleClicked('up')) {
         this.showLinkPropertiesDialog(this.on_link);
       }
     } else if(this.on_constraint) {
-      if(this.doubleClicked) {
+      if(this.doubleClicked('up')) {
         this.showConstraintPropertiesDialog(this.on_constraint);
       }
     }
@@ -3713,6 +3711,14 @@ class GUIController extends Controller {
             
     // AUXILIARY FUNCTIONS
     
+    function namedObjects() {
+      // Return TRUE iff XML contains named objects.
+      for(const cn of entities_node.childNodes) {
+        if(cn.nodeName !== 'note') return true;
+      }
+      return false;
+    }
+    
     function fullName(node) {
       // Return full entity name inferred from XML node data.
       if(node.nodeName === 'from-to' || node.nodeName === 'selc') {
@@ -3848,7 +3854,18 @@ class GUIController extends Controller {
           fn = fullName(node),
           mn = mappedName(fn);
       let obj;
-      if(et === 'process' && !MODEL.processByID(UI.nameToID(mn))) {
+      if(et === 'note') {
+        // Ensure that copy had new time stamp.
+        let cn = childNodeByTag(node, 'timestamp').firstChild;
+        cn.nodeValue = new Date().getTime().toString();
+        cn = childNodeByTag(node, 'x-coord').firstChild;
+        // Move note a bit right and down.
+        cn.nodeValue = (safeStrToInt(cn.nodeValue, 0) + 12).toString();
+        cn = childNodeByTag(node, 'y-coord').firstChild;
+        cn.nodeValue = (safeStrToInt(cn.nodeValue, 0) + 12).toString();
+        obj = MODEL.addNote(node);
+        if(obj) new_entities.push(obj);
+      } else if(et === 'process' && !MODEL.processByID(UI.nameToID(mn))) {
         const
            na = nameAndActor(mn),
            new_actor = !MODEL.actorByID(UI.nameToID(na[1]));
@@ -3913,7 +3930,8 @@ class GUIController extends Controller {
     // Prompt for mapping when pasting to the same model and cluster.
     if(parseInt(mts) === MODEL.time_created.getTime() &&
         ca === fca && mapping.from_prefix === mapping.to_prefix &&
-        !(mapping.prefix || mapping.actor || mapping.increment)) {
+        !(mapping.prefix || mapping.actor || mapping.increment) &&
+        namedObjects()) {
       // Prompt for names of selected cluster nodes.
       if(selc_node.childNodes.length && !mapping.prefix) {
         mapping.top_clusters = {};

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

@@ -209,8 +209,9 @@ class GUIMonitor {
         `ERROR at t=${t}: ` + VM.errorMessage(err);
     for(const x of VM.call_stack) {
       // For equations, only show the attribute.
-      const ons = (x.object === MODEL.equations_dataset ? '' :
-          x.object.displayName + '|');
+      const ons = (x.object === MODEL.equations_dataset ?
+          (x.attribute.startsWith(':') ? x.method_object_prefix : '') :
+              x.object.displayName + '|');
       vlist.push(ons + x.attribute);
       // Trim spaces around all object-attribute separators in the expression.
       xlist.push(x.text.replace(/\s*\|\s*/g, '|'));

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

@@ -2161,7 +2161,9 @@ class LinnyRModel {
     // Move all selected nodes to cluster `c`.
     // NOTE: The relative position of the selected notes is presserved,
     // but the nodes are positioned to the right of the diagram of `c`
-    // with a margin of 50 pixels. 
+    // with a margin of 50 pixels.
+    // NOTE: No dropping if the selection contains one note.
+    if(this.selection.length === 1 && this.selection[0] instanceof Note) return;
     const
         space = 50,
         rmx = c.rightMarginX + space,
@@ -5130,38 +5132,41 @@ class ObjectWithXYWH {
 
 // CLASS NoteField: numeric value of "field" [[variable]] in note text 
 class NoteField {
-  constructor(n, f, o, u='1', m=1, w=false) {
+  constructor(n, f, o, u='1', m=1, w=false, p='') {
     // `n` is the note that "owns" this note field
     // `f` holds the unmodified tag string [[dataset]] to be replaced by
     // the value of vector or expression `o` for the current time step;
     // if specified, `u` is the unit of the value to be displayed,
-    // `m` is the multiplier for the value to be displayed, and `w` is
-    // the wildcard number to use in a wildcard equation
+    // `m` is the multiplier for the value to be displayed, `w` is
+    // the wildcard number to use in a wildcard equation, and `p` is
+    // the prefix to use for a method equation.
     this.note = n;
     this.field = f;
     this.object = o;
     this.unit = u;
     this.multiplier = m;
     this.wildcard_number = (w ? parseInt(w) : false);
+    this.prefix = p;
   }
   
   get value() {
-    // Returns the numeric value of this note field as a numeric string
-    // followed by its unit (unless this is 1)
-    // If object is the note, this means field [[#]] (note number context)
-    // If this is undefined (empty string) display a double question mark
+    // Return the numeric value of this note field as a numeric string
+    // followed by its unit (unless this is 1).
+    // If object is the note, this means field [[#]] (note number context).
+    // If this is undefined (empty string) display a double question mark.
     if(this.object === this.note) return this.note.numberContext || '\u2047';
     let v = VM.UNDEFINED;
     const t = MODEL.t;
     if(Array.isArray(this.object)) {
-      // Object is a vector
+      // Object is a vector.
       if(t < this.object.length) v = this.object[t];
     } else if(this.object.hasOwnProperty('c') &&
         this.object.hasOwnProperty('u')) {
-      // Object holds link lists for cluster balance computation
+      // Object holds link lists for cluster balance computation.
       v = MODEL.flowBalance(this.object, t);
     } else if(this.object instanceof Expression) {
-      // Object is an expression
+      // Object is an expression.
+      this.object.method_object_prefix = this.prefix;
       v = this.object.result(t, this.wildcard_number);
     } else if(typeof this.object === 'number') {
       v = this.object;
@@ -5237,6 +5242,14 @@ class Note extends ObjectWithXYWH {
     return this.cluster.numberContext;
   }
   
+  get methodPrefix() {
+    // Return the most likely candidate prefix to be used for method fields.
+    const n = this.nearbyNode;
+    if(n instanceof Cluster) return n.name;
+    if(this.cluster === MODEL.top_cluster) return '';
+    return this.cluster.name;
+  }
+  
   get nearbyNode() {
     // Return a node in the cluster of this note that is closest to this
     // note (Euclidian distance between center points), but with at most
@@ -5389,12 +5402,22 @@ class Note extends ObjectWithXYWH {
       if(!obj) {
         const m = MODEL.equations_dataset.modifiers[UI.nameToID(ena[0])];
         if(m) {
-          UI.warn('Methods cannot be evaluated without prefix');
+          const mp = this.methodPrefix;
+          if(mp) {
+            if(m.expression.isEligible(mp)) {
+              this.fields.push(new NoteField(this, tag, m.expression, to_unit,
+                  multiplier, false, mp));
+            } else {
+              UI.warn(`Prefix "${mp}" is not eligible for method "${m.selector}"`);
+            }
+          } else {
+            UI.warn('Methods cannot be evaluated without prefix');
+          }
         } else {
           UI.warn(`Unknown model entity "${en}"`);
         }
       } else if(obj instanceof DatasetModifier) {
-        // NOTE: equations are (for now) dimenssonless => unit '1'.
+        // NOTE: Equations are (for now) dimensionless => unit '1'.
         if(obj.dataset !== MODEL.equations_dataset) {
           from_unit = obj.dataset.scale_unit;
           multiplier = MODEL.unitConversionMultiplier(from_unit, to_unit);
@@ -9726,21 +9749,13 @@ class ChartVariable {
       // this indicates that it is a Wildcard selector or a method, and
       // that the specified result vector should be used.
       if(this.wildcard_index !== false) {
-        // NOTE: A wildcard index (a number) can also indicate that this
-        // variable is a method, so check for a leading colon.
-        if(eqn.startsWith(':')) {
-          // For methods, use "entity name or prefix: method" as variable
-          // name, so first get the method object prefix, expand it if
-          // it identifies a specific model entity, and then append the
-          // method name (leading colon replaced by the prefixer ": ").
-          const
-              mop = this.object.expression.method_object_list[this.wildcard_index],
-              obj = MODEL.objectByID(mop);
-          eqn = (obj ? obj.displayName : (mop || '')) +
-              UI.PREFIXER + eqn.substring(1);
-        } else {
-          eqn = eqn.replace('??', this.wildcard_index);
-        }
+        eqn = eqn.replace('??', this.wildcard_index);
+      } else if(eqn.startsWith(':')) {
+        // For methods, use "entity name or prefix: method" as variable
+        // name, so first get the method object prefix, expand it if
+        // it identifies a specific model entity, and then append the
+        // method name (leading colon replaced by the prefixer ": ").
+        eqn = this.chart.prefix + UI.PREFIXER + eqn.substring(1);
       }
       return eqn + sf;
     }
@@ -9759,8 +9774,8 @@ class ChartVariable {
   }
   
   get asXML() {
-    // NOTE: a "black-boxed" model can comprise charts showing "anonymous"
-    // entities, so the IDs of these entities must then be changed
+    // NOTE: A "black-boxed" model can comprise charts showing "anonymous"
+    // entities, so the IDs of these entities must then be changed.
     let id = this.object.identifier;
     if(MODEL.black_box_entities.hasOwnProperty(id)) {
       id = UI.nameToID(MODEL.black_box_entities[id]);
@@ -9780,7 +9795,7 @@ class ChartVariable {
   }
   
   get lowestValueInVector() {
-    // Returns the computed statistical minimum OR vector[0] (if valid & lower) 
+    // Return the computed statistical minimum OR vector[0] (if valid & lower).
     let v = this.minimum;
     if(this.vector.length > 0) v = this.vector[0];
     if(v < VM.MINUS_INFINITY || v > VM.PLUS_INFINITY || v > this.minimum) {
@@ -9790,7 +9805,7 @@ class ChartVariable {
   }
 
   get highestValueInVector() {
-    // Returns the computed statistical maximum OR vector[0] (if valid & higher) 
+    // Return the computed statistical maximum OR vector[0] (if valid & higher).
     let v = this.maximum;
     if(this.vector.length > 0) v = this.vector[0];
     if(v < VM.MINUS_INFINITY || v > VM.PLUS_INFINITY || v < this.maximum) {
@@ -9801,12 +9816,12 @@ class ChartVariable {
 
   initFromXML(node) {
     let id = xmlDecoded(nodeContentByTag(node, 'object-id'));
-    // NOTE: automatic conversion of former top cluster name
+    // NOTE: Automatic conversion of former top cluster name.
     if(id === UI.FORMER_TOP_CLUSTER_NAME.toLowerCase()) {
       id = UI.nameToID(UI.TOP_CLUSTER_NAME);
     }
     if(IO_CONTEXT) {
-      // NOTE: actualName also works for entity IDs
+      // NOTE: actualName also works for entity IDs.
       id = UI.nameToID(IO_CONTEXT.actualName(id));
     }
     const obj = MODEL.objectByID(id);
@@ -9847,7 +9862,7 @@ class ChartVariable {
     }
     // Compute vector and statistics only if vector is still empty.
     if(this.vector.length > 0) return;
-    // NOTE: expression vectors start at t = 0 with initial values that
+    // NOTE: Expression vectors start at t = 0 with initial values that
     // should not be included in statistics.
     let v,
         av = null,
@@ -9868,7 +9883,7 @@ class ChartVariable {
           this.chart.time_scale, tsteps, 1);
       t_end = tsteps;
     } else {
-      // Get the variable's own value (number, vector or expression)
+      // Get the variable's own value (number, vector or expression).
       if(this.object instanceof Dataset) {
         if(this.attribute) {
           av = this.object.attributeExpression(this.attribute);
@@ -9886,7 +9901,7 @@ class ChartVariable {
       }
       t_end = MODEL.end_period - MODEL.start_period + 1;
     }
-    // NOTE: when a chart combines run results with dataset vectors, the
+    // NOTE: When a chart combines run results with dataset vectors, the
     // latter may be longer than the # of time steps displayed in the chart.
     t_end = Math.min(t_end, this.chart.total_time_steps);
     this.N = t_end;
@@ -9902,7 +9917,9 @@ class ChartVariable {
       } else if(av instanceof Expression) {
         // Attribute value is an expression. If this chart variable has
         // its wildcard vector index set, evaluate the expression with
-        // this index as context number.
+        // this index as context number. Likewise, set the method object
+        // prefix.
+        av.method_object_prefix = this.chart.prefix;
         v = av.result(t, this.wildcard_index);
       } else {
         // Attribute value must be a number.
@@ -10040,7 +10057,8 @@ class Chart {
     this.value_range = 0;
     this.show_title = true;
     this.legend_position = 'none';
-    this.variables = [];    
+    this.preferred_prefix = '';
+    this.variables = [];
     // SVG string to display the chart
     this.svg = '';
     // Properties of rectangular chart area 
@@ -10052,8 +10070,35 @@ class Chart {
   }
   
   get displayName() {
+    // Charts are identified by their title. 
     return this.title;
   }
+
+  get prefix() {
+    // The prefix is used to further specify method variables.
+    if(this.preferred_prefix) return this.preferred_prefix;
+    const parts = this.title.split(UI.PREFIXER);
+    parts.pop();
+    // Now `parts` is empty when the title contains no colon+space.
+    return parts.join(UI.PREFIXER);
+  }
+  
+  get possiblePrefixes() {
+    // Return list of prefixes that are eligible for all method variables.
+    let pp = null;
+    for(const v of this.variables) {
+      if(v.object instanceof DatasetModifier && v.object.selector.startsWith(':')) {
+        if(pp) {
+          pp = intersection(pp, Object.keys(v.object.expression.eligible_prefixes));
+        } else {
+          pp = Object.keys(v.object.expression.eligible_prefixes);
+        }
+      }
+    }
+    if(pp) pp.sort();
+    // Always return a list.
+    return pp || [];
+  }
   
   get asXML() {
     let xml = '';
@@ -10125,10 +10170,10 @@ class Chart {
     const eq = obj instanceof DatasetModifier;
     // 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, prompt the
-      // modeler which wildcard possibilities to add UNLESS this is an
-      // untitled "dummy" chart used to report outcomes.
+    if(eq && n.indexOf('??') >= 0) {
+      // Special case: for wildcard equations, 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 {
@@ -12436,7 +12481,7 @@ class Experiment {
             const rr = this.runs[rnr].results[vi];
             if(rr) {
               // NOTE: Only experiment variables have vector data.
-              if(rr.x_variable && vi <= rr.N) {
+              if(rr.x_variable && t <= rr.N) {
                 row.push(numval(rr.vector[t], prec));
               } else {
                 row.push('');

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

@@ -866,8 +866,8 @@ function cleanXML(node) {
 }
 
 function parseXML(xml) {
-  // Parses string `xml` into an XML document, and returns its root node
-  // (or null if errors)
+  // Parse string `xml` into an XML document, and returns its root node
+  // (or null if errors).
   xml = XML_PARSER.parseFromString(customizeXML(xml), 'application/xml');
   const
       de = xml.documentElement,
@@ -878,8 +878,8 @@ function parseXML(xml) {
 }
 
 function childNodeByTag(node, tag) {
-  // Returns the XML child node of `node` having node name `tag`, or NULL if
-  // no such child node exists
+  // Return the XML child node of `node` having node name `tag`, or NULL if
+  // no such child node exists.
   let cn = null;
   for (let i = 0; i < node.childNodes.length; i++) {
     if(node.childNodes[i].tagName === tag) {
@@ -891,19 +891,19 @@ function childNodeByTag(node, tag) {
 }
 
 function nodeContentByTag(node, tag) {
-  // Returns the text content of the child node of `node` having name `tag`,
-  // or the empty string if no such node exists
+  // Return the text content of the child node of `node` having name `tag`,
+  // or the empty string if no such node exists.
   return nodeContent(childNodeByTag(node, tag));
 }
 
 function nodeContent(node) {
-  // Returns the text content of XML element `node`
+  // Return the text content of XML element `node`.
   if(node) {
-    // For text nodes, return their value
+    // For text nodes, return their value.
     if(node.nodeType === 3) return node.nodeValue;
-    // For empty nodes, return empty string
+    // For empty nodes, return empty string.
     if(node.childNodes.length === 0) return '';
-    // If first child is text, return its value
+    // If first child is text, return its value.
     const fcn = node.childNodes.item(0);
     if(fcn && fcn.nodeType === 3) return fcn.nodeValue;
     console.log('UNEXPECTED XML', fcn.nodeType, node);
@@ -912,8 +912,8 @@ function nodeContent(node) {
 }
 
 function nodeParameterValue(node, param) {
-  // Returns the value of parameter `param` as string if `node` has
-  // this parameter, otherwise the empty string
+  // Return the value of parameter `param` as string if `node` has
+  // this parameter, otherwise the empty string.
   const a = node.getAttribute(param);
   return a || '';
 }

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

@@ -309,7 +309,7 @@ class Expression {
     if(DEBUGGING) {
       // Show the "time step stack" for --START and --STOP
       if(action.startsWith('--') || action.startsWith('"')) {
-        action = `[${step.join(', ')}] ${action}`;
+        action = `[${this.step.join(', ')}] ${action}`;
       }
       console.log(action);
     }
@@ -2903,7 +2903,11 @@ class VirtualMachine {
         vlist = [],
         xlist = [];
     for(const x of this.call_stack) {
-      vlist.push(x.object.displayName + '|' + x.attribute);
+      // For equations, only show the attribute.
+      const ons = (x.object === MODEL.equations_dataset ?
+          (x.attribute.startsWith(':') ? x.method_object_prefix : '') :
+              x.object.displayName + '|');
+      vlist.push(ons + x.attribute);
       // Trim spaces around all object-attribute separators in the
       // expression as entered by the modeler.
       xlist.push(x.text.replace(/\s*\|\s*/g, '|'));
@@ -6933,7 +6937,8 @@ function VMI_push_method(x, args) {
   // and possibly also the entity to be used as its object.
   // NOTE: Methods can only be called "as is" (without prefix) in a
   // method expression. The object of such "as is" method calls is
-  // the object of the calling method expression `x`.
+  // the object of the calling method expression `x`, or for chart
+  // variables the method object selected for the chart.
   const
       method = args[0].meq,
       mex = method.expression,