linny-r 1.6.1 → 1.6.3

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

@@ -2312,17 +2312,18 @@ class Paper {
     }
     if(prod.hasBounds) {
       font_color = 'black';
-      // By default, "plain" factors having bounds are filled in silver
+      // By default, "plain" factors having bounds are filled in silver.
       fill_color = this.palette.has_bounds;
       // Use relative distance to bounds so that 100000.1 is not shown
-      // as overflow, but 100.1 is
+      // as overflow, but 100.1 is.
       let udif = this.relDif(l, ub),
           ldif = this.relDif(lb, l);
-      // Special case: for LB = 0, use the ON/OFF threshold
+      // Special case: for LB = 0, use the ON/OFF threshold.
       if(Math.abs(lb) <= VM.SIG_DIF_LIMIT &&
           Math.abs(l) <= VM.ON_OFF_THRESHOLD) ldif = 0;
       if(MODEL.solved) {
-        // NOTE: use bright red and blue colors in case of "stock level out of bounds"
+        // NOTE: Use bright red and blue colors in case of "stock level
+        // out of bounds".
         if(ub < VM.PLUS_INFINITY && l < VM.UNDEFINED && udif > VM.SIG_DIF_LIMIT) {
           fill_color = this.palette.above_upper_bound;
           font_color = 'blue';
@@ -2332,51 +2333,52 @@ class Paper {
         } else if(l < VM.ERROR || l > VM.EXCEPTION) {
           font_color = this.palette.VM_error;
         } else if(l < VM.UNDEFINED) {
-          // Shades of green reflect whether level within bounds, where
+          // Shades of green reflect whether level is within bounds, where
           // "sources" (negative level) and "sinks" (positive level) are
-          // shown as more reddish / bluish shades of green
+          // shown as more reddish / bluish shades of green.
           if(l < -VM.ON_OFF_THRESHOLD) {
             fill_color = this.palette.neg_within_bounds;
           } else if(l > VM.ON_OFF_THRESHOLD) {
             fill_color = this.palette.pos_within_bounds;
           } else {
-              fill_color = this.palette.zero_within_bounds;
+            fill_color = this.palette.zero_within_bounds;
           }
           if(ub - lb < VM.NEAR_ZERO) {
+            // When LB = UB, fill completely in the color, but ...
             if(prod.isConstant && Math.abs(l) > VM.NEAR_ZERO) {
-              // Non-zero constants have less saturated shades
+              // ... non-zero constants have less saturated shades.
               fill_color = (l < 0 ? this.palette.neg_constant :
                   this.palette.pos_constant);  
             }
           } else if(ub - l < VM.SIG_DIF_LIMIT) {
-            // Black font and darker fill color indicate "at upper bound"
+            // Black font and darker fill color indicate "at upper bound".
             font_color = 'black';
             fill_color = (ub > 0 ? this.palette.at_pos_ub_fill :
                 (ub < 0 ? this.palette.at_neg_ub_fill :
                     this.palette.at_zero_ub_fill));
             at_bound = true;
           } else if (l - lb < VM.SIG_DIF_LIMIT) {
-            // Font and rim color indicate "at upper bound"
+            // Font and rim color indicate "at lower bound".
             font_color = 'black';
             fill_color = (lb > 0 ? this.palette.at_pos_lb_fill :
                 (lb < 0 ? this.palette.at_neg_lb_fill :
                     this.palette.at_zero_lb_fill));
             at_bound = true;
           } else {
-            // set "partial fill" flag if not at lower bound and UB < INF
+            // Set "partial fill" flag if not at lower bound and UB < INF.
             pf = ub < VM.PLUS_INFINITY;
             font_color = this.palette.within_bounds_font;
           }
         }
       } else if(ub - lb < VM.NEAR_ZERO) {
-        // Not solved but equal bounds => probably constants
+        // Not solved but equal bounds => probably constants.
         if(prod.isConstant && Math.abs(ub) > VM.NEAR_ZERO) {
-          // Non-zero constants have less saturated shades
+          // Non-zero constants have less saturated shades.
           fill_color = (ub < 0 ? this.palette.neg_constant :
               this.palette.pos_constant);  
         }
       } else if(l < VM.UNDEFINED) {
-        // Different bounds and initial level set => partial fill
+        // Different bounds and initial level set => partial fill.
         fill_color = this.palette.src_snk;
         pf = true;
         if(ub - l < VM.SIG_DIF_LIMIT || l - lb < VM.SIG_DIF_LIMIT) {
@@ -2418,8 +2420,8 @@ class Paper {
       let npfbg = 'white';
       if(fill_color === this.palette.above_upper_bound ||
           fill_color === this.palette.below_lower_bound ||
-          // NOTE: empty buffers (at level 0) should be entirely white
-          (at_bound && l > VM.ON_OFF_THRESHOLD)) {
+          // NOTE: Empty buffers should be entirely white.
+          (at_bound && l > lb + VM.ON_OFF_THRESHOLD)) {
         npfbg = fill_color;
         pf = false;
       }
@@ -2434,26 +2436,26 @@ class Paper {
           {fill: fill_color, stroke: stroke_color, 'stroke-width': stroke_width,
               'stroke-dasharray': sda, 'stroke-linecap': 'round',
               'rx': hh, 'ry': hh});
-      // NOTE: set fill color to darker shade for partial fill
+      // NOTE: Set fill color to darker shade for partial fill.
       fill_color = (!MODEL.solved ? this.palette.src_snk :
           (l > VM.NEAR_ZERO ? this.palette.above_zero_fill :
               (l < -VM.NEAR_ZERO ? this.palette.below_zero_fill :
                   this.palette.at_zero_fill)));
     }
-    // Add partial fill if appropriate
+    // Add partial fill if appropriate.
     if(pf && l > lb && l < VM.UNDEFINED) {
       // Calculate used part of range (1 = 100%)
       let part,
           range = ub - lb;
       if(l >= VM.PLUS_INFINITY) {
-        // Show exceptions and +INF as "overflow"
+        // Show exceptions and +INF as "overflow".
         part = 1;
         fill_color = this.palette.above_upper_bound;
       } else {
         part = (range > 0 ? (l - lb) / range : 1);
       }
       if(part > 0 && l >= lb) {
-        // Only fill the portion of used range with the fill color
+        // Only fill the portion of used range with the fill color.
         const rad = Math.asin(1 - 2*part);
         prod.shape.addPath(['m', x + hw - hh + (hh - 1.5) * Math.cos(rad),
             ',', y + (hh - 1.5) * Math.sin(rad),
@@ -2467,7 +2469,7 @@ class Paper {
     stroke_color = 'none';
     stroke_width = 0;
     // Sources have a triangle pointing up from the bottom
-    // (in outline if *implicit* source)
+    // (in outline if *implicit* source).
     if(prod.isSourceNode) {
       if(!prod.is_source) {
         fill_color = 'none';
@@ -2479,7 +2481,7 @@ class Paper {
           'stroke-width': stroke_width});
     }
     // Sinks have a triangle pointing down from the top
-    // (in outline if implicit sink)
+    // (in outline if implicit sink).
     if(prod.isSinkNode) {
       if(!prod.is_sink) {
         fill_color = 'none';
@@ -2491,7 +2493,7 @@ class Paper {
           'stroke-width': stroke_width});  
     }
     // Integer level is denoted by enclosing name in large [ and ]
-    // to denote "floor" as well as "ceiling"
+    // to denote "floor" as well as "ceiling".
     if(prod.integer_level) {
       const
           brh = prod.name_lines.split('\n').length * this.font_heights[8] + 4,

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

@@ -170,11 +170,11 @@ class LinnyRModel {
         olist.push(ds.displayName);
       }
     }
-    // ALL equation results are stored, so add all equation selectors...
+    // Also add all outcome equation selectors.
     const dsm = this.equations_dataset.modifiers;
-    // ... except selectors starting with a colon (methods).
+    // Exclude selectors starting with a colon (methods) -- just in case.
     for(let k in dsm) if(dsm.hasOwnProperty(k) && !k.startsWith(':')) {
-      olist.push(dsm[k].selector);
+      if(dsm[k].outcome_equation) olist.push(dsm[k].selector);
     }
     return olist;
   }
@@ -1574,7 +1574,7 @@ class LinnyRModel {
       const
           note = fc.notes[i],
           nbn = note.nearbyNode;
-      note.nearby_pos = (nbn ? {node: nbn, oldx: x, oldy: y} : null);
+      note.nearby_pos = (nbn ? {node: nbn, oldx: nbn.x, oldy: nbn.y} : null);
     }
     for(let i = 0; i < fc.processes.length; i++) {
       move = fc.processes[i].alignToGrid() || move;
@@ -1593,8 +1593,8 @@ class LinnyRModel {
             nbp = note.nearby_pos;
         if(nbp) {
           // Adjust (x, y) so as to retain the relative position.
-          note.x += nbp.node.x - npb.oldx;
-          note.y += nbp.node.y - npb.oldy;
+          note.x += nbp.node.x - nbp.oldx;
+          note.y += nbp.node.y - nbp.oldy;
           note.nearby_pos = null;
         }
       }
@@ -3155,8 +3155,8 @@ class LinnyRModel {
           const
               dm = ds.modifiers[ms],
               n = dm.displayName;
-          // Do not add if already in the list.
-          if(names.indexOf(n) < 0) {
+          // Do not add if already in the list, or equation is not outcome.
+          if(names.indexOf(n) < 0 && (!eq || dm.outcome_equation)) {
             // Here, too, NULL can be used as "owner chart". 
             const cv = new ChartVariable(null);
             // NOTE: For equations, the object is the dataset modifier.
@@ -3169,10 +3169,17 @@ class LinnyRModel {
     // Sort variables by their name.
     vbls.sort((a, b) => UI.compareFullNames(a.displayName, b.displayName));
     // Create a new chart as dummy, so without adding it to this model.
-    const c = new Chart();
+    const
+        c = new Chart(),
+        wcdm = [];
     for(let i = 0; i < vbls.length; i++) {
       const v = vbls[i];
-      c.addVariable(v.object.displayName, v.attribute);
+      // NOTE: Prevent adding wildcard dataset modifiers more than once.
+      if(wcdm.indexOf(v.object) < 0) {
+        if(v.object instanceof DatasetModifier &&
+            v.object.selector.indexOf('??') >= 0) wcdm.push(v.object);
+        c.addVariable(v.object.displayName, v.attribute);
+      }
     }
     // NOTE: Call `draw` with FALSE to prevent display in the chart manager.
     c.draw(false);
@@ -5158,7 +5165,7 @@ class Note extends ObjectWithXYWH {
           // If attribute omitted, use default attribute of entity type.
           const attr = (ena.length > 1 ? ena[1].trim() : obj.defaultAttribute);
           let val = null;
-          // NOTE: for datasets, use the active modifier if no attribute.
+          // NOTE: For datasets, use the active modifier if no attribute.
           if(!attr && obj instanceof Dataset) {
             val = obj.activeModifierExpression;
           } else {
@@ -7894,13 +7901,11 @@ class Product extends Node {
   }
   
   get isConstant() {
-    // Return TRUE if this product is data, has no links to processes,
-    // is not an actor cash flow, and has set LB = UB
+    // Return TRUE if this product is data, is not an actor cash flow,
+    // has no ingoing links, has outgoing links ONLY to data objects,
+    // 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;
-    }
+        this.inputs.length || !this.allOutputsAreData) return false;
     return (this.equal_bounds && this.lower_bound.defined);
   }
 
@@ -8479,7 +8484,7 @@ class DatasetModifier {
     this.dataset = dataset;
     this.selector = selector;
     this.expression = new Expression(dataset, selector, '');
-    this.expression_cache = {};
+    this.outcome_equation = false;
   }
   
   get type() {
@@ -8509,12 +8514,21 @@ class DatasetModifier {
     // NOTE: For some reason, selector may become empty string, so prevent
     // saving such unidentified modifiers.
     if(this.selector.trim().length === 0) return '';
-    return ['<modifier><selector>', xmlEncoded(this.selector),
+    const oe = (this.outcome_equation ? ' outcome="1"' : '');
+    return ['<modifier', oe, '><selector>', xmlEncoded(this.selector),
       '</selector><expression>', xmlEncoded(this.expression.text),
       '</expression></modifier>'].join('');
   }
 
   initFromXML(node) {
+    // NOTE: Up to version 1.6.2, all equations were considered as
+    // outcomes. To maintain upward compatibility, check for the model
+    // version number.
+    if(earlierVersion(MODEL.version, '1.6.3')) {
+      this.outcome_equation = true;
+    } else {
+      this.outcome_equation = nodeParameterValue(node, 'outcome') === '1';
+    }
     this.expression.text = xmlDecoded(nodeContentByTag(node, 'expression'));
     if(IO_CONTEXT) {
       // Contextualize the included expression.
@@ -8826,12 +8840,19 @@ class Dataset {
       this.max = Math.max(this.max, this.data[i]);
       sum += this.data[i];
     }
-    this.mean = sum / this.data.length;
-    let sumsq = 0;
-    for(let i = 0; i < this.data.length; i++) {
-      sumsq += Math.pow(this.data[i] -  this.mean, 2);
+    // NOTE: Avoid small differences due to numerical imprecision.
+    if(this.max - this.min < VM.NEAR_ZERO) {
+      this.max = this.min;
+      this.mean = this.min;
+      this.standard_deviation = 0;
+    } else {
+      this.mean = sum / this.data.length;
+      let sumsq = 0;
+      for(let i = 0; i < this.data.length; i++) {
+        sumsq += Math.pow(this.data[i] -  this.mean, 2);
+      }
+      this.standard_deviation = Math.sqrt(sumsq / this.data.length);
     }
-    this.standard_deviation = Math.sqrt(sumsq / this.data.length);
   }
   
   get statisticsAsString() {
@@ -8847,11 +8868,30 @@ class Dataset {
   
   attributeValue(a) {
     // Return the computed result for attribute `a`.
-    // NOTE: Datasets have ONE attribute (their vector) denoted by the empty
-    // string; all other "attributes" should be modifier selectors, and
-    // their value should be obtained using attributeExpression (see below).
-    if(a === '') return this.vector;
-    return null;
+    // NOTE: Datasets have ONE attribute (their vector) denoted by the
+    // dot ".". All other "attributes" should be modifier selectors,
+    // and their value should be obtained using `attributeExpression(a)`.
+    // The empty string denotes "use default", which may have been set
+    // by the modeler, or may follow from the active combination of a
+    // running experiment.
+    if(a === '') {
+      const x = this.activeModifierExpression;
+      if(x instanceof Expression) {
+        x.compute(0);
+        // Ensure that for dynamic modifier expressions the vector is
+        // fully computed.
+        if(!x.isStatic) {
+          const nt = MODEL.end_period - MODEL.start_period + 1;
+          for(let t = 1; t <= nt; t++) x.result(t);
+        }
+        return x.vector;
+      }
+      // No modifier expression? Then return the dataset vector.
+      return this.vector;
+    }
+    if(a === '.') return this.vector;
+    // Fall-through: return the default value of this dataset.
+    return this.defaultValue;
   }
 
   attributeExpression(a) {
@@ -8881,7 +8921,7 @@ class Dataset {
       console.log('WARNING: Dataset "' + this.name +
           `" has no default selector "${this.default_selector}"`, this.modifiers);
     }
-    // Fall-through: return vector instead of expression.
+    // Fall-through: return the dataset vector.
     return this.vector;
   }
   
@@ -9064,7 +9104,6 @@ class Dataset {
     for(let m in this.modifiers) if(this.modifiers.hasOwnProperty(m)) {
       // NOTE: "empty" expressions for modifiers default to dataset default.
       this.modifiers[m].expression.reset(this.defaultValue);
-      this.modifiers[m].expression_cache = {};
     }
   }
 
@@ -9124,6 +9163,8 @@ class ChartVariable {
     this.non_zero_tally = 0;
     this.exceptions = 0;
     this.bin_tallies = [];
+    // The actual wildcard index is set for each variable that is added
+    // during this "expansion".
     this.wildcard_index = false;
   }
   
@@ -9193,6 +9234,8 @@ class ChartVariable {
     }
     const xml = ['<chart-variable', (this.stacked ? ' stacked="1"' : ''),
         (this.visible ? ' visible="1"' : ''),
+        (this.wildcard_index !== false ?
+            ` wildcard-index="${this.wildcard_index}"` : ''),
         ` sorted="${this.sorted}"`,
         '><object-id>', xmlEncoded(id),
         '</object-id><attribute>', this.attribute,
@@ -9238,6 +9281,9 @@ class ChartVariable {
       UI.warn(`No chart variable entity with ID "${id}"`);
       return false;
     }
+    // For wildcard variables, a subset of wildcard indices may be specified.
+    const wci = nodeParameterValue(node, 'wildcard-index');
+    this.wildcard_index = (wci ? parseInt(wci) : false);
     this.setProperties(
         obj,
         nodeContentByTag(node, 'attribute'),
@@ -9290,23 +9336,11 @@ class ChartVariable {
       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.
-      if(MODEL.running_experiment &&
-          this.object instanceof Dataset && !this.attribute) {
-        // Check if dataset modifiers match the combination of selectors
-        // 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)
-        // to select the modifier expression; otherwise, use the unmodified
-        // vector of the dataset
-        if(mm.length > 0) {
-          av = mm[0].expression;
-        } else {
-          av = this.object.vector;
-        }
+      if(this.object instanceof Dataset && !this.attribute) {
+        // Special case: Variables that depict a dataset with no explicit
+        // modifier selector must recompute the vector using the current
+        // experiment run combination or the default selector.
+        av = this.object.activeModifierExpression;
       } else if(this.object instanceof DatasetModifier) {
         av = this.object.expression;
       } else {
@@ -9322,7 +9356,7 @@ class ChartVariable {
     for(let t = 0; t <= t_end; t++) {
       // Get the result, store it, and incorporate it in statistics.
       if(!av) {
-        // Undefined attribute => zero (no error)
+        // Undefined attribute => zero (no error).
         v = 0;
       } else if(Array.isArray(av)) {
         // Attribute value is a vector.
@@ -9334,19 +9368,19 @@ class ChartVariable {
         // this index as context number.
         v = av.result(t, this.wildcard_index);
       } else {
-        // Attribute value must be a number
+        // Attribute value must be a number.
         v = av;
       }
-      // Map undefined values and all errors to 0
+      // Map undefined values and all errors to 0.
       if(v < VM.MINUS_INFINITY || v > VM.PLUS_INFINITY) {
-        // Do not include values for t = 0 in statistics
+        // Do not include values for t = 0 in statistics.
         if(t > 0) this.exceptions++;
         v = 0;
       }
-      // Scale the value unless run result (these are already scaled!)
+      // Scale the value unless run result (these are already scaled!).
       if(!rr) v *= this.scale_factor;
       this.vector.push(v);
-      // Do not include values for t = 0 in statistics
+      // Do not include values for t = 0 in statistics.
       if(t > 0) {
         if(Math.abs(v) > VM.NEAR_ZERO) {
           this.sum += v;
@@ -9356,17 +9390,24 @@ class ChartVariable {
         this.maximum = Math.max(this.maximum, v);
       }
     }
-    // Compute the mean
-    this.mean = this.sum / t_end;
-    // Compute the variance for t=1, ..., N
-    let sumsq = 0;
-    for(let t = 1; t <= t_end; t++) {
-      v = this.vector[t];
-      // Here, too, ignore exceptional values, and use 0 instead
-      if(v < VM.MINUS_INFINITY || v > VM.PLUS_INFINITY) v = 0;
-      sumsq += Math.pow(v - this.mean, 2);
+    if(this.maximum - this.minimum < VM.NEAR_ZERO) {
+      // Ignore minute differences.
+      this.maximum = this.minimum;
+      this.mean = this.minimum;
+      this.variance = 0;
+    } else {
+      // Compute the mean.
+      this.mean = this.sum / t_end;
+      // Compute the variance for t=1, ..., N.
+      let sumsq = 0;
+      for(let t = 1; t <= t_end; t++) {
+        v = this.vector[t];
+        // Here, too, ignore exceptional values, and use 0 instead.
+        if(v < VM.MINUS_INFINITY || v > VM.PLUS_INFINITY) v = 0;
+        sumsq += Math.pow(v - this.mean, 2);
+      }
+      this.variance = sumsq / t_end;
     }
-    this.variance = sumsq / t_end;
   }
   
   tallyVector() {
@@ -9535,16 +9576,16 @@ class Chart {
   }
 
   addVariable(n, a) {
-    // Adds variable [entity name `n`|attribute `a`] to the chart unless it
-    // is already in the variable list.
+    // Add variable [entity name `n`|attribute `a`] to the chart unless
+    // it is already in the variable list.
     let dn = n + UI.OA_SEPARATOR + a;
-    // Adapt display name for special cases
+    // Adapt display name for special cases.
     if(n === UI.EQUATIONS_DATASET_NAME) {
-      // For equations only the attribute (modifier selector)
+      // For equations only the attribute (modifier selector).
       dn = a;
       n = a;
     } else if(!a) {
-      // If no attribute specified (=> dataset) only the entity name
+      // If no attribute specified (=> dataset) only the entity name.
       dn = n;
     }
     let vi = this.variableIndexByName(dn);
@@ -9559,17 +9600,14 @@ class Chart {
     // No equation and no attribute specified? Then assume default.
     if(!eq && a === '') a = obj.defaultAttribute;
     if(eq && (n.indexOf('??') >= 0 || obj.expression.isMethod)) {
-      // Special case: for wildcard equations and methods, add dummy
-      // variables for each vector in the wildcard vector set of the
-      // expression.
-      const
-          clr = this.nextAvailableDefaultColor,
-          indices = Object.keys(obj.expression.wildcard_vectors);
-      for(let i = 0; i < indices.length; i++) {
-        const v = new ChartVariable(this);
-        v.setProperties(obj, dn, false, clr);
-        v.wildcard_index = parseInt(indices[i]);
-        this.variables.push(v);
+      // Special case: for wildcard equations and methods, prompt the
+      // modeler which wildcard possibilities to add UNLESS this is an
+      // untitled "dummy" chart used to report outcomes.
+      if(this.title) {
+        CHART_MANAGER.promptForWildcardIndices(this, obj);
+      } else {
+        this.addWildcardVariables(obj,
+            Object.keys(obj.expression.wildcard_vectors));
       }
     } else {
       const v = new ChartVariable(this);
@@ -9578,6 +9616,19 @@ class Chart {
     }
     return this.variables.length - 1;
   }
+  
+  addWildcardVariables(dsm, indices) {
+    // For dataset modifier `dsm`, add dummy variables for those vectors
+    // in the wildcard vector set of the expression that are indicated
+    // by the list `indices`.
+    const dn = dsm.displayName;
+    for(let i = 0; i < indices.length; i++) {
+      const v = new ChartVariable(this);
+      v.setProperties(dsm,  dn, false, this.nextAvailableDefaultColor);
+      v.wildcard_index = parseInt(indices[i]);
+      this.variables.push(v);
+    }    
+  }
 
   addSVG(lines) {
     // Appends a string or an array of strings to the SVG
@@ -10396,7 +10447,7 @@ class Chart {
     if(CHART_MANAGER.drawing_chart) {
       return '(chart statistics not calculated yet)';
     }
-    // NOTE: unlike statistics, series data is output in columns
+    // NOTE: Unlike statistics, series data is output in columns.
     const data = [], vbl = [], line = ['t'];
     // First line: column labels (variable names, but time step in first column)
     for(let i = 0; i < this.variables.length; i++) {
@@ -11075,7 +11126,8 @@ class ExperimentRun {
       bm.messages = VM.messages[i];
       this.block_messages.push(bm);
       this.warning_count += bm.warningCount;
-      this.solver_seconds += bm.solver_secs;
+      // NOTE: When set by the VM, `solver_secs` is a string.
+      this.solver_seconds += parseFloat(bm.solver_secs);
     }
   }
   

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

@@ -491,7 +491,9 @@ function matchingNumber(m, s) {
   // Returns an integer value if string `m` matches selector pattern `s`
   // (where asterisks match 0 or more characters, and question marks 1
   // character) and the matching parts jointly denote an integer.
-  let raw = s.replace(/\*/g, '(.*)').replace(/\?/g, '(.)'),
+  // NOTE: A "+" must be escaped, "*" and "?" must become groups.
+  let raw = s.replaceAll('+', '\+')
+          .replace(/\*/g, '(.*)').replace(/\?/g, '(.)'),
       match = m.match(new RegExp(`^${raw}$`)),
       n = '';
   if(match) {
@@ -601,6 +603,18 @@ function compareSelectors(s1, s2) {
   return 0;
 }
 
+function compareCombinations(c1, c2) {
+  // Compare two selector lists.
+  const n = Math.min(c1.length, c2.length);
+  for(let i = 0; i < n; i++) {
+    const cs = compareSelectors(c1[i], c2[i]);
+    if(cs) return cs;
+  }
+  if(c1.length > l) return 1;
+  if(c2.length > l) return -1;
+  return 0;
+}
+
 //
 // Functions that perform set-like operations on lists of string
 //