linny-r 1.4.5 → 1.5.0

package/package.json

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

package/static/index.html

@@ -1754,6 +1754,8 @@ NOTE: * and ? will be interpreted as wildcards"
            title="New equation">
       <img id="eq-rename-btn" class="btn disab" src="images/rename.png"
            title="Rename selected equation">
+      <img id="eq-clone-btn" class="btn disab" src="images/clone.png"
+           title="Clone selected equation">
       <img id="eq-edit-btn" class="btn disab" src="images/edit.png"
            title="Edit selected equation">
       <img id="eq-delete-btn" class="btn disab" src="images/delete.png"
@@ -1790,6 +1792,18 @@ NOTE: * and ? will be interpreted as wildcards"
     </div>
   </div>
 
+  <!-- the CLONE EQUATION dialog prompts for the new name of an equation -->
+  <div id="clone-equation-modal" class="modal">
+    <div id="clone-equation-dlg" class="inp-dlg">
+      <div class="dlg-title">
+        Clone equation
+        <img class="cancel-btn" src="images/cancel.png">
+        <img class="ok-btn" src="images/ok.png">
+      </div>
+      <input id="clone-equation-name" type="text" autocomplete="off">
+    </div>
+  </div>
+
 
   <!-- the CHART dialog allows definition of charts and displays them -->
   <div id="chart-dlg" class="inp-dlg">
@@ -1840,16 +1854,19 @@ NOTE: * and ? will be interpreted as wildcards"
                src="images/add.png"
                title="Add variable (Shift-click to add a new equation)">
           <img id="chart-variable-up-btn" class="btn disab"
-               src="images/up.png" style="margin-left: 4px"
+               src="images/up.png"
                title="Move selected variable up in list">
           <img id="chart-variable-down-btn" class="btn disab"
                src="images/down.png"
                title="Move selected variable down in list">
           <img id="chart-edit-variable-btn" class="btn disab"
-               src="images/edit.png" style="margin-left: 4px"
+               src="images/edit.png"
+               title="Edit selected variable">
+          <img id="chart-sort-variable-btn" class="btn disab"
+               src="images/sort-not.png"
                title="Edit selected variable">
           <img id="chart-delete-variable-btn" class="btn disab"
-               src="images/remove.png" style="margin-left: 4px"
+               src="images/remove.png"
                title="Delete selected variable">
         </div>
       </div>
@@ -1857,6 +1874,23 @@ NOTE: * and ? will be interpreted as wildcards"
         <table id="chart-variables-table">
         </table>
       </div>
+      <div id="chart-sorting-menu">
+        <img id="chart-sort-not-btn" class="btn enab"
+             src="images/sort-not.png"
+             title="Do not sort series data for selected variable">
+        <img id="chart-sort-asc-btn" class="btn enab"
+             src="images/sort-asc.png"
+             title="Sort series data for selected variable in ascending order">
+        <img id="chart-sort-asc-lead-btn" class="btn enab"
+             src="images/sort-asc-lead.png"
+             title="Sort chart data in ascending order for selected variable">
+        <img id="chart-sort-desc-btn" class="btn enab"
+             src="images/sort-desc.png"
+             title="Sort series data for selected variable in descending order">
+        <img id="chart-sort-desc-lead-btn" class="btn enab"
+             src="images/sort-desc-lead.png"
+             title="Sort chart data in descending order for selected variable">
+      </div>
     </div>
     <div id="chart-display-panel">
       <!-- NOTE: the scroller scrolls when the container is "stretched" -->

package/static/linny-r.css

@@ -2439,7 +2439,8 @@ td.equation-expression {
 #new-dataset-dlg,
 #rename-dataset-dlg,
 #new-equation-dlg,
-#rename-equation-dlg {
+#rename-equation-dlg,
+#clone-equation-dlg {
   width: 240px;
   height: 45px;
 }
@@ -2447,7 +2448,8 @@ td.equation-expression {
 #new-dataset-name,
 #rename-dataset-name,
 #new-equation-name,
-#rename-equation-name {
+#rename-equation-name,
+#clone-equation-name {
   position: absolute;
   bottom: 2px;
   left: 2px;
@@ -2748,15 +2750,59 @@ td.equation-expression {
   width: 146px;
   display: inline-block;
   position: absolute;
-  left: 60px;
+  left: 55px;
   top: -2px;
 }
 
 #chart-variable-buttons > img.btn {
   height: 18px;
   width: 18px;
+  margin-left: 2px;
+}
+
+#chart-sorting-menu {
+  position: absolute;
+  top: 89.5px;
+  left: 153px;
+  width: 19px;
+  display: none;
+  background-color: #f4f0f2;
+  border: solid silver 1px;
+  border-radius: 3px;
+  padding: 1px;
+}
+
+#chart-sorting-menu > img.btn {
+  height: 18px;
+  width: 18px;
+  margin: 0px;
+}
+
+td.vbl-asc,
+td.vbl-desc,
+td.vbl-asc-lead,
+td.vbl-desc-lead {
+  color: #8000b0;
 }
 
+td.vbl-asc-lead,
+td.vbl-desc-lead {
+  font-weight: bold;
+}
+
+td.vbl-asc::after,
+td.vbl-asc-lead::after {
+  content: ' \2B67';
+  color: #b00080;
+}
+
+td.vbl-desc::after,
+td.vbl-desc-lead::after {
+  content: ' \2B68';
+  color: #b00080;
+}
+
+
 #chart-variables {
   position: absolute;
   top: 113px;

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

@@ -298,6 +298,14 @@ class Controller {
     // NOTE: normalize to also accept letters with accents
     if(name === this.TOP_CLUSTER_NAME) return true;
     name = name.normalize('NFKD').trim();
+    if(name.startsWith('$')) {
+      const
+          parts = name.substring(1).split(' '),
+          flow = parts.shift(),
+          aid = this.nameToID(parts.join(' ')),
+          a = MODEL.actorByID(aid);
+      return a && ['IN', 'OUT', 'FLOW'].indexOf(flow) >= 0;
+    }
     return name && !name.match(/\[\\\|\]/) && !name.endsWith(':') &&
         (name.startsWith(this.BLACK_BOX) || name[0].match(/[\w]/));
   }
@@ -714,34 +722,44 @@ class DatasetManager {
 } // END of class DatasetManager
 
 
-// CLASS ChartManager controls the collection of charts of a model
+// CLASS ChartManager controls the collection of charts of a model.
 class ChartManager {
   constructor() {
     this.new_chart_title = '(new chart)';
-    // NOTE: The SVG height is fixed at 500 units, as this gives good results
-    // for the SVG units for line width = 1; fill patterns definitions are
-    // defined to work for images of this height (see further down)
+    // NOTE: The SVG height is fixed at 500 units, as this gives good
+    // results for the SVG units for line width = 1.
+    // Fill patterns definitions are defined to work for images of this
+    // height (see further down).
     this.svg_height = 500;
     this.container_height = this.svg_height;
-    // Default aspect ratio W:H is 1.75 -- stretch factor will make it more oblong
+    // Default aspect ratio W:H is 1.75. The stretch factor of the chart
+    // manager will make the chart more oblong.
     this.container_width = this.svg_height * 1.75;
     this.legend_options = ['None', 'Top', 'Right', 'Bottom'];
-    // Basic properties -- also needed for console application
+    // Basic properties -- also needed for console application.
     this.visible = false;
     this.chart_index = -1;
     this.variable_index = -1;
     this.stretch_factor = 1;
     this.drawing_graph = false;
     this.runs_chart = false;
-    // Fill styles used to differentiate between experiments in histograms
+    // Arrows indicating sort direction.
+    this.sort_arrows = {
+      'not' : '',
+      'asc': ' \u2B67',
+      'desc': ' \u2B68',
+      'asc-lead': ' \u21D7',
+      'desc-lead': ' \u21D8'
+    };
+    // Fill styles used to differentiate between experiments in histograms.
     this.fill_styles = [
         'diagonal-cross-hatch', 'dots',
         'diagonal-hatch', 'checkers', 'horizontal-hatch',
         'cross-hatch', 'circles', 'vertical-hatch'
       ];
     
-    // SVG for chart fill patterns
-    // NOTE: mask width and height are based on SVG height = 500
+    // SVG for chart fill patterns.
+    // NOTE: Mask width and height are based on SVG height = 500.
     this.fill_patterns = `
 <pattern id="vertical-hatch" width="4" height="4"
   patternUnits="userSpaceOnUse">
@@ -1261,7 +1279,7 @@ class ExperimentManager {
   }
 
   processRestOfRun() {   
-    // Performs post-processing after run results have been added
+    // Performs post-processing after run results have been added.
     const x = MODEL.running_experiment;
     if(!x) return;
     const aci = x.active_combination_index;

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

@@ -79,8 +79,25 @@ class GUIChartManager extends ChartManager {
         'click', () => CHART_MANAGER.moveVariable(1));
     document.getElementById('chart-edit-variable-btn').addEventListener(
         'click', () => CHART_MANAGER.editVariable());
+    document.getElementById('chart-sort-variable-btn').addEventListener(
+        'mouseenter', () => CHART_MANAGER.showSortingMenu());
     document.getElementById('chart-delete-variable-btn').addEventListener(
         'click', () => CHART_MANAGER.deleteVariable());
+    // Make the sorting menu responsive.
+    this.sorting_menu = document.getElementById('chart-sorting-menu');
+    this.sorting_menu.addEventListener(
+        'mouseleave', () => CHART_MANAGER.hideSortingMenu());
+    document.getElementById('chart-sort-not-btn').addEventListener(
+        'click', (e) => CHART_MANAGER.setSortType(e.target));
+    document.getElementById('chart-sort-asc-btn').addEventListener(
+        'click', (e) => CHART_MANAGER.setSortType(e.target));
+    document.getElementById('chart-sort-asc-lead-btn').addEventListener(
+        'click', (e) => CHART_MANAGER.setSortType(e.target));
+    document.getElementById('chart-sort-desc-btn').addEventListener(
+        'click', (e) => CHART_MANAGER.setSortType(e.target));
+    document.getElementById('chart-sort-desc-lead-btn').addEventListener(
+        'click', (e) => CHART_MANAGER.setSortType(e.target));
+    // Add properties for access to other chart manager dialog elements.
     this.variables_table = document.getElementById('chart-variables-table');
     this.display_panel = document.getElementById('chart-display-panel');
     this.toggle_chevron = document.getElementById('chart-toggle-chevron');
@@ -188,6 +205,7 @@ class GUIChartManager extends ChartManager {
     this.setRunsChart(false);
     this.last_time_selected = 0;
     this.paste_color = '';
+    this.hideSortingMenu();
   }
   
   enterKey() {
@@ -336,17 +354,27 @@ class GUIChartManager extends ChartManager {
           '<td class="v-box"><div id="v-box-', i, '" class="vbox',
           (cv.visible ? ' checked' : ' clear'),
           '" onclick="CHART_MANAGER.toggleVariable(', i,
-          ');"></div></td><td class="v-name">', cv.displayName,
+          ');"></div></td><td class="v-name vbl-', cv.sorted,
+          '">', cv.displayName,
           '</td></tr>'].join(''));
       }
       this.variables_table.innerHTML = ol.join('');
     } else {
       this.variable_index = -1;
     }
+    // Set the image of the sort type button.
+    if(this.variable_index >= 0) {
+      const
+          cv = c.variables[this.variable_index],
+          sb = document.getElementById('chart-sort-variable-btn'),
+          mb = document.getElementById(`chart-sort-${cv.sorted}-btn`); 
+      sb.src = `images/sort-${cv.sorted}.png`;
+      sb.title = mb.title;
+    }
     const
         u_btn = 'chart-variable-up ',
         d_btn = 'chart-variable-down ',
-        ed_btns = 'chart-edit-variable chart-delete-variable ';
+        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) {
@@ -378,8 +406,35 @@ class GUIChartManager extends ChartManager {
     this.stretchChart(0);
   }
   
+  showSortingMenu() {
+    // Show the pane with sort type buttons only if variable is selected.
+    this.sorting_menu.style.display =
+        (this.variable_index >= 0 ? 'block' : 'none');
+  }
+  
+  hideSortingMenu() {
+    // Hide the pane with sort type buttons.
+    this.sorting_menu.style.display = 'none';
+  }
+  
+  setSortType(btn) {
+    // Set the sort type for the selected chart variable.
+    if(this.chart_index < 0 || this.variable_index < 0) return;
+    const
+        c = MODEL.charts[this.chart_index],
+        cv = c.variables[this.variable_index],
+        parts = btn.id.split('-');
+    parts.shift();
+    parts.shift();
+    parts.pop();
+    cv.sorted = parts.join('-');
+    this.hideSortingMenu();
+    this.updateDialog();
+  }
+  
   updateExperimentInfo() {
-    // Display selected experiment title in dialog header if run data are used
+    // Display selected experiment title in dialog header if run data
+    // are used.
     const
         selx = EXPERIMENT_MANAGER.selected_experiment,
         el = document.getElementById('chart-experiment-info');
@@ -498,7 +553,7 @@ class GUIChartManager extends ChartManager {
             cv = c.variables[i],
             nv = new ChartVariable(nc);
         nv.setProperties(cv.object, cv.attribute, cv.stacked,
-            cv.color, cv.scale_factor, cv.line_width);
+            cv.color, cv.scale_factor, cv.line_width, cv.sorted);
         nc.variables.push(nv);
       }
       this.chart_index = MODEL.indexOfChart(nc.title);
@@ -649,7 +704,7 @@ class GUIChartManager extends ChartManager {
       this.variable_modal.element('color').style.backgroundColor = cv.color;
       this.setColorPicker(cv.color);
       // Show change equation buttons only for equation variables
-      if(cv.object === MODEL.equations_dataset) {
+      if(cv.object === MODEL.equations_dataset || cv.object instanceof DatasetModifier) {
         this.change_equation_btns.style.display = 'block';
       } else {
         this.change_equation_btns.style.display = 'none';
@@ -741,7 +796,7 @@ class GUIChartManager extends ChartManager {
     // Renames the selected variable (if it is an equation)
     if(this.chart_index >= 0 && this.variable_index >= 0) {
       const v = MODEL.charts[this.chart_index].variables[this.variable_index];
-      if(v.object === MODEL.equations_dataset) {
+      if(v.object === MODEL.equations_dataset || v.object instanceof DatasetModifier) {
         const m = MODEL.equations_dataset.modifiers[UI.nameToID(v.attribute)];
         if(m instanceof DatasetModifier) {
           EQUATION_MANAGER.selected_modifier = m;
@@ -755,7 +810,7 @@ class GUIChartManager extends ChartManager {
     // Opens the expression editor for the selected variable (if equation)
     if(this.chart_index >= 0 && this.variable_index >= 0) {
       const v = MODEL.charts[this.chart_index].variables[this.variable_index];
-      if(v.object === MODEL.equations_dataset) {
+      if(v.object === MODEL.equations_dataset || v.object instanceof DatasetModifier) {
         const m = MODEL.equations_dataset.modifiers[UI.nameToID(v.attribute)];
         if(m instanceof DatasetModifier) {
           EQUATION_MANAGER.selected_modifier = m;

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

@@ -168,6 +168,8 @@ class GroupPropertiesDialog extends ModalDialog {
         this.initial[name] = prop;
         if(token === 'bbtn') {
           el.className = (prop ? 'bbtn eq' : 'bbtn ne');
+          // NOTE: Update required to enable or disable UB field.
+          UI.updateEqualBounds(obj.type.toLowerCase());
         } else if(token === 'box') {
           el.className = (prop ? 'box checked' : 'box clear');
         } else if(propname === 'share_of_cost') {
@@ -1811,7 +1813,7 @@ class GUIController extends Controller {
         setTimeout(() => {
               const md = UI.modals['add-process'];
               md.element('name').value = '';
-              md.element('actor-name').value = '';
+              md.element('actor').value = '';
               md.show('name');
             });
       } else if(obj === 'product') {
@@ -2761,7 +2763,44 @@ class GUIController extends Controller {
         } else {
           md = this.modals['add-product'];
           nn = md.element('name').value;
-          if(!this.validNames(nn)) {
+          // NOTE: As of version 1.5, actor cash IN, chash OUT and cash FLOW
+          // can be added as special data products. These products are indicated
+          // by a leading dollar sign or euro sign, followed by an acceptable
+          // flow indicator (I, O, F, CI, CO, CF, IN, OUT, FLOW), or none to
+          // indicate the default "cash flow", followed by the name of an
+          // actor already defined in the model.
+          if(nn.startsWith('$') || nn.startsWith('\u20AC')) {
+            const
+                valid = {
+                  'i': 'IN',
+                  'ci': 'IN',
+                  'in': 'IN',
+                  'o': 'OUT',
+                  'co': 'OUT',
+                  'out': 'OUT',
+                  'f': 'FLOW',
+                  'cf': 'FLOW',
+                  'flow': 'FLOW'
+                },
+                parts = nn.substring(1).trim().split(' ');
+            let flow = valid[parts[0].toLowerCase()];
+            if(flow === undefined) flow = '';
+            // If first part indicates flow type, trim it from the name parts.
+            if(flow) parts.shift();
+            // Now the parts should identify an actor; this may be (no actor).
+            const
+                aid = this.nameToID(parts.join(' ').trim() || this.NO_ACTOR),
+                a = MODEL.actorByID(aid);
+            if(a) {
+              // If so, and no flow type, assume the default (cash FLOW).
+              if(!flow) flow = 'FLOW';
+              // Change name to canonical.form, i.e., like "$FLOW actor name"
+              nn = `$${flow} ${a.name}`;
+            }
+          }
+          // Test if name is valid. 
+          const vn = this.validName(nn);
+          if(!vn) {
             UNDO_STACK.pop();
             return false;
           }
@@ -2770,8 +2809,13 @@ class GUIController extends Controller {
           n = MODEL.addProduct(nn);
           if(n) {
             if(pp) {
-              // Do not change unit or data type of existing product
+              // Do not change unit or data type of existing product.
               this.notify(`Added existing product <em>${pp.displayName}</em>`);
+            } else if(nn.startsWith('$')) {
+              // Actor cash flow products must be data products, and
+              // must have the model's currency unit as scale unit.
+              n.scale_unit = MODEL.currency_unit;
+              n.is_data = true;
             } else {
               n.scale_unit = MODEL.addScaleUnit(md.element('unit').value);
               n.is_data = this.boxChecked('add-product-data');
@@ -3658,6 +3702,12 @@ console.log('HERE name conflicts', name_conflicts, mapping);
         p.lower_bound)) return false;
     if(!this.updateExpressionInput('product-UB', 'upper bound',
         p.upper_bound)) return false;
+    if(p.name.startsWith('$')) {
+      // NOTE: For actor cash flow data products, price and initial
+      // level must remain blank.
+      md.element('P').value = '';
+      md.element('IL').value = '';
+    }
     if(!this.updateExpressionInput('product-IL', 'initial level',
         p.initial_level)) return false;
     if(!this.updateExpressionInput('product-P', 'market price',
@@ -3673,15 +3723,23 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     }
     // At this point, all input has been validated, so entity properties
     // can be modified.
-    p.changeScaleUnit(md.element('unit').value);
-    p.equal_bounds = this.getEqualBounds('product-UB-equal');
-    p.is_source = this.boxChecked('product-source');
-    p.is_sink = this.boxChecked('product-sink');
-    // NOTE: Do not unset is_data if product has ingoing data arrows.
-    p.is_data = p.hasDataInputs || this.boxChecked('product-data');
-    p.is_buffer = this.boxChecked('product-stock');
-    p.integer_level = this.boxChecked('product-integer');
+    if(!p.name.startsWith('$')) {
+      // NOTE: For actor cash flow data products, these properties must
+      // also retain their initial value.
+      p.changeScaleUnit(md.element('unit').value);
+      p.is_source = this.boxChecked('product-source');
+      p.is_sink = this.boxChecked('product-sink');
+      // NOTE: Do not unset `is_data` if product has ingoing data arrows.
+      p.is_data = p.hasDataInputs || this.boxChecked('product-data');
+      p.is_buffer = this.boxChecked('product-stock');
+      // NOTE: Integer constraint will typically not work because cash
+      // flows are scaled when setting up the Simplex tableau, and hence
+      // the values of their decision variable will differ from their
+      // level in the model.
+      p.integer_level = this.boxChecked('product-integer');
+    }
     p.no_slack = this.boxChecked('product-no-slack');
+    p.equal_bounds = this.getEqualBounds('product-UB-equal');
     const pnl = p.no_links;
     p.no_links = this.boxChecked('product-no-links');
     let must_redraw = (pnl !== p.no_links);

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

@@ -48,6 +48,8 @@ class EquationManager {
         'click', () => EQUATION_MANAGER.promptForEquation());
     document.getElementById('eq-rename-btn').addEventListener(
         'click', () => EQUATION_MANAGER.promptForName());
+    document.getElementById('eq-clone-btn').addEventListener(
+        'click', () => EQUATION_MANAGER.promptToClone());
     document.getElementById('eq-edit-btn').addEventListener(
         'click', () => EQUATION_MANAGER.editEquation());
     document.getElementById('eq-delete-btn').addEventListener(
@@ -66,6 +68,12 @@ class EquationManager {
     this.rename_modal.cancel.addEventListener(
         'click', () => EQUATION_MANAGER.rename_modal.hide());
 
+    this.clone_modal = new ModalDialog('clone-equation');
+    this.clone_modal.ok.addEventListener(
+        'click', () => EQUATION_MANAGER.cloneEquation());
+    this.clone_modal.cancel.addEventListener(
+        'click', () => EQUATION_MANAGER.clone_modal.hide());
+
     // Initialize the dialog properties
     this.reset();
   }
@@ -146,7 +154,7 @@ class EquationManager {
     this.table.innerHTML = ml.join('');
     this.scroll_area.style.display = 'block';
     if(sm) UI.scrollIntoView(document.getElementById(smid));
-    const btns = 'eq-rename eq-edit eq-delete';
+    const btns = 'eq-rename eq-clone eq-edit eq-delete';
     if(sm) {
       UI.enableButtons(btns);
     } else {
@@ -294,6 +302,43 @@ class EquationManager {
     this.updateDialog();
   }
   
+  promptToClone() {
+    // Prompts the modeler for the name of the clone to make of the
+    // selected equation (if any).
+    if(this.selected_modifier) {
+      this.clone_modal.element('name').value = this.selected_modifier.selector;
+      this.clone_modal.show('name');
+    }
+  }
+  
+  cloneEquation() {
+    if(!this.selected_modifier) return;
+    const
+        s = this.clone_modal.element('name').value,
+        // New equation identifier must not equal some entity ID
+        obj = MODEL.objectByName(s);
+    if(obj) {
+      // NOTE: also pass selector, or warning will display dataset name.
+      UI.warningEntityExists(obj);
+      return null;
+    }
+    // Name is new and unique, so try to use it
+    const m = MODEL.equations_dataset.addModifier(s);
+    // NULL indicates invalid name, and modeler will have been warned.
+    if(!m) return;
+    // Give the new modifier the same expression as te selected one.
+    m.expression.text = this.selected_modifier.expression.text;
+    // Compile the expression. This may generate a warning when the new
+    // name does not provide adequate context.
+    m.expression.compile();
+    // 
+    this.selected_modifier = m;
+    // Even if warning was given, close the name prompt dialog, and update
+    // the equation manager.
+    this.clone_modal.hide();
+    this.updateDialog();
+  }
+  
   deleteEquation() {
     const m = this.selected_modifier;
     if(m) {

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

@@ -226,6 +226,9 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
     // Clear the "shortcut flag" that may be set by Shift-clicking the
     // "add chart variable" button in the chart dialog 
     EQUATION_MANAGER.add_to_chart = false;
+    // CLear other properties that relate to the edited expression.
+    this.edited_input_id = '';
+    this.edited_expression = null;
   }
   
   parseExpression() {

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

@@ -294,7 +294,10 @@ class Finder {
         for(let i = 0; i < n; i++) {
           const e = this.entities[i];
           // Exclude "no actor" and top cluster.
-          if(e.name !== '(no_actor)' && e.name !== '(top_cluster)') {
+          if(e.name !== '(no_actor)' && e.name !== '(top_cluster)' &&
+              // Also exclude actor cash flow data products because
+              // many of their properties should not be changed.
+              !e.name.startsWith('$')) {
             eg.push(e);
           }
         }

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

@@ -2262,8 +2262,11 @@ class Paper {
         rim_color,
         stroke_color,
         stroke_width,
-        // Draw border as dashed line if product is data product 
-        sda = (prod.is_data ? UI.sda.dash : 'none'),
+        // Draw border as dashed line if product is data product, and
+        // for actor cash flow data as dotted line.
+        sda = (prod.is_data ?
+            (prod.name.startsWith('$') ? UI.sda.dot : UI.sda.dash) :
+            'none'),
         first_commit_option = prod.needsFirstCommitData,
         x = prod.x + dx,
         y = prod.y + dy,
@@ -2736,15 +2739,22 @@ class Paper {
       clstr.shape.addBlockArrow(x, y - hh, UI.BLOCK_IO,
           clstr.hidden_io.length);
     }
-    // Highlight shape if it has comments
-    clstr.shape.element.firstChild.setAttribute('style',
-        (DOCUMENTATION_MANAGER.visible && clstr.comments ?
-            this.documented_filter : ''));
-    // Highlight cluster if it is the drop target for the selection
-    if(clstr === this.target_cluster) {
-      clstr.shape.element.setAttribute('style', this.target_filter);
+    if(clstr === UI.target_cluster) {
+      // Highlight cluster if it is the drop target for the selection.
+      clstr.shape.element.childNodes[0].setAttribute('style',
+          this.target_filter);
+      clstr.shape.element.childNodes[1].setAttribute('style',
+          this.target_filter);
+    } else if(DOCUMENTATION_MANAGER.visible && clstr.comments) {
+      // Highlight shape if it has comments.
+      clstr.shape.element.childNodes[0].setAttribute('style',
+          this.documented_filter);
+      clstr.shape.element.childNodes[1].setAttribute('style',
+          this.documented_filter);
     } else {
-      clstr.shape.element.setAttribute('style', '');
+      // No highlighting.
+      clstr.shape.element.childNodes[0].setAttribute('style', '');
+      clstr.shape.element.childNodes[1].setAttribute('style', '');
     }
     clstr.shape.element.setAttribute('opacity', 0.9);
     clstr.shape.appendToDOM();    

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

@@ -728,17 +728,21 @@ class LinnyRModel {
 
   canLink(from, to) {
     // Return TRUE iff FROM-node can feature a "straight" link (i.e., a
-    // product flow) to TO-node
+    // product flow) to TO-node.
     if(from.type === to.type) {
       // No "straight" link between nodes of same type (see canConstrain
-      // for "curved" links) UNLESS TO-node is a data product
+      // for "curved" links) UNLESS TO-node is a data product.
       if(!to.is_data) return false;
     }
+    // No links to actor cash flow data products.
+    if(to.name.startsWith('$')) return false;
+    // No links from actor cash flow data to processes.
+    if(from.name.startsWith('$') && to instanceof Process) return false;
     // At most ONE link A --> B.
     for(let i = 0; i < from.outputs.length; i++) {
       if(from.outputs[i].to_node === to) return false;
     }
-    // No link A --> B if there already exists a link B --> A
+    // No link A --> B if there already exists a link B --> A.
     for(let i = 0; i < to.outputs.length; i++) {
       if(to.outputs[i].to_node === from) return false;
     }
@@ -1188,6 +1192,7 @@ class LinnyRModel {
     // Product nodes have no actor
     let actor = this.addActor('');
     name = UI.cleanName(name);
+    // Leading dollar sign indicates an actor cash flow data product.
     if(!UI.validName(name)) {
       UI.warningInvalidName(name);
       return null;
@@ -1211,6 +1216,12 @@ class LinnyRModel {
     if(node) p.initFromXML(node);
     p.setCode();
     this.products[p.identifier] = p;
+    // NOTE: Cash flow products must be data, and must have the model's
+    // currency unit as unit.
+    if(p.name.startsWith('$')) {
+      p.is_data = true;
+      p.unit = MODEL.currency_unit;
+    }
     p.resize();
     // New product => prepare for redraw
     p.cluster.clearAllProcesses();
@@ -2051,11 +2062,23 @@ class LinnyRModel {
     // that actually delete model elements append their XML to the XML attribute
     // of this UndoEdit  
     let obj,
-        dc = false,
         fc = this.focal_cluster;
     // Update the documentation manager (GUI only) if selection contains the
     // current entity
     if(DOCUMENTATION_MANAGER) DOCUMENTATION_MANAGER.clearEntity(this.selection);
+    // First delete links and constraints.
+    for(let i = this.selection.length - 1; i >= 0; i--) {
+      if(this.selection[i] instanceof Link ||
+          this.selection[i] instanceof Constraint) {
+        obj = this.selection.splice(i, 1)[0];
+        if(obj instanceof Link) {
+          this.deleteLink(obj);
+        } else {
+          this.deleteConstraint(obj);
+        }
+      }
+    }
+    // Then delete selected nodes.
     for(let i = this.selection.length - 1; i >= 0; i--) {
       obj = this.selection.splice(i, 1)[0];
       // NOTE: when deleting a selection, this selection has been made in the
@@ -2064,13 +2087,8 @@ class LinnyRModel {
         fc.deleteNote(obj);
       } else if(obj instanceof Product) {
         fc.deleteProduct(obj);
-      } else if(obj instanceof Link) {
-        this.deleteLink(obj);
-      } else if(obj instanceof Constraint) {
-        this.deleteConstraint(obj);
       } else if(obj instanceof Cluster) {
         this.deleteCluster(obj);
-        dc = true;
       } else {
         this.deleteNode(obj);
       }
@@ -2963,7 +2981,7 @@ class LinnyRModel {
             const cv = new ChartVariable(null);
             cv.setProperties(v.object, v.attribute, false, '#000000');
             vbls.push(cv);
-            names.push(uvn);
+            names.push(vn);
           }
         } else if(names.indexOf(vn) < 0) {
           // Keep track of the dataset and dataset modifier variables,
@@ -7695,9 +7713,10 @@ class Product extends Node {
   }
   
   get isConstant() {
-    // Returns TRUE if this product is data, has no links to processes,
-    // and has set LB = UB
-    if(!this.is_data || !this.allOutputsAreData) return false;
+    // Return TRUE if this product is data, has no links to processes,
+    // is not an actor cash flow, and has set LB = UB
+    if(!this.is_data || this.name.startsWith('$') ||
+        !this.allOutputsAreData) return false;
     for(let i = 0; i < this.inputs.length; i++) {
       if(this.inputs[i].from_node instanceof Process) return false;
     }
@@ -8434,15 +8453,26 @@ class Dataset {
   }
 
   get plainSelectors() {
-    // Returns sorted list of selectors that do not contain wildcards
-    const sl = this.selectorList;
-    // NOTE: wildcard selectors will always be at the end of the list
+    // Return sorted list of selectors that do not contain wildcards.
+    const sl = this.selectorList.slice();
+    // NOTE: Wildcard selectors will always be at the end of the list
     for(let i = sl.length - 1; i >= 0; i--) {
       if(sl[i].indexOf('*') >= 0 || sl[i].indexOf('?') >= 0) sl.pop();
     }
     return sl;
   }
   
+  get wildcardSelectors() {
+    // Return sorted list of selectors that DO contain wildcards.
+    const sl = this.selectorList;
+    // NOTE: Wildcard selectors will always be at the end of the list.
+    let i = sl.length - 1;
+    while(i >= 0 && (sl[i].indexOf('*') >= 0 || sl[i].indexOf('?') >= 0)) {
+      i--;
+    }
+    return sl.slice(i+1);
+  }
+  
   isWildcardSelector(s) {
     // Returns TRUE if `s` contains * or ?
     // NOTE: for equations, the wildcard must be ??
@@ -8898,7 +8928,7 @@ class ChartVariable {
     this.wildcard_index = false;
   }
   
-  setProperties(obj, attr, stck, clr, sf=1, lw=1, vis=true) {
+  setProperties(obj, attr, stck, clr, sf=1, lw=1, vis=true, sort='not') {
     // Sets the defining properties for this chart variable.
     this.object = obj;
     this.attribute = attr;
@@ -8907,6 +8937,7 @@ class ChartVariable {
     this.scale_factor = sf;
     this.line_width = lw;
     this.visible = vis;
+    this.sorted = sort;
   }
   
   get displayName() {
@@ -8915,16 +8946,22 @@ class ChartVariable {
     const sf = (this.scale_factor === 1 ? '' :
         ` (x${VM.sig4Dig(this.scale_factor)})`);
     //Display name of equation is just the equations dataset selector. 
-    if(this.object instanceof DatasetModifier ||
-        // NOTE: Same holds for "dummy variables" added for wildcard
-        // dataset selectors.
-        this.object === MODEL.equations_dataset) {
+    if(this.object instanceof DatasetModifier) {
       let eqn = this.object.selector;
       if(this.wildcard_index !== false) {
         eqn = eqn.replace('??', this.wildcard_index);
       }
       return eqn + sf;
     }
+    // NOTE: Same holds for "dummy variables" added for wildcard
+    // dataset selectors.
+    if(this.object === MODEL.equations_dataset) {
+      let eqn = this.attribute;
+      if(this.wildcard_index !== false) {
+        eqn = eqn.replace('??', this.wildcard_index);
+      }
+      return eqn + 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;
@@ -8939,6 +8976,7 @@ class ChartVariable {
     }
     const xml = ['<chart-variable', (this.stacked ? ' stacked="1"' : ''),
         (this.visible ? ' visible="1"' : ''),
+        ` sorted="${this.sorted}"`,
         '><object-id>', xmlEncoded(id),
         '</object-id><attribute>', this.attribute,
         '</attribute><color>', this.color,
@@ -8990,7 +9028,8 @@ class ChartVariable {
         nodeContentByTag(node, 'color'),
         safeStrToFloat(nodeContentByTag(node, 'scale-factor')),
         safeStrToFloat(nodeContentByTag(node, 'line-width')),
-        nodeParameterValue(node, 'visible') === '1');
+        nodeParameterValue(node, 'visible') === '1',
+        nodeParameterValue(node, 'sorted') || 'not');
     return true;
   }
 
@@ -9133,15 +9172,31 @@ class ChartVariable {
   }
 
   setLinePath(x0, y0, dx, dy) {
-    // Set SVG path unless already set or line not visible 
+    // Set SVG path unless already set or line not visible.
     if(this.line_path.length === 0 && this.visible) {
+      // Vector may have to be sorted in some way.
+      const vect = this.vector.slice();
+      if(this.sorted === 'asc') {
+        // Sort values in ascending order.
+        vect.sort();
+      } else if(this.sorted === 'desc') {
+        // Sort values in descending order.
+        vect.sort((a, b) => { return b - a; });
+      } else if(this.chart.time_step_numbers) {
+        // Fill vector with its values sorted by time step.
+        const tsn = this.chart.time_step_numbers;
+        for(let i = 0; i < this.vector.length; i++) {
+          vect[i] = this.vector[tsn[i]];
+        }
+      }
+      //
       let y = y0 - this.vector[0] * dy;
       const
           path = ['M', x0, ',', y],
-          l = this.vector.length;
+          l = vect.length;
       // NOTE: Now we can use relative line coordinates
       for(let t = 1; t < l; t++) {
-        const new_y = y0 - this.vector[t] * dy;
+        const new_y = y0 - vect[t] * dy;
         path.push(`v${new_y - y}h${dx}`);
         y = new_y;
       }
@@ -9352,6 +9407,37 @@ class Chart {
     }
   }
   
+  sortLeadTimeVector() {
+    // Set the time vector to NULL if no "lead-sort" varianles are
+    // visible, or to a list of N+1 time steps (with N the run length)
+    // sorted on the values of the lead-sorted variables in their order
+    // of appearance in the chart.
+    this.time_step_numbers = null;
+    const
+        lsv = [],
+        lss = [];
+    for(let i = 0; i < this.variables.length; i++) {
+      const cv = this.variables[i];
+      if(cv.visible && cv.sorted.endsWith('-lead')) {
+        lsv.push(cv.vector);
+        lss.push(cv.sorted.startsWith('asc') ? 1 : -1);
+      }
+    }
+    // If no "lead sort" variables, then no need to set the time steps.
+    if(lsv.length === 0) return;
+    this.time_step_numbers = Array.apply(null,
+        {length: this.total_time_steps + 1}).map(Number.call, Number);
+    this.time_step_numbers.sort((a, b) => {
+        let c = 0;
+        for(let i = 0; c === 0 && i < lsv.length; i++) {
+          // Multiply by `lss` (lead sort sign), which will be + 1 for
+          // ascending order and -1 for descending order.
+          c = (lsv[i][a] - lsv[i][b]) * lss[i];
+        }
+        return c;
+      });
+  }
+  
   resetVectors() {
     // Empties the vector arrays of all variables
     for(let i = 0; i < this.variables.length; i++) {
@@ -9489,14 +9575,15 @@ class Chart {
           }
         }
         if(this.legend_position != 'none') {
-          // Draw the legend items
+          // Draw the legend items.
           let x = leg_left,
-              // NOTE: vertical text align is middle, so add half a font height
+              // Vertical text align is middle, so add half a font height.
               y = leg_top + font_height;
           for(let i = 0; i < this.variables.length; i++) {
             let v = this.variables[i];
             if(v.visible) {
-              const vn = v.displayName;
+              // Add arrow indicating sort direction to name if applicable.
+              const vn = v.displayName + CHART_MANAGER.sort_arrows[v.sorted];
               if(v.stacked || this.histogram) {
                 this.addSVG(['<rect x="', x, '" y="', y - sym_size + 2,
                     '" width="', sym_size, '" height="', sym_size,
@@ -9645,6 +9732,9 @@ class Chart {
       }
     }
 
+    // The time step vector is not used when making a histogram. 
+    if(!this.histogram) this.sortLeadTimeVector();
+
     // Draw the grid rectangle
     this.addSVG(['<rect id="c_h_a_r_t__a_r_e_a__ID*" x="', rl, '" y="', rt,
         '" width="', rw, '" height="', rh,
@@ -9673,9 +9763,9 @@ class Chart {
         this.addText(x + 5, y, VM.sig2Dig(b), 'black', font_height,
             'text-anchor="end"');
       } else {
-        // Draw the time labels along the horizontal axis
+        // Draw the time labels along the horizontal axis.
         // TO DO: convert to time units if modeler checks this additional option
-        // Draw the time step duration in bottom-left corner
+        // Draw the time step duration in bottom-left corner.
         this.addText(1, y, 'dt = ' + this.timeScaleAsString(this.time_scale),
             'black', font_height, 'text-anchor="start"');
         // Calculate width corresponding to one half time step
@@ -9856,14 +9946,28 @@ class Chart {
                   this.run_index = runs[0];
                   v.computeVector();
                 }
+                // Vector may have to be sorted in some way.
+                const vect = v.vector.slice();
+                if(v.sorted === 'asc') {
+                  // Sort values in ascending order.
+                  vect.sort();
+                } else if(v.sorted === 'desc') {
+                  // Sort values in descending order.
+                  vect.sort((a, b) => { return b - a; });
+                } else if(this.time_step_numbers) {
+                  // Fill vector with its values sorted by time step.
+                  for(let i = 0; i < v.vector.length; i++) {
+                    vect[i] = v.vector[this.time_step_numbers[i]];
+                  }
+                }
                 // NOTE: add x-value to x0, but SUBTRACT y-value from y0!
                 x = x0;
-                y = y0 - v.vector[0]*dy - offset[0];
+                y = y0 - vect[0]*dy - offset[0];
                 // Begin with the top contour
                 const path = ['M', x, ',', y];
-                for(let t = 1; t < v.vector.length; t++) {
+                for(let t = 1; t < vect.length; t++) {
                   // First draw line to the Y for time step t
-                  y = y0 - (v.vector[t] + offset[t])*dy;
+                  y = y0 - (vect[t] + offset[t])*dy;
                   path.push(`L${x},${y}`);
                   // Then move right for the duration of time step t
                   x += dx;
@@ -9873,13 +9977,13 @@ class Chart {
                 // chart variable
                 v.line_path = path.join('');
                 // Now add the path for the bottom contour (= offset) ...
-                for(let t = v.vector.length - 1; t > 0; t--) {
+                for(let t = vect.length - 1; t > 0; t--) {
                   y = y0 - offset[t]*dy;
                   path.push(`L${x},${y}`);
                   x -= dx;
                   path.push(`L${x},${y}`);
                   // ... while computing the new offset
-                  offset[t] += v.vector[t];
+                  offset[t] += vect[t];
                 }
                 // Draw the filled area with semi-transparent color
                 this.addSVG(['<path d="', path.join(''),
@@ -10115,8 +10219,8 @@ class ActorSelector {
 class ExperimentRunResult {
   constructor(r, v, a='') {
     // NOTE: constructor can be called with `v` a chart variable, a dataset,
-    // or an XML node; if `v` is the equations dataset, then `a` indicates the
-    // attribute to be used
+    // or an XML node; if `v` is the equations dataset, then `a` is the
+    // identifier of the dataset modifier to be used. 
     this.run = r;
     if(v instanceof ChartVariable) {
       this.x_variable = true;
@@ -10188,7 +10292,7 @@ class ExperimentRunResult {
       this.exceptions = 0;
       const
           // NOTE: run result dataset selector will be plain (no wildcards)
-          x = v.attributeExpression(this.attribute),
+          x = v.modifiers[this.attribute].expression,
           t_end = MODEL.end_period - MODEL.start_period + 1;
       // N = # time steps
       this.N = t_end;
@@ -10564,7 +10668,7 @@ class ExperimentRun {
           new ExperimentRunResult(this, this.experiment.variables[vi]));
       this.step++;
       UI.setProgressNeedle(this.step / this.steps);
-      setTimeout(function(x) { x.addChartResults(vi + 1); }, 0, this);
+      setTimeout((x) => x.addChartResults(vi + 1), 0, this);
     } else {
       this.addOutcomeResults(0);
     }
@@ -10577,7 +10681,7 @@ class ExperimentRun {
       this.results.push(new ExperimentRunResult(this, MODEL.outcomes[oi]));
       this.step++;
       UI.setProgressNeedle(this.step / this.steps);
-      setTimeout(function(x) { x.addOutcomeResults(oi + 1); }, 0, this);
+      setTimeout((x) => x.addOutcomeResults(oi + 1), 0, this);
     } else {
       this.addEquationResults(0);
     }
@@ -10592,7 +10696,7 @@ class ExperimentRun {
           new ExperimentRunResult(this, MODEL.equations_dataset, k));      
       this.step++;
       UI.setProgressNeedle(this.step / this.steps);
-      setTimeout(function(x) { x.addEquationResults(ei + 1); }, 0, this);
+      setTimeout((x) => x.addEquationResults(ei + 1), 0, this);
     } else {
       // Register when this result was stored
       this.time_recorded = new Date().getTime();
@@ -10602,8 +10706,10 @@ class ExperimentRun {
       // Log the time it took to compute all results
       VM.logMessage(VM.block_count - 1,
           `Processing run results took ${VM.elapsedTime} seconds.`);
-      // NOTE: addResults is called by either the experiment manager or the
-      // sensitivity analysis  => proceed there
+      // Report results if applicable.
+      if(RECEIVER.solving || MODEL.report_results) RECEIVER.report();
+      // NOTE: addResults is called by either the experiment manager or
+      // the sensitivity analysis; hence proceed from there.
       if(SENSITIVITY_ANALYSIS.experiment) {
         SENSITIVITY_ANALYSIS.processRestOfRun();
       } else {

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

@@ -780,13 +780,15 @@ function escapedSingleQuotes(s) {
 }
 
 function nameToLines(name, actor_name = '') {
-  // Returns the name of a Linny-R entity as a string-with-line-breaks that
-  // fits nicely in an oblong box. For efficiency reasons, a fixed width/height
-  // ratio is assumed, as this produces quite acceptable results
+  // Return the name of a Linny-R entity as a string-with-line-breaks
+  // that fits nicely in an oblong box. For efficiency reasons, a fixed
+  // width/height ratio is assumed, as this produces quite acceptable
+  // results. Actor names are not split, so their length may stretch
+  // the node box.
   let m = actor_name.length;
   const
       d = Math.floor(Math.sqrt(0.3 * name.length)),
-      // Do not wrap strings shorter than 13 characters (about 50 pixels)
+      // Do not wrap strings shorter than 13 characters (about 50 pixels).
       limit = Math.max(Math.ceil(name.length / d), m, 13),
       a = name.split(' ');
   // Split words at '-' when wider than limit
@@ -810,7 +812,12 @@ function nameToLines(name, actor_name = '') {
   let n = 0,
       l = ww[n],
       space;
-  for(let i = 1; i < a.length; i++) {
+  // Actor cash flow indicators like $FLOW have their own line.
+  if(a[0].startsWith('$')) {
+    n++;
+    lines[n] = a[1];
+  }
+  for(let i = 1 + n; i < a.length; i++) {
     if(l + ww[i] < limit) {
       space = (lines[n].endsWith('-') ? '' : ' ');
       lines[n] += space + a[i];

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

@@ -348,6 +348,8 @@ class Expression {
       v[t] = this.stack.pop();
     }
     this.trace('RESULT = ' + VM.sig4Dig(v[t]));
+    // Store wildcard result also in "normal" vector
+    this.vector[t] = v[t];
     // Pop the time step.
     this.step.pop();
     this.trace('--STOP: ' + this.variableName);
@@ -3349,8 +3351,42 @@ class VirtualMachine {
       k = product_keys[pi];
       if(!MODEL.ignored_entities[k]) {
         p = MODEL.products[k];
+        // NOTE: Actor cash flow data products are a special case.
+        if(p.name.startsWith('$')) {
+          // Get the associated actor entity.
+          const parts = p.name.substring(1).split(' ');
+          parts.shift();
+          const
+              aid = UI.nameToID(parts.join(' ')),
+              a = MODEL.actorByID(aid);
+          if(a) {
+            this.code.push([VMI_clear_coefficients, null]);
+            // Use actor's cash variable indices w/o weight.
+            if(p.name.startsWith('$IN ')) {
+              // Add coefficient +1 for cash IN index.
+              this.code.push([VMI_add_const_to_coefficient,
+                  [a.cash_in_var_index, 1, 0]]);
+            } else if(p.name.startsWith('$OUT ')) {
+              // Add coefficient +1 for cash OUT index.
+              this.code.push([VMI_add_const_to_coefficient,
+                  [a.cash_out_var_index, 1, 0]]);
+            } else if(p.name.startsWith('$FLOW ')) {
+              // Add coefficient +1 for cash IN index.
+              this.code.push([VMI_add_const_to_coefficient,
+                  [a.cash_in_var_index, 1, 0]]);
+              // Add coefficient -1 for cash OUT index.
+              this.code.push([VMI_add_const_to_coefficient,
+                  [a.cash_out_var_index, -1, 0]]);
+            }
+            // Add coefficient -1 for level index variable of `p`.
+            this.code.push([VMI_add_const_to_coefficient,
+                [p.level_var_index, -1, 0]]);
+            this.code.push([VMI_add_constraint, VM.EQ]);
+          } else {
+            console.log('ANOMALY: no actor for cash flow product', p.displayName);
+          }
         // NOTE: constants are not affected by their outgoing data (!) links
-        if(!p.isConstant) {
+        } else if(!p.isConstant) {
   
           // FIRST: add a constraint that "computes" the product stock level
           // set coefficients vector to 0 (NOTE: this also sets RHS to 0)
@@ -5268,10 +5304,13 @@ Solver status = ${json.status}`);
       UI.drawDiagram(MODEL);
       // Show the reset button (GUI only)
       UI.readyToReset();
-      // If receiver is active, report results
-      if(RECEIVER.solving || MODEL.report_results) RECEIVER.report();
-      // If experiment is active, signal the manager
-      if(MODEL.running_experiment) EXPERIMENT_MANAGER.processRun();
+      if(MODEL.running_experiment) {
+       // If experiment is active, signal the manager.
+        EXPERIMENT_MANAGER.processRun();
+      } else if(RECEIVER.solving || MODEL.report_results) {
+        // Otherwise report results now, if applicable.
+        RECEIVER.report();
+      }
       // Warn modeler if any issues occurred
       if(this.block_issues) {
         let msg = 'Issues occurred in ' +
@@ -5677,8 +5716,8 @@ function valueOfNumberSign(x) {
   // ending on digits, or tne number context of an entity. The latter typically
   // is the number its name or any of its prefixes ends on, but notes are
   // more "creative" and can return the number context of nearby entities.
-  let s = 'NO SELECTOR',
-      m = 'NO MATCH',
+  let s = '!NO SELECTOR',
+      m = '!NO MATCH',
       n = VM.UNDEFINED;
   // NOTE: Give wildcard selectors precedence over experiment selectors
   // because a wildcard selector is an immediate property of the dataset
@@ -5692,17 +5731,15 @@ function valueOfNumberSign(x) {
     // Check whether `x` is a dataset modifier expression.
     // NOTE: This includes equations.
     if(x.object instanceof Dataset) {
-      if(x.attribute) {
-        s = x.attribute;
-      } else {
-        // Selector may also be defined by a running experiment.
-        if(MODEL.running_experiment) {
-          // Let `m` be the primary selector for the current experiment run.
-          const sl = MODEL.running_experiment.activeCombination;
-          if(sl) {
-            m = sl[0];
-            s = 'experiment';
-          }
+      if(x.attribute) s = x.attribute;
+      // Selector may also be defined by a running experiment.
+      if(MODEL.running_experiment) {
+        const
+            ac = MODEL.running_experiment.activeCombination,
+            mn = matchingNumberInList(ac, s);
+        if(mn !== false) {
+          m = 'x-run';
+          n = mn;
         }
       }
     }
@@ -5715,10 +5752,6 @@ function valueOfNumberSign(x) {
         m = d;
         n = parseInt(d);
       }
-    } else if(m !== 'NO MATCH') {
-      // If matching `m` against `s` do not yield an integer string,
-      // use UNDEFINED
-      n = matchingNumber(m, s) || VM.UNDEFINED;
     }
   }
   // For datasets, set the parent anchor to be the context-sensitive number
@@ -5941,7 +5974,7 @@ function VMI_push_dataset_modifier(x, args) {
   // If `s` is not specified, the modifier to be used must be inferred from
   // the running experiment UNLESS the field `ud` ("use data") is defined
   // for the first argument, and evaluates as TRUE.
-  // NOTE: Ensure that number 0 is not interpreted as FALSE. 
+  // NOTE: Ensure that number 0 is not interpreted as FALSE.
   let wcnr = (args[0].s === undefined ? false : args[0].s);
   const
       ds = args[0].d,
@@ -5960,7 +5993,6 @@ function VMI_push_dataset_modifier(x, args) {
   let t = tot[0],
       // By default, use the vector of the dataset to compute the value.
       obj = ds.vector;
-      
   if(ds.array) {
     // For array-type datasets, do NOT adjust "index" t to model run period.
     // NOTE: Indices start at 1, but arrays are zero-based, so subtract 1.
@@ -5994,16 +6026,17 @@ function VMI_push_dataset_modifier(x, args) {
     if(wcnr === '?') {
       wcnr = x.wildcard_vector_index;
     }
-  } else if(!ud ) {
+  } else if(!ud) {
     // In no selector and not "use data", check whether a running experiment
     // defines the expression to use. If not, `obj` will be the dataset
     // vector (so same as when "use data" is set).
     obj = ds.activeModifierExpression;
-    if(wcnr === false && obj instanceof Expression && MODEL.running_experiment) {
+    if(wcnr === false && MODEL.running_experiment) {
       // If experiment run defines the modifier selector, the active
       // combination may provide a context for #.
-      wcnr = matchingNumberInList(MODEL.running_experiment.activeCombination,
-          obj.attribute);
+      const sel = (obj instanceof Expression ? obj.attribute : x.attribute);
+      wcnr = matchingNumberInList(
+          MODEL.running_experiment.activeCombination, sel);
     }
   }
   if(!obj) {
@@ -6040,7 +6073,9 @@ function VMI_push_dataset_modifier(x, args) {
     // `obj` is an expression.
     // NOTE: Readjust `t` when `obj` is an expression for an *array-type*
     // dataset modifier.
-    if(obj.object instanceof Dataset && obj.object.array) t++;
+    if(obj.object instanceof Dataset && obj.object.array) {
+      t++;
+    }
     v = obj.result(t, wcnr);
   }
   // Trace only now that time step t has been computed.