linny-r 1.4.1 → 1.4.2

package/package.json

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

package/static/index.html

@@ -165,8 +165,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
                 // Inform user that newer version exists
                 UI.check_update_modal.element('msg').innerHTML = [
                     '<a href="', GITHUB_REPOSITORY,
-                    '/wiki/Linny-R-version-history#version-',
-                    info[1].replaceAll('.', ''), '" ',
+                    '/releases/tag/v', info[1], '" ',
                     'title="Click to view version release notes" ',
                     'target="_blank">Version <strong>',
                     info[1], '</strong></a> released on ',
@@ -1288,9 +1287,6 @@ NOTE: Unit symbols are case-sensitive, so BTU &ne; Btu">
     <div id="process-dlg" class="inp-dlg">
       <div class="dlg-title">
         Process properties
-        <div class="simbtn">
-          <img id="process-sim-btn" class="btn sim enab" src="images/process.png">
-        </div>
         <img class="cancel-btn" src="images/cancel.png">
         <img class="ok-btn" src="images/ok.png">
       </div>

package/static/linny-r.css

@@ -346,20 +346,6 @@ div.contbtn {
   cursor: pointer;
 }
 
-div.simbtn {
-  display: none;
-  margin-left: 5px;
-}
-
-img.sim {
-  height: 14px;
-  width: 14px;  
-}
-
-img.sim.enab:hover {
-  background-color: #9e96e5;
-}
-
 input {
   vertical-align: baseline;
 }

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

@@ -302,14 +302,20 @@ class Controller {
         (name.startsWith(this.BLACK_BOX) || name[0].match(/[\w]/));
   }
   
-  prefixesAndName(name) {
+  prefixesAndName(name, key=false) {
     // Returns name split exclusively at '[non-space]: [non-space]'
+    let sep = this.PREFIXER,
+        space = ' ';
+    if(key) {
+      sep = ':_';
+      space = '_';
+    }
     const
-        s = name.split(this.PREFIXER),
+        s = name.split(sep),
         pan = [s[0]];
     for(let i = 1; i < s.length; i++) {
       const j = pan.length - 1;
-      if(s[i].startsWith(' ') || (i > 0 && pan[j].endsWith(' '))) {
+      if(s[i].startsWith(space) || (i > 0 && pan[j].endsWith(space))) {
         pan[j] += s[i];
       } else {
         pan.push(s[i]);
@@ -350,14 +356,20 @@ class Controller {
             this.LINK_ARROW : this.CONSTRAINT_ARROW),
         nodes = name.split(arrow);
     for(let i = 0; i < nodes.length; i++) {
-      nodes[i] = nodes[i].replace(/^:\s*/, prefix);
+      nodes[i] = nodes[i].replace(/^:\s*/, prefix)
+          // NOTE: An embedded double prefix, e.g., "xxx: : yyy" indicates
+          // that the second colon+space should be replaced by the prefix.
+          // This "double prefix" may occur only once in an entity name,
+          // hence no global regexp.
+          .replace(/(\w+):\s+:\s+(\w+)/, `$1: ${prefix}$2`);
     }
     return nodes.join(arrow);
   }
   
   tailNumber(name) {
     // Returns the string of digits at the end of `name`. If not there,
-    // check prefixes (if any) from right to left for a tail number.
+    // check prefixes (if any) *from right to left* for a tail number.
+    // Thus, the number that is "closest" to the name part is returned.
     const pan = UI.prefixesAndName(name);
     let n = endsWithDigits(pan.pop());
     while(!n && pan.length > 0) {
@@ -366,6 +378,48 @@ class Controller {
     return n;
   }
   
+  compareFullNames(n1, n2, key=false) {
+    // Compare full names, considering prefixes in *left-to-right* order
+    // while taking into account the tailnumber for each part so that
+    // "xx: yy2: nnn" comes before "xx: yy10: nnn".
+    if(n1 === n2) return 0;
+    if(key) {
+      // NOTE: Replacing link and constraint arrows by two prefixers
+      // ensures that sort wil be first on FROM node, and then on TO node.
+      const p2 = UI.PREFIXER + UI.PREFIXER;
+      // Keys for links and constraints are not based on their names,
+      // so look up their names before comparing.
+      if(n1.indexOf('____') > 0 && MODEL.constraints[n1]) {
+        n1 = MODEL.constraints[n1].displayName
+            .replace(UI.CONSTRAINT_ARROW, p2);
+      } else if(n1.indexOf('___') > 0 && MODEL.links[n1]) {
+        n1 = MODEL.links[n1].displayName
+            .replace(UI.LINK_ARROW, p2);
+      }
+      if(n2.indexOf('____') > 0 && MODEL.constraints[n2]) {
+        n2 = MODEL.constraints[n2].displayName.
+            replace(UI.CONSTRAINT_ARROW, p2);
+      } else if(n2.indexOf('___') > 0 && MODEL.links[n2]) {
+        n2 = MODEL.links[n2].displayName
+            .replace(UI.LINK_ARROW, p2);
+      }
+      n1 = n1.toLowerCase().replaceAll(' ', '_');
+      n2 = n2.toLowerCase().replaceAll(' ', '_');
+    }
+    const
+        pan1 = UI.prefixesAndName(n1, key),
+        pan2 = UI.prefixesAndName(n2, key),
+        sl = Math.min(pan1.length, pan2.length);
+    let i = 0;
+    while(i < sl) {
+      const c = compareWithTailNumbers(pan1[i], pan2[i]);
+      if(c !== 0) return c;
+      i++;
+    }
+    return pan1.length - pan2.length;
+  }
+
+  
   nameToID(name) {
     // Returns a name in lower case with link arrow replaced by three
     // underscores, constraint link arrow by four underscores, and spaces

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

@@ -7356,7 +7356,8 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
     // is passed to differentiate between the DOM elements to be used
     const
         type = document.getElementById(prefix + 'variable-obj').value,
-        n_list = this.namesByType(VM.object_types[type]).sort(ciCompare),
+        n_list = this.namesByType(VM.object_types[type]).sort(
+            (a, b) => UI.compareFullNames(a, b)),
         vn = document.getElementById(prefix + 'variable-name'),
         options = [];
     // Add "empty" as first and initial option, but disable it.
@@ -7398,7 +7399,7 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
           slist.push(d.modifiers[m].selector);
         }
         // Sort to present equations in alphabetical order
-        slist.sort(ciCompare);
+        slist.sort((a, b) => UI.compareFullNames(a, b));
         for(let i = 0; i < slist.length; i++) {
           options.push(`<option value="${slist[i]}">${slist[i]}</option>`);
         }
@@ -9900,13 +9901,7 @@ class GUIDatasetManager extends DatasetManager {
         dl = [],
         dnl = [],
         sd = this.selected_dataset,
-        ioclass = ['', 'import', 'export'],
-        ciPrefixCompare = (a, b) => {
-            const
-                pa = a.split(':_').join('  '),
-                pb = b.split(':_').join('  ');
-            return ciCompare(pa, pb);
-          };
+        ioclass = ['', 'import', 'export'];
     for(let d in MODEL.datasets) if(MODEL.datasets.hasOwnProperty(d) &&
          // NOTE: do not list "black-boxed" entities
         !d.startsWith(UI.BLACK_BOX) &&
@@ -9917,7 +9912,7 @@ class GUIDatasetManager extends DatasetManager {
         dnl.push(d);
       }
     }
-    dnl.sort(ciPrefixCompare);
+    dnl.sort((a, b) => UI.compareFullNames(a, b, true));
     // First determine indentation levels, prefixes and names 
     const
         indent = [],
@@ -10678,7 +10673,7 @@ class GUIDatasetManager extends DatasetManager {
     const
         ln =  document.getElementById('series-line-number'),
         lc =  document.getElementById('series-line-count');
-    ln.innerHTML = this.series_data.value.substr(0,
+    ln.innerHTML = this.series_data.value.substring(0,
         this.series_data.selectionStart).split('\n').length;
     lc.innerHTML = this.series_data.value.split('\n').length;
   }
@@ -12190,7 +12185,7 @@ class GUISensitivityAnalysis extends SensitivityAnalysis {
       const
           ds_dict = MODEL.listOfAllSelectors,
           html = [],
-          sl = Object.keys(ds_dict).sort(ciCompare);
+          sl = Object.keys(ds_dict).sort((a, b) => UI.compareFullNames(a, b, true));
       for(let i = 0; i < sl.length; i++) {
         const
             s = sl[i],
@@ -13175,7 +13170,7 @@ class GUIExperimentManager extends ExperimentManager {
       for(let i = 0; i < x.variables.length; i++) {
         addDistinct(x.variables[i].displayName, vl); 
       }
-      vl.sort(ciCompare);
+      vl.sort((a, b) => UI.compareFullNames(a, b));
       for(let i = 0; i < vl.length; i++) {
         ol.push(['<option value="', vl[i], '"',
             (vl[i] == x.selected_variable ? ' selected="selected"' : ''),
@@ -15524,7 +15519,7 @@ class Finder {
           }
         }
       }
-      enl.sort(ciCompare);
+      enl.sort((a, b) => UI.compareFullNames(a, b, true));
     }
     document.getElementById('finder-entity-imgs').innerHTML = imgs;
     let seid = 'etr';
@@ -15921,7 +15916,7 @@ class Finder {
           // No cost price calculation => trim associated attributes from header
           let p = ah.indexOf('\tCost price');
           if(p > 0) {
-            ah = ah.substr(0, p);
+            ah = ah.substring(0, p);
           } else {
             // SOC is exogenous, and hence comes before F in header => replace
             ah = ah.replace('\tShare of cost', '');
@@ -16191,7 +16186,7 @@ class GUIReceiver {
           return response.text();
         })
       .then((data) => {
-          // For experiments, only display server response if warning or error
+          // For experiments, only display server response if warning or error.
           UI.postResponseOK(data, !RECEIVER.experiment);
           // If execution completed, perform the call-back action if the
           // receiver is active (so not when auto-reporting a run).

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

@@ -2940,24 +2940,72 @@ class LinnyRModel {
   }
 
   get outputData() {
-    // Returns model results [data, statistics] in tab-separated format
-    // First create list of distinct variables used in charts
-    const vbls = [];
+    // Returns model results [data, statistics] in tab-separated format.
+    const
+        vbls = [],
+        names = [],
+        scale_re = /\s+\(x[0-9\.\,]+\)$/;
+    // First create list of distinct variables used in charts.
+    // NOTE: Also include those that are not "visible" in a chart.
     for(let i = 0; i < this.charts.length; i++) {
       const c = this.charts[i];
       for(let j = 0; j < c.variables.length; j++) {
-        addDistinct(c.variables[j], vbls);
+        let v = c.variables[j],
+            vn = v.displayName;
+        // If variable is scaled, do not include it as such, but include
+        // a new unscaled chart variable.
+        if(vn.match(scale_re)) {
+          vn = vn.replace(scale_re, '');
+          // Add only if (now unscaled) variable has not been added already.
+          if(names.indexOf(vn) < 0) {
+            // NOTE: Chart variable object is used ony as adummy, so NULL
+            // can be used as its "owner chart". 
+            const cv = new ChartVariable(null);
+            cv.setProperties(v.object, v.attribute, false, '#000000');
+            vbls.push(cv);
+            names.push(uvn);
+          }
+        } else if(names.indexOf(vn) < 0) {
+          // Keep track of the dataset and dataset modifier variables,
+          // so they will not be added in the next FOR loop.
+          vbls.push(v);
+          names.push(vn);
+        }
+      }
+    }
+    // Add new variables for each outcome dataset and each equation that
+    // is not a chart variable.
+    for(let id in this.datasets) if(this.datasets.hasOwnProperty(id)) {
+      const
+          ds = this.datasets[id],
+          eq = (ds === this.equations_dataset);
+      if(ds.outcome || eq) {
+        for(let ms in ds.modifiers) if(ds.modifiers.hasOwnProperty(ms)) {
+          const
+              dm = ds.modifiers[ms],
+              n = dm.displayName;
+          // Do not add if already in the list.
+          if(names.indexOf(n) < 0) {
+            // Here, too, NULL can be used as "owner chart". 
+            const cv = new ChartVariable(null);
+            cv.setProperties(ds, dm.selector, false, '#000000');
+            vbls.push(cv);
+          }
+        }
       }
     }
-    // Create a new chart (without adding it to this model)
+    // 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();
     for(let i = 0; i < vbls.length; i++) {
       const v = vbls[i];
       c.addVariable(v.object.displayName, v.attribute);
     }
-    c.draw();
+    // NOTE: Call `draw` with FALSE to prevent display in the chart manager.
+    c.draw(false);
+    // After drawing, all variables and their statistics have been computed.
     return [c.dataAsString, c.statisticsAsString];
-    // @@@TO DO: also add statistics on "outcome" datasets 
   }
     
   get listOfAllSelectors() {
@@ -5278,14 +5326,14 @@ class NodeBox extends ObjectWithXYWH {
     MODEL.replaceEntityInExpressions(old_name, this.displayName);
     MODEL.inferIgnoredEntities();
     // NOTE: Renaming may affect the node's display size.
-    if(this.resize()) this.drawWithLinks();
+    if(this.resize()) UI.drawSelection(MODEL);
     // NOTE: Only TRUE indicates a successful (cosmetic) name change.
     return true;
   }
   
   resize() {
-    // Resizes this node; returns TRUE iff size has changed
-    // So keep track of original width and height
+    // Resizes this node; returns TRUE iff size has changed.
+    // Therefore, keep track of original width and height.
     const
         ow = this.width,
         oh = this.height,
@@ -5341,12 +5389,13 @@ class NodeBox extends ObjectWithXYWH {
   }
   
   drawWithLinks() {
-    // TO DO: also draw relevant arrows when this is a cluster
+    // TO DO: Also draw relevant arrows when this is a cluster.
     UI.drawObject(this);
     if(this instanceof Cluster) return;
-    // draw ALL arrows associated with this node
+    // Draw ALL arrows associated with this node.
     const fc = this.cluster;
-    // make list of arrows that represent a link related to this node
+    fc.categorizeEntities();
+    // Make list of arrows that represent a link related to this node.
     let a,
         alist = [];
     for(let j = 0; j < fc.arrows.length; j++) {
@@ -5362,7 +5411,7 @@ class NodeBox extends ObjectWithXYWH {
         }
       }
     }
-    // draw all arrows in this list
+    // Draw all arrows in this list.
     for(let i = 0; i < alist.length; i++) UI.drawObject(alist[i]);
   }
   
@@ -7323,7 +7372,7 @@ class Process extends Node {
       // without comments or their (X, Y) position
       n = MODEL.black_box_entities[id];
       // `n` is just the name, so remove the actor name if it was added
-      if(an) n = n.substr(0, n.lastIndexOf(an));
+      if(an) n = n.substring(0, n.lastIndexOf(an));
       col = true;
       cmnts = '';
       x = 0;
@@ -8829,10 +8878,11 @@ class ChartVariable {
     this.non_zero_tally = 0;
     this.exceptions = 0;
     this.bin_tallies = [];
+    this.wildcard_index = false;
   }
   
   setProperties(obj, attr, stck, clr, sf=1, lw=1, vis=true) {
-    // Sets the defining properties for this chart variable
+    // Sets the defining properties for this chart variable.
     this.object = obj;
     this.attribute = attr;
     this.stacked = stck;
@@ -8844,12 +8894,18 @@ class ChartVariable {
   
   get displayName() {
     // Returns the name of the Linny-R entity and its attribute, followed
-    // by its scale factor unless it equals 1 (no scaling)
+    // by its scale factor unless it equals 1 (no scaling).
     const sf = (this.scale_factor === 1 ? '' :
         ` (x${VM.sig4Dig(this.scale_factor)})`);
-    // NOTE: display name of equation is just the equations dataset modifier
-    if(this.object === MODEL.equations_dataset) return this.attribute + sf;
-    // NOTE: do not display vertical bar if no attribute is specified
+    // NOTE: Display name of equation is just the equations dataset modifier.
+    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;
   }
@@ -8919,7 +8975,7 @@ class ChartVariable {
   }
 
   computeVector() {
-    // Compute vector for this variable (using run results if specified)
+    // Compute vector for this variable (using run results if specified).
     let xrun = null,
         rr = null,
         ri = this.chart.run_index;
@@ -8934,10 +8990,10 @@ class ChartVariable {
         this.vector.length = 0;
       }
     }
-    // Compute vector and statistics only if vector is still empty
+    // 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 should
-    // not be included in statistics
+    // NOTE: expression vectors start at t = 0 with initial values that
+    // should not be included in statistics.
     let v,
         av = null,
         t_end;
@@ -8948,22 +9004,23 @@ class ChartVariable {
     this.non_zero_tally = 0;
     this.exceptions = 0;
     if(rr) {
-      // Use run results (time scaled) as "actual vector" `av` for this variable
+      // Use run results (time scaled) as "actual vector" `av` for this
+      // variable.
       const tsteps = Math.ceil(this.chart.time_horizon / this.chart.time_scale);
       av = [];
-      // NOTE: scaleData expects "pure" data, so slice off v[0]
+      // NOTE: `scaleDataToVector` expects "pure" data, so slice off v[0].
       VM.scaleDataToVector(rr.vector.slice(1), av, xrun.time_step_duration,
           this.chart.time_scale, tsteps, 1);
       t_end = tsteps;
     } else {
       // Get the variable's own value (number, vector or expression)
-      // Special case: when an experiment is running, variables that depict a
-      // dataset with no explicit modifier must recompute the vector using the
-      // current experiment run combination
+      // Special case: when an experiment is running, variables that
+      // depict a dataset with no explicit modifier must recompute the
+      // vector using the current experiment run combination.
       if(MODEL.running_experiment &&
           this.object instanceof Dataset && !this.attribute) {
         // Check if dataset modifiers match the combination of selectors
-        // for the active run
+        // for the active run.
         const mm = this.object.matchingModifiers(
             MODEL.running_experiment.activeCombination);
         // If so, use the first (the list should contain at most 1 selector)
@@ -8982,21 +9039,24 @@ class ChartVariable {
       }
       t_end = MODEL.end_period - MODEL.start_period + 1;
     }
-    // NOTE: when a chart combines run results with dataset vectors, the latter
-    // may be longer than the # of time steps displayed in the chart
+    // 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;
     for(let t = 0; t <= t_end; t++) {
-      // Get the result, store it, and incorporate it in statistics
+      // Get the result, store it, and incorporate it in statistics.
       if(!av) {
         // Undefined attribute => zero (no error)
         v = 0;
       } else if(Array.isArray(av)) {
-        // Attribute value is a vector -- may be shorter than t => then use 0
+        // Attribute value is a vector.
+        // NOTE: This vector may be shorter than t; then use 0.
         v = (t < av.length ? av[t] : 0);
       } else if(av instanceof Expression) {
-        // Attribute value is an expression
-        v = av.result(t);
+        // Attribute value is an expression. If this chart variable has
+        // its wildcard vector index set, evaluate the expression with
+        // this index as context number.
+        v = av.result(t, this.wildcard_index);
       } else {
         // Attribute value must be a number
         v = av;
@@ -9165,7 +9225,7 @@ class Chart {
   
   variableIndexByName(n) {
     for(let i = 0; i < this.variables.length; i++) {
-      if(this.variables[i].displayName == n) return i;
+      if(this.variables[i].displayName === n) return i;
     }
     return -1;
   }
@@ -9190,20 +9250,39 @@ class Chart {
     if(n === UI.EQUATIONS_DATASET_NAME) {
       // For equations only the attribute (modifier selector)
       dn = a;
+      n = a;
     } else if(!a) {
       // If no attribute specified (=> dataset) only the entity name
       dn = n;
     }
     let vi = this.variableIndexByName(dn);
     if(vi >= 0) return vi;
-    // check whether name refers to a Linny-R entity defined by the model
+    // Check whether name refers to a Linny-R entity defined by the model.
     let obj = MODEL.objectByName(n);
     if(obj === null) {
       UI.warn(`Unknown entity "${n}"`);
       return null;
-    } else {
-      // no attribute specified? then assume default
+    }
+    const eq = obj instanceof DatasetModifier;
+    if(!eq) {
+      // No equation and no attribute specified? Then assume default.
       if(a === '') a = obj.defaultAttribute;
+    } else if(n.indexOf('??') >= 0) {
+      // Special case: for wildcard equations, add dummy variables
+      // for each vector in the wildcard vector set of the equation
+      // expression.
+      const
+          vlist = [],
+          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(MODEL.equations_dataset, dn, false, clr);
+        v.wildcard_index = parseInt(indices[i]);
+        this.variables.push(v);
+        vlist.push(v);
+      }
+      return vlist;
     }
     const v = new ChartVariable(this);
     v.setProperties(obj, a, false, this.nextAvailableDefaultColor, 1, 1);
@@ -9296,7 +9375,7 @@ class Chart {
     return VM.sig2Dig(s / 8760) + 'y';
   }
   
-  draw() {
+  draw(display=true) {
     // NOTE: The SVG drawing area is fixed to be 500 pixels high, so that
     // when saved as a file, it will (at 300 dpi) be about 2 inches high.
     // Its width will equal its hight times the W/H-ratio of the chart
@@ -9471,6 +9550,10 @@ class Chart {
       } 
     }
 
+    // Now all vectors have been computed. If `display` is FALSE, this
+    // indicates that data is used only to save model results.
+    if(!display) return;
+    
     // Define the bins when drawing as histogram
     if(this.histogram) {
       this.value_range = maxv - minv;

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

@@ -124,9 +124,9 @@ function msecToTime(msec) {
   const ts = new Date(msec).toISOString().slice(11, -1).split('.');
   let hms = ts[0], ms = ts[1];
   // Trim zero hours and minutes
-  while(hms.startsWith('00:')) hms = hms.substr(3);
+  while(hms.startsWith('00:')) hms = hms.substring(3);
   // Trim leading zero on first number
-  if(hms.startsWith('00')) hms = hms.substr(1);
+  if(hms.startsWith('00')) hms = hms.substring(1);
   // Trim msec when minutes > 0
   if(hms.indexOf(':') > 0) return hms;
   // If < 1 second, return as milliseconds
@@ -173,7 +173,7 @@ function uniformDecimals(data) {
       ss = v.split('e');
       x = ss[1];
       if(x.length < maxe) {
-        x = x[0] + '0' + x.substr(1);
+        x = x[0] + '0' + x.substring(1);
       }
       data[i] = ss[0] + 'e' + x;
     } else if(maxi > 3) {
@@ -478,6 +478,21 @@ function matchingNumber(m, s) {
   return (n == m ? n : false);
 }
 
+function compareWithTailNumbers(s1, s2) {
+  // Returns 0 on equal, an integer < 0 if `s1` comes before `s2`, and
+  // an integer > 0 if `s2` comes before `s1`.
+  if(s1 === s2) return 0;
+  let tn1 = endsWithDigits(s1),
+      tn2 = endsWithDigits(s2);
+  if(tn1) s1 = s1.slice(0, -tn1.length);
+  if(tn2) s2 = s2.slice(0, -tn2.length);
+  let c = ciCompare(s1, s2);
+  if(c !== 0 || !(tn1 || tn2)) return c;
+  if(tn1 && tn2) return parseInt(tn1) - parseInt(tn2);
+  if(tn2) return -1;
+  return 1;
+}
+
 function compareSelectors(s1, s2) {
   // Dataset selectors comparison is case-insensitive, and puts wildcards
   // last, where * comes later than ?
@@ -492,7 +507,7 @@ function compareSelectors(s1, s2) {
       star2 = s2.indexOf('*');
   if(star1 >= 0) {
     if(star2 < 0) return 1;
-    return s1.localeCompare(s2);
+    return ciCompare(s1, s2);
   }
   if(star2 >= 0) return -1;  
   // Replace ? by | because | has a higher ASCII value than all other chars
@@ -525,7 +540,7 @@ function compareSelectors(s1, s2) {
   while(i >= 0 && s_1[i] === '-') i--;
   // If trailing minuses, replace by as many spaces and add an exclamation point
   if(i < n - 1) {
-    s_1 = s_1.substr(0, i);
+    s_1 = s_1.substring(0, i);
     while(s_1.length < n) s_1 += ' ';
     s_1 += '!';
   }
@@ -534,7 +549,7 @@ function compareSelectors(s1, s2) {
   i = n - 1;
   while(i >= 0 && s_2[i] === '-') i--;
   if(i < n - 1) {
-    s_2 = s_2.substr(0, i);
+    s_2 = s_2.substring(0, i);
     while(s_2.length < n) s_2 += ' ';
     s_2 += '!';
   }
@@ -814,8 +829,9 @@ function stringToFloatArray(s) {
       a = [];
   while(i <= s.length) {
     const
-        h = s.substr(i - 8, 8),
-        r = h.substr(6, 2) + h.substr(4, 2) + h.substr(2, 2) + h.substr(0, 2);
+        h = s.substring(i - 8, i),
+        r = h.substring(6, 2) + h.substring(4, 2) +
+            h.substring(2, 2) + h.substring(0, 2);
     a.push(hexToFloat(r));
     i += 8;
   }
@@ -830,7 +846,7 @@ function hexToBytes(hex) {
   // Converts a hex string to a Uint8Array
   const bytes = [];
   for(let i = 0; i < hex.length; i += 2) {
-    bytes.push(parseInt(hex.substr(i, 2), 16));
+    bytes.push(parseInt(hex.substring(i, i + 2), 16));
   }
   return new Uint8Array(bytes);
 }

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

@@ -713,14 +713,14 @@ class ExpressionParser {
         //  t (current time step, this is the default),
         if('#cfijklnprst'.includes(offs[0].charAt(0))) {
           anchor1 = offs[0].charAt(0);
-          offset1 = safeStrToInt(offs[0].substr(1)); 
+          offset1 = safeStrToInt(offs[0].substring(1)); 
         } else {
           offset1 = safeStrToInt(offs[0]); 
         }
         if(offs.length > 1) {
           if('#cfijklnprst'.includes(offs[1].charAt(0))) {
             anchor2 = offs[1].charAt(0);
-            offset2 = safeStrToInt(offs[1].substr(1));
+            offset2 = safeStrToInt(offs[1].substring(1));
           } else {
             offset2 = safeStrToInt(offs[1]); 
           }
@@ -757,7 +757,7 @@ class ExpressionParser {
           };
         // NOTE: name should then be in the experiment's variable list
         name = s[1].trim();
-        s = s[0].substr(1);
+        s = s[0].substring(1);
         // Check for scaling method
         // NOTE: simply ignore $ unless it indicates a valid method
         const msep = s.indexOf('$');
@@ -967,6 +967,10 @@ class ExpressionParser {
           return false;
         }
       }
+/*
+      // DEPRECATED -- Modeler can deal with this by smartly using AND
+      // clauses like "&x: &y:" to limit set to specific prefixes.
+      
       // Deal with "prefix inheritance" when pattern starts with a colon.
       if(pat.startsWith(':') && this.owner_prefix) {
         // Add a "must start with" AND condition to all OR clauses of the
@@ -979,6 +983,7 @@ class ExpressionParser {
         }
         pat = oc.join('|');
       }
+*/
       // NOTE: For patterns, assume that # *always* denotes the context-
       // sensitive number #, because if modelers wishes to include
       // ANY number, they can make their pattern less selective.
@@ -1449,7 +1454,7 @@ class ExpressionParser {
         this.los = 1;
         this.error = 'Missing closing bracket \']\'';
       } else {
-        v = this.expr.substr(this.pit + 1, i - 1 - this.pit);
+        v = this.expr.substring(this.pit + 1, i);
         this.pit = i + 1;
         // NOTE: Enclosing brackets are also part of this symbol
         this.los = v.length + 2;
@@ -1467,7 +1472,7 @@ class ExpressionParser {
         this.los = 1;
         this.error = 'Unmatched quote';
       } else {
-        v = this.expr.substr(this.pit + 1, i - 1 - this.pit);
+        v = this.expr.substring(this.pit + 1, i);
         this.pit = i + 1;
         // NOTE: Enclosing quotes are also part of this symbol
         this.los = v.length + 2;
@@ -1520,7 +1525,7 @@ class ExpressionParser {
         this.los++;
       }
       // ... but trim spaces from the symbol
-      v = this.expr.substr(this.pit, this.los).trim();
+      v = this.expr.substring(this.pit, this.pit + this.los).trim();
       // Ignore case
       l = v.toLowerCase();
       if(l === '#') {
@@ -5929,7 +5934,9 @@ function VMI_push_dataset_modifier(x, args) {
       // NOTE: Use the "local" time step for expression x, i.e., the top
       // value of the expression's time step stack `x.step`.
       tot = twoOffsetTimeStep(x.step[x.step.length - 1],
-          args[1], args[2], args[3], args[4], 1, x);
+          args[1], args[2], args[3], args[4], 1, x),
+      // Record whether either anchor uses the context-sensitive number.
+      hashtag_index = (args[1] === '#' || args[3] === '#');
   // NOTE: Sanity check to facilitate debugging; if no dataset is provided,
   // the script will still break at the LET statement below.
   if(!ds) console.log('ERROR: VMI_push_dataset_modifier without dataset',
@@ -5947,7 +5954,7 @@ function VMI_push_dataset_modifier(x, args) {
       t = t % obj.length;
       if(t < 0) t += obj.length;
     }
-    if(args[1] === '#' || args[3] === '#') {
+    if(hashtag_index) {
       // NOTE: Add 1 because (parent) anchors are 1-based.
       ds.parent_anchor = t + 1;
       if(DEBUGGING) {
@@ -5991,12 +5998,21 @@ function VMI_push_dataset_modifier(x, args) {
     if(t >= 0 && t < obj.length) {
       v = obj[t];
     } else if(ds.array && t >= obj.length) {
-      // Set error value if array index is out of bounds.
-      v = VM.ARRAY_INDEX;
-      VM.out_of_bounds_array = ds.displayName;
-      VM.out_of_bounds_msg = `Index ${VM.sig2Dig(t + 1)} not in array dataset ` +
-          `${ds.displayName}, which has length ${obj.length}`;
-      console.log(VM.out_of_bounds_msg);
+      // Ensure that value of t is human-readable.
+      // NOTE: Add 1 to compensate for earlier t-- to make `t` zero-based.
+      const index = VM.sig2Dig(t + 1);
+      // Special case: index is undefined because # was undefined.
+      if(hashtag_index && index === '\u2047') {
+        // In such cases, return the default value of the dataset.
+        v = ds.default_value;
+      } else {
+        // Set error value to indicate that array index is out of bounds.
+        v = VM.ARRAY_INDEX;
+        VM.out_of_bounds_array = ds.displayName;
+        VM.out_of_bounds_msg = `Index ${index} not in array dataset ` +
+            `${ds.displayName}, which has length ${obj.length}`;
+        console.log(VM.out_of_bounds_msg);
+      }
     }
     // Fall through: no change to `v` => dataset default value is pushed.
   } else {