linny-r 1.5.8 → 1.6.1

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

@@ -159,22 +159,28 @@ class LinnyRModel {
   }
 
   get outcomeNames() {
+    // Return the list of names of experiment outcome variables, i.e.,
+    // datasets that have been designated as outcomes, and all regular
+    // equations (not methods).
     const olist = [];
     for(let k in this.datasets) if(this.datasets.hasOwnProperty(k)) {
       const ds = this.datasets[k];
       if(ds !== this.equations_dataset && ds.outcome) {
-        // NOTE: experiments store only ONE modifier result per run
+        // NOTE: Experiments store only ONE modifier result per run.
         olist.push(ds.displayName);
       }
     }
-    // ALL equation results are stored, so add all equation selectors
+    // ALL equation results are stored, so add all equation selectors...
     const dsm = this.equations_dataset.modifiers;
-    for(let k in dsm) if(dsm.hasOwnProperty(k)) olist.push(dsm[k].selector);
+    // ... except selectors starting with a colon (methods).
+    for(let k in dsm) if(dsm.hasOwnProperty(k) && !k.startsWith(':')) {
+      olist.push(dsm[k].selector);
+    }
     return olist;
   }
   
   get newProcessCode() {
-    // Return the next unused process code
+    // Return the next unused process code.
     const n = this.next_process_number;
     this.next_process_number++;
     // Process codes are decimal number STRINGS
@@ -417,30 +423,67 @@ class LinnyRModel {
   }
   
   setByType(type) {
-    // Returns a "dictionary" object with entities of the specified types
+    // Return a "dictionary" object with entities of the specified types
     if(type === 'Process') return this.processes;
     if(type === 'Product') return this.products;
     if(type === 'Cluster') return this.clusters;
+    // NOTE: the returned "dictionary" also contains the equations dataset
+    if(type === 'Dataset') return this.datasets;
     if(type === 'Link') return this.links;
     if(type === 'Constraint') return this.constraints;
     if(type === 'Actor') return this.actors;
-    // NOTE: the returned "dictionary" also contains the equations dataset
-    if(type === 'Dataset') return this.datasets;
     return {};
   }
-
+  
+  get allEntities() {
+    // Return a "dictionary" of all entities in the model.
+    // NOTE: This includes equations (instances of DatasetModifier) but
+    // not the equations dataset itself.
+    const all = Object.assign({}, this.processes, this.products,
+        this.clusters, this.datasets, this.equations_dataset.modifiers,
+        this.links, this.actors, this.constraints);
+    // Remove the equations dataset from this dictionary
+    delete all[this.equations_dataset.identifier];
+    return all;
+  }
+  
+  get allMethods() {
+    // Return a list with dataset modifiers that are "methods".
+    const
+        list = [],
+        keys = Object.keys(this.equations_dataset.modifiers);
+    for(let i = 0; i < keys.length; i++) {
+      if(keys[i].startsWith(':')) {
+        list.push(this.equations_dataset.modifiers[keys[i]]);
+      }
+    }
+    return list;
+  }
+  
+  endsWithMethod(name) {
+    // Return method (instance of DatasetModifier) if `name` ends with
+    // ":(whitespace)m" for some method having selector ":m".
+    const ml = this.allMethods;
+    for(let i = 0; i < ml.length; i++) {
+      const re = new RegExp(
+          ':\\s*' + escapeRegex(ml[i].selector.substring(1)) + '$', 'i');
+      if(name.match(re)) return ml[i];
+    }
+    return null;
+  }
+  
   entitiesWithAttribute(attr, et='ABCDLPQ') {
-    // Returns a list of entities (of any type) having the specified attribute
+    // Return a list of entities (of any type) having the specified attribute.
     const list = [];
     if(attr === '' && et.indexOf('D') >= 0) {
-      // Only datasets can have a value for "no attribute"
+      // Only datasets can have a value for "no attribute".
       for(let k in this.datasets) if(this.datasets.hasOwnProperty(k)) {
-        // NOTE: ignore the equations dataset
+        // NOTE: Ignore the equations dataset.
         if(this.datasets[k] !== this.equations_dataset) {
           list.push(this.datasets[k]);
         }
       }
-      // No other types of entity, so return this list
+      // No other types of entity, so return this list.
       return list;
     }
     if(VM.process_attr.indexOf(attr) >= 0 && et.indexOf('P') >= 0) {
@@ -477,15 +520,19 @@ class LinnyRModel {
   }
   
   allMatchingEntities(re, attr='') {
-    // NOTE: this routine is computationally intensive as it performs matches
-    // on the display names of entities while iterating over all relevant sets
+    // Return list of enties with a display name that matches RegExp `re`,
+    // and having attribute `attr` if specified.
+    // NOTE: This routine is computationally intensive as it performs
+    // matches on the display names of entities while iterating over all
+    // relevant entity sets.
     const
         me = [],
         res = re.toString();
         
     function scan(dict) {
-      // Try to match all entities in `dict` 
-      for(let k in dict) if(dict.hasOwnProperty(k)) {
+      // Try to match all entities in `dict`.
+      // NOTE: Ignore method identifiers.
+      for(let k in dict) if(dict.hasOwnProperty(k) && !k.startsWith(':')) {
         const
             e = dict[k],
             m = [...e.displayName.matchAll(re)];
@@ -496,26 +543,63 @@ class LinnyRModel {
           for(let i = 1; same && i < m.length; i++) {
             same = parseInt(m[i][1]) === n;
           }
-          // If so, add the entity to the set
+          // If so, add the entity to the set.
           if(same) me.push(e);
         }
       }  
     }
     
-    // Links limit the search (constraints have no attributes => skip)
+    // Links limit the search (constraints have no attributes => skip).
     if(res.indexOf(UI.LINK_ARROW) >= 0) {
       scan(this.links);
     } else {
+      // First get list of matching datasets.
+      scan(this.datasets);
+      if(me.length > 0 && attr) {
+        // If attribute is specified, retain only datasets having a
+        // modifier with selector = `attr`.
+        for(let i = me.length - 1; i >= 0; i--) {
+          if(!me[i].modifiers[attr]) me.splice(i, 1);
+        }
+      }
+      attr = attr.toUpperCase();
       if(!attr || VM.actor_attr.indexOf(attr) >= 0) scan(this.actors);
       if(!attr || VM.cluster_attr.indexOf(attr) >= 0) scan(this.clusters);
-      if(!attr) scan(this.datasets);
       if(!attr || VM.process_attr.indexOf(attr) >= 0) scan(this.processes);
       if(!attr || VM.product_attr.indexOf(attr) >= 0) scan(this.products);
+      // NOTE: Equations cannot have an attribute.
       if(!attr && this.equations_dataset) scan(this.equations_dataset.modifiers);
     }
     return me;
   }
+  
+  entitiesEndingOn(s, attr='') {
+    // Return a list of entities (of any type) having a display name that
+    // ends on string `s`.
+    // NOTE: The current implementation will overlook links having a FROM
+    // node that ends on `s`.
+    const re = new RegExp(escapeRegex(s) + '$', 'gi');
+    return this.allMatchingEntities(re, attr);
+  }
 
+  entitiesInString(s) {
+    // Return a list of entities referenced in string `s`.
+    if(s.indexOf('[') < 0) return [];
+    const
+        el = [],
+        ml = [...s.matchAll(/\[(\{[^\}]+\}){0,1}([^\]]+)\]/g)];
+    for(let i = 0; i < ml.length; i++) {
+      const n = ml[i][2].trim();
+      let sep = n.lastIndexOf('|');
+      if(sep < 0) sep = n.lastIndexOf('@');
+      const
+          en = (sep < 0 ? n : n.substring(0, sep)).trim(),
+          e = this.objectByName(en);
+      if(e) addDistinct(e, el);
+    }
+    return el;
+  }
+  
   get clustersToIgnore() {
     // Returns a "dictionary" with all clusters that are to be ignored
     const cti = {};
@@ -906,6 +990,53 @@ class LinnyRModel {
     return ss.length > 0;
   }
 
+  renamePrefixedDatasets(old_prefix, new_prefix) {
+    // Rename all datasets having the specified old prefix so that they
+    // have the specified new prefix UNLESS this would cause name conflicts.
+    const
+        oldkey = old_prefix.toLowerCase().split(UI.PREFIXER).join(':_'),
+        newkey = new_prefix.toLowerCase().split(UI.PREFIXER).join(':_'),
+        dsl = [];
+    // No change if new prefix is identical to old prefix.
+    if(old_prefix !== new_prefix) { 
+      for(let k in MODEL.datasets) if(MODEL.datasets.hasOwnProperty(k)) {
+        if(k.startsWith(oldkey)) dsl.push(k);
+      }
+      // NOTE: No check for name conflicts needed when name change is
+      // merely some upper/lower case change.
+      if(newkey !== oldkey) {
+        let nc = 0;
+        for(let i = 0; i < dsl.length; i++) {
+          let nk = newkey + dsl[i].substring(oldkey.length);
+          if(MODEL.datasets[nk]) nc++;
+        }
+        if(nc) {
+          UI.warn('Renaming ' + pluralS(dsl.length, 'dataset') +
+              ' would cause ' + pluralS(nc, 'name conflict'));
+          return false;
+        }
+      }
+      // Reset counts of effects of a rename operation.
+      this.entity_count = 0;
+      this.expression_count = 0;
+      // Rename datasets one by one, suppressing notifications.
+      for(let i = 0; i < dsl.length; i++) {
+        const d = MODEL.datasets[dsl[i]];
+        d.rename(d.displayName.replace(old_prefix, new_prefix), false);
+      }
+      let msg = 'Renamed ' + pluralS(dsl.length, 'dataset').toLowerCase();
+      if(MODEL.variable_count) msg += ', and updated ' +
+          pluralS(MODEL.variable_count, 'variable') + ' in ' +
+          pluralS(MODEL.expression_count, 'expression');
+      UI.notify(msg);
+      if(EXPERIMENT_MANAGER.selected_experiment) {
+        EXPERIMENT_MANAGER.selected_experiment.inferVariables();
+      }
+      UI.updateControllerDialogs('CDEFJX');
+    }
+    return true;
+  }
+  
   //
   //  Methods that add an entity to the model
   //
@@ -1430,13 +1561,21 @@ class LinnyRModel {
   //
 
   alignToGrid() {
-    // Move all positioned model elements to the nearest grid point
+    // Move all positioned model elements to the nearest grid point.
     if(!this.align_to_grid) return;
     let move = false;
     const fc = this.focal_cluster;
     // NOTE: Do not align notes to the grid. This will permit more
     // precise positioning, while aligning will not improve the layout
     // of the diagram because notes are not connected to arrows.
+    // However, when notes relate to nearby nodes, preserve their relative
+    // position to this node.
+    for(let i = 0; i < fc.notes.length; i++) {
+      const
+          note = fc.notes[i],
+          nbn = note.nearbyNode;
+      note.nearby_pos = (nbn ? {node: nbn, oldx: x, oldy: y} : null);
+    }
     for(let i = 0; i < fc.processes.length; i++) {
       move = fc.processes[i].alignToGrid() || move;
     }
@@ -1446,11 +1585,25 @@ class LinnyRModel {
     for(let i = 0; i < fc.sub_clusters.length; i++) {
       move = fc.sub_clusters[i].alignToGrid() || move;
     }
-    if(move) UI.drawDiagram(this);
+    if(move) {
+      // Reposition "associated" notes.
+      for(let i = 0; i < fc.notes.length; i++) {
+        const
+            note = fc.notes[i],
+            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.nearby_pos = null;
+        }
+      }
+      UI.drawDiagram(this);
+    }
   }
   
   translateGraph(dx, dy) {
-    // Move all entities in the focal cluster by (dx, dy) pixels
+    // Move all entities in the focal cluster by (dx, dy) pixels.
     if(!dx && !dy) return;
     const fc = this.focal_cluster;
     for(let i = 0; i < fc.processes.length; i++) {
@@ -1469,9 +1622,9 @@ class LinnyRModel {
       fc.notes[i].x += dx;
       fc.notes[i].y += dy;
     }
-    // NOTE: force drawing, because SVG must immediately be downloadable
+    // NOTE: force drawing, because SVG must immediately be downloadable.
     UI.drawDiagram(this);
-    // If dragging, add (dx, dy) to the properties of the top "move" UndoEdit
+    // If dragging, add (dx, dy) to the properties of the top "move" UndoEdit.
     if(UI.dragged_node) UNDO_STACK.addOffset(dx, dy);
   }
 
@@ -1617,8 +1770,8 @@ class LinnyRModel {
         miny = Math.min(miny, obj.y - obj.height / 2);
       }
     }
-    // Translate entire graph if some elements are above and/or left of the
-    // paper edge
+    // Translate entire graph if some elements are above and/or left of
+    // the paper edge.
     if(minx < 0 || miny < 0) {
       // NOTE: limit translation to 5 pixels to prevent "run-away effect"
       this.translateGraph(Math.min(5, -minx), Math.min(5, -miny));
@@ -2055,8 +2208,8 @@ class LinnyRModel {
   }
   
   deleteSelection() {
-    // Removes all selected nodes (with their associated links and constraints)
-    // and selected links
+    // Remove all selected nodes (with their associated links and constraints)
+    // and selected links.
     // NOTE: This method implements the DELETE action, and hence should be
     // undoable. The UndoEdit is created by the calling routine; the methods
     // that actually delete model elements append their XML to the XML attribute
@@ -2064,7 +2217,7 @@ class LinnyRModel {
     let obj,
         fc = this.focal_cluster;
     // Update the documentation manager (GUI only) if selection contains the
-    // current entity
+    // 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--) {
@@ -2964,7 +3117,7 @@ class LinnyRModel {
         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.
+    // NOTE: Also include those that are not checked as "visible".
     for(let i = 0; i < this.charts.length; i++) {
       const c = this.charts[i];
       for(let j = 0; j < c.variables.length; j++) {
@@ -2976,7 +3129,7 @@ class LinnyRModel {
           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
+            // NOTE: Chart variable object is used ony as a dummy, so NULL
             // can be used as its "owner chart". 
             const cv = new ChartVariable(null);
             cv.setProperties(v.object, v.attribute, false, '#000000');
@@ -3028,12 +3181,12 @@ class LinnyRModel {
   }
     
   get listOfAllSelectors() {
-    // Returns list of all dataset modifier selectors as "dictionary" like so:
-    // {selector_1: [list of datasets], ...}
+    // Returns list of all dataset modifier selectors as a "dictionary"
+    // like so: {selector_1: [list of datasets], ...}
     const ds_dict = {};
     for(let k in this.datasets) if(this.datasets.hasOwnProperty(k)) {
       const ds = this.datasets[k];
-      // NOTE: ignore selectors of the equations dataset
+      // NOTE: Ignore selectors of the equations dataset.
       if(ds !== this.equations_dataset) {
         for(let m in ds.modifiers) if(ds.modifiers.hasOwnProperty(m)) {
           const s = ds.modifiers[m].selector;
@@ -3091,6 +3244,29 @@ class LinnyRModel {
         sl.push(this.datasets[obj].displayName, this.datasets[obj].comments);
       }
     }
+    const keys = Object.keys(this.equations_dataset.modifiers); 
+    sl.push('_____Equations');
+    for(let i = 0; i < keys.length; i++) {
+      const m = this.equations_dataset.modifiers[keys[i]];
+      if(!m.selector.startsWith(':')) {
+        sl.push(m.displayName, '`' + m.expression.text + '`\n');
+      }
+    }
+    sl.push('_____Methods');
+    for(let i = 0; i < keys.length; i++) {
+      const m = this.equations_dataset.modifiers[keys[i]];
+      if(m.selector.startsWith(':')) {
+        let markup = '\n\nDoes not apply to any entity.';
+        if(m.expression.eligible_prefixes) {
+          const el = Object.keys(m.expression.eligible_prefixes)
+              .sort(compareSelectors);
+          if(el.length > 0) markup = '\n\nApplies to ' +
+              pluralS(el.length, 'prefixed entity group') +
+              ':\n- ' + el.join('\n- ');
+        }
+        sl.push(m.displayName, '`' + m.expression.text + '`' + markup);
+      }
+    }
     sl.push('_____Charts');
     for(let i = 0; i < this.charts.length; i++) {
       sl.push(this.charts[i].title, this.charts[i].comments);
@@ -4686,7 +4862,7 @@ class ObjectWithXYWH {
 
   alignToGrid() {
     // Align this object to the grid, and return TRUE if this involved
-    // a move
+    // a move.
     const
         ox = this.x,
         oy = this.y,
@@ -4909,7 +5085,7 @@ class Note extends ObjectWithXYWH {
             bar = inner.lastIndexOf('|'),
             arrow = inner.lastIndexOf('->');
         // Special case: [[#]] denotes the number context of this note.
-        if(tag.replace(/\s+/, '') === '[[#]]') {
+        if(inner === '#') {
           this.fields.push(new NoteField(this, tag, this));
           // Done, so move on to the next tag
           continue;
@@ -4937,7 +5113,6 @@ class Note extends ObjectWithXYWH {
           ena = inner.split('|');
         }
         // Look up entity for name and attribute.
-        // NOTE: A leading colon denotes "prefix with cluster name". 
         let en = UI.colonPrefixedName(ena[0].trim(), this.clusterPrefix),
             id = UI.nameToID(en),
             // First try to match `id` with the IDs of wildcard equations,
@@ -4965,9 +5140,14 @@ class Note extends ObjectWithXYWH {
           }
         }
         if(!obj) {
-          UI.warn(`Unknown model entity "${en}"`);
+          const m = MODEL.equations_dataset.modifiers[UI.nameToID(ena[0])];
+          if(m) {
+            UI.warn('Methods cannot be evaluated without prefix');
+          } else {
+            UI.warn(`Unknown model entity "${en}"`);
+          }
         } else if(obj instanceof DatasetModifier) {
-          // NOTE: equations are (for now) dimensionless => unit '1'.
+          // NOTE: equations are (for now) dimenssonless => unit '1'.
           if(obj.dataset !== MODEL.equations_dataset) {
             from_unit = obj.dataset.scale_unit;
             multiplier = MODEL.unitConversionMultiplier(from_unit, to_unit);
@@ -6004,8 +6184,8 @@ class Cluster extends NodeBox {
   }
 
   addProductPosition(p, x=null, y=null) {
-    // Add a product position for product `p` to this cluster unless such pp
-    // already exists; then return this (new) product position
+    // Add a product position for product `p` to this cluster unless such
+    // "pp" already exists, and then return this (new) product position.
     let pp = this.indexOfProduct(p);
     if(pp >= 0) {
       pp = this.product_positions[pp];
@@ -6023,7 +6203,8 @@ class Cluster extends NodeBox {
   }
 
   containsProduct(p) {
-    // Return the subcluster of this cluster that contains product `p`, or null
+    // Return the subcluster of this cluster that contains product `p`,
+    // or NULL if `p` does not occur in this cluster.
     if(this.indexOfProduct(p) >= 0) return this;
     for(let i = 0; i < this.sub_clusters.length; i++) {
       if(this.sub_clusters[i].containsProduct(p)) {
@@ -6379,7 +6560,7 @@ class Cluster extends NodeBox {
     }
 
 /*  DISABLED -- idea was OK but this results in many additional links
-    that clutter the diagram; represemting these lins by block arrows
+    that clutter the diagram; representing these lines by block arrows
     produces better results
     
     // Special case: P1 --> Q with process Q outside this cluster that
@@ -8316,17 +8497,17 @@ class DatasetModifier {
   }
   
   get identifier() {
-    // NOTE: identifier will be unique only for equations
+    // NOTE: Identifier will be unique only for equations.
     return UI.nameToID(this.selector);
   }
   get displayName() {
-    // NOTE: when "displayed", dataset modifiers have their selector as name
+    // NOTE: When "displayed", dataset modifiers have their selector as name.
     return this.selector;
   }
   
   get asXML() {
-    // NOTE: for some reason, selector may become empty string, so prevent
-    // saving such unidentified modifiers
+    // 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),
       '</selector><expression>', xmlEncoded(this.expression.text),
@@ -8336,18 +8517,18 @@ class DatasetModifier {
   initFromXML(node) {
     this.expression.text = xmlDecoded(nodeContentByTag(node, 'expression'));
     if(IO_CONTEXT) {
-      // Contextualize the included expression
+      // Contextualize the included expression.
       IO_CONTEXT.rewrite(this.expression);
     }
   }
 
   get hasWildcards() {
-    // Returns TRUE if this modifier contains wildcards
+    // Return TRUE if this modifier contains wildcards.
     return this.dataset.isWildcardSelector(this.selector);
   }
 
   get numberContext() {
-    // Returns the string to be used to evaluate #.
+    // Return the string to be used to evaluate #.
     // NOTE: If the selector contains wildcards, return "?" to indicate
     // that the value of # cannot be inferred at compile time. 
     if(this.hasWildcards) return '?'; 
@@ -8358,12 +8539,12 @@ class DatasetModifier {
   }
 
   match(s) {
-    // Returns TRUE if string `s` matches with the wildcard pattern of
+    // Return TRUE if string `s` matches with the wildcard pattern of
     // the selector.
     if(!this.hasWildcards) return s === this.selector;
     let re;
     if(this.dataset === MODEL.equations_dataset) {
-      // Equations wildcards only match with digits
+      // Equations wildcards only match with digits.
       re = wildcardMatchRegex(this.selector, true);
     } else {
       // Selector wildcards match with any character, so replace ? by .
@@ -8508,14 +8689,22 @@ class Dataset {
   }
   
   get allModifiersAreStatic() {
-    // Returns TRUE if all modifier expressions are static
+    // Return TRUE if all modifier expressions are static.
     return this.modifiersAreStatic(Object.keys(this.modifiers));
   }
   
+  get mayBeDynamic() {
+    // Return TRUE if this dataset has time series data, or if some of
+    // its modifier expressions are dynamic.
+    return !this.array && (this.data.length > 1 ||
+        (this.data.length > 0 && !this.periodic) ||
+        !this.allModifiersAreStatic);
+  }
+  
   get inferPrefixableModifiers() {
-    // Returns list of dataset modifiers with expressions that do not
+    // Return a list of dataset modifiers with expressions that do not
     // reference any variable and hence could probably better be represented
-    // by a prefixed dataset having the expression value as its default
+    // by a prefixed dataset having the expression value as its default.
     const pml = [];
     if(this !== this.equations_dataset) {
       const sl = this.plainSelectors;
@@ -8525,7 +8714,7 @@ class Dataset {
               m = this.modifiers[sl[i].toLowerCase()],
               x = m.expression;
           // Static expressions without variables can also be used
-          // as dataset default value
+          // as dataset default value.
           if(x.isStatic && x.text.indexOf('[') < 0) pml.push(m);
         }
       }
@@ -8534,13 +8723,13 @@ class Dataset {
   }
 
   get timeStepDuration() {
-    // Returns duration of 1 time step on the time scale of this dataset
+    // Return duration of 1 time step on the time scale of this dataset.
     return this.time_scale * VM.time_unit_values[this.time_unit];
   }
   
   get defaultValue() {
-    // Returns default value *scaled to the model time step*
-    // NOTE: scaling is only needed for the weighted sum method
+    // Return default value *scaled to the model time step*.
+    // NOTE: Scaling is only needed for the weighted sum method.
     if(this.method !== 'w-sum' || this.default_value >= VM.PLUS_INFINITY) {
       return this.default_value;
     }
@@ -8569,8 +8758,8 @@ class Dataset {
     return d.join(';');
   }
   
-  // Returns a string denoting the properties of this dataset.
   get propertiesString() {
+    // Return a string denoting the properties of this dataset.
     if(this.data.length === 0) return '';
     let time_prop;
     if(this.array) {
@@ -8581,12 +8770,12 @@ class Dataset {
         DATASET_MANAGER.method_symbols[
             DATASET_MANAGER.methods.indexOf(this.method)]].join('');
     }
-    // Circular arrow symbolizes "repeating"
+    // Circular arrow symbolizes "repeating".
     return '&nbsp;(' + time_prop + (this.periodic ? '&nbsp;\u21BB' : '') + ')'; 
   }
   
   unpackDataString(str) {
-    // Converts semicolon-separated data to a numeric array.
+    // Convert semicolon-separated data to a numeric array.
     this.data.length = 0;
     if(str) {
       const numbers = str.split(';');
@@ -8599,12 +8788,12 @@ class Dataset {
   }
 
   computeVector() {
-    // Converts data to a vector on the model's time scale, i.e., 1 time step
-    // lasting one unit on the model time scale
+    // Convert data to a vector on the time scale of the model, i.e.,
+    // 1 time step lasting one unit on the model time scale.
     
-    // NOTE: since 9 October 2021, a dataset can also be defined as an "array",
-    // which differs from a time series in that the vector is filled with the
-    // data values "as is" to permit accessing a specific value at index # 
+    // NOTE: A dataset can also be defined as an "array", which differs
+    // from a time series in that the vector is filled with the data values
+    // "as is" to permit accessing a specific value at index #. 
     if(this.array) {
       this.vector = this.data.slice();
       return;
@@ -8612,16 +8801,16 @@ class Dataset {
     // Like all vectors, vector[0] corresponds to initial value, and vector[1]
     // to the model setting "Optimize from step t=..."
     // NOTES:
-    // (1) the first number of a datasets time series is ALWAYS assumed to
+    // (1) The first number of a datasets time series is ALWAYS assumed to
     //     correspond to t=1, whereas the simulation may be set to start later!
-    // (2) model run length includes 1 look-ahead period
+    // (2) Model run length includes 1 look-ahead period.
     VM.scaleDataToVector(this.data, this.vector, this.timeStepDuration,
         MODEL.timeStepDuration, MODEL.runLength, MODEL.start_period,
         this.defaultValue, this.periodic, this.method);
   }
 
   computeStatistics() {
-    // Computes descriptive statistics for data (NOT vector!).
+    // Compute descriptive statistics for data (NOT vector!).
     if(this.data.length === 0) {
       this.min = VM.UNDEFINED;
       this.max = VM.UNDEFINED;
@@ -8646,18 +8835,18 @@ class Dataset {
   }
   
   get statisticsAsString() {
-    // Returns descriptive statistics in human-readable form
+    // Return descriptive statistics in human-readable form.
     let s = 'N = ' + this.data.length;
     if(N > 0) {
-      s += ', range = [' + VM.sig4Dig(this.min) + ', ' + VM.sig4Dig(this.max) +
-          ', mean = ' + VM.sig4Dig(this.mean) + ', s.d. = ' +
-          VM.sig4Dig(this.standard_deviation);
+      s += [', range = [', VM.sig4Dig(this.min), ', ', VM.sig4Dig(this.max),
+          '], mean = ', VM.sig4Dig(this.mean), ', s.d. = ',
+          VM.sig4Dig(this.standard_deviation)].join('');
     }
     return s;
   }
   
   attributeValue(a) {
-    // Returns the computed result for attribute `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).
@@ -8666,9 +8855,9 @@ class Dataset {
   }
 
   attributeExpression(a) {
-    // Returns expression for selector `a` (also considering wildcard
+    // Return the expression for selector `a` (also considering wildcard
     // modifiers), or NULL if no such selector exists.
-    // NOTE: selectors no longer are case-sensitive.
+    // NOTE: Selectors no longer are case-sensitive.
     if(a) {
       const mm = this.matchingModifiers([a]);
       if(mm.length > 0) return mm[0].expression;
@@ -8679,62 +8868,72 @@ class Dataset {
   get activeModifierExpression() { 
     if(MODEL.running_experiment) {
       // If an experiment is running, check if dataset modifiers match the
-      // combination of selectors for the active run
+      // combination of selectors for the active run.
       const mm = this.matchingModifiers(MODEL.running_experiment.activeCombination);
-      // If so, use the first match
+      // If so, use the first match.
       if(mm.length > 0) return mm[0].expression;
     }
     if(this.default_selector) {
-      // If no experiment (so "normal" run), use default selector if specified
+      // If no experiment (so "normal" run), use default selector if specified.
       const dm = this.modifiers[UI.nameToID(this.default_selector)];
       if(dm) return dm.expression;
-      // Exception should never occur, but check anyway and log it 
+      // Exception should never occur, but check anyway and log it.
       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 vector instead of expression.
     return this.vector;
   }
   
   addModifier(selector, node=null, ioc=null) {
     let s = selector;
-    // Firstly, sanitize the selector
+    // First sanitize the selector.
     if(this === MODEL.equations_dataset) {
       // Equation identifiers cannot contain characters that have special
-      // meaning in a variable identifier
+      // meaning in a variable identifier.
       s = s.replace(/[\*\|\[\]\{\}\@\#]/g, '');
       if(s !== selector) {
         UI.warn('Equation name cannot contain [, ], {, }, |, @, # or *');
         return null;
       }
       // Wildcard selectors must be exactly 2 consecutive question marks,
-      // so reduce longer sequences (no warning)
+      // so reduce longer sequences (no warning).
       s = s.replace(/\?\?+/g, '??');
       if(s.split('??').length > 2) {
         UI.warn('Equation name can contain only 1 wildcard');
         return null;
       }
-      // Reduce inner spaces to one, and trim outer spaces
+      // Reduce inner spaces to one, and trim outer spaces.
       s = s.replace(/\s+/g, ' ').trim();
-      // Then prefix it when the IO context argument is defined 
-      if(ioc) s = ioc.actualName(s);
-      // If equation already exists, return its modifier
+      if(s.startsWith(':')) {
+        // Methods must have no spaces directly after their leading colon,
+        // and must not contain other colons.
+        if(s.startsWith(': ')) s = ':' + s.substring(2);
+        if(s.lastIndexOf(':') > 0) {
+          UI.warn('Method name can contain only 1 colon');
+          return null;
+        }
+      } else {
+        // Prefix it when the IO context argument is defined.
+        if(ioc) s = ioc.actualName(s);
+      }
+      // If equation already exists, return its modifier.
       const id = UI.nameToID(s);
       if(this.modifiers.hasOwnProperty(id)) return this.modifiers[id];
-      // New equation identifier must not equal some entity ID
+      // New equation identifier must not equal some entity ID.
       const obj = MODEL.objectByName(s);
       if(obj) {
-        // NOTE: also pass selector, or warning will display dataset name
+        // NOTE: Also pass selector, or warning will display dataset name.
         UI.warningEntityExists(obj);
         return null;
       }
     } else {
       // Standard dataset modifier selectors are much more restricted, but
-      // to be user-friendly, special chars are removed automatically
+      // to be user-friendly, special chars are removed automatically.
       s = s.replace(/[^a-zA-Z0-9\+\-\%\_\*\?]/g, '');
       let msg = '';
       if(s !== selector) msg = UI.WARNING.SELECTOR_SYNTAX;
-      // A selector can only contain 1 star
+      // A selector can only contain 1 star.
       if(s.indexOf('*') !== s.lastIndexOf('*')) msg = UI.WARNING.SINGLE_WILDCARD;
       if(msg) {
         UI.warn(msg);
@@ -8745,12 +8944,12 @@ class Dataset {
       UI.warn(UI.WARNING.INVALID_SELECTOR);
       return null;
     }
-    // Then add a dataset modifier to this dataset
+    // Then add a dataset modifier to this dataset.
     const id = UI.nameToID(s);
     if(!this.modifiers.hasOwnProperty(id)) {
       this.modifiers[id] = new DatasetModifier(this, s);
     }
-    // Finally, initialize it when the XML node argument is defined
+    // Finally, initialize it when the XML node argument is defined.
     if(node) this.modifiers[id].initFromXML(node);
     return this.modifiers[id];
   }
@@ -8774,7 +8973,7 @@ class Dataset {
     for(let i = 0; i < sl.length; i++) {
       ml.push(this.modifiers[sl[i]].asXML);
     }
-    // NOTE: "black-boxed" datasets are stored anonymously without comments
+    // NOTE: "black-boxed" datasets are stored anonymously without comments.
     const id = UI.nameToID(n);
     if(MODEL.black_box_entities.hasOwnProperty(id)) {
       n = MODEL.black_box_entities[id];
@@ -8806,7 +9005,7 @@ class Dataset {
     this.periodic = nodeParameterValue(node, 'periodic') === '1';
     this.array = nodeParameterValue(node, 'array') === '1';
     this.black_box = nodeParameterValue(node, 'black-box') === '1';
-    // NOTE: array-type datasets are by definition input => not an outcome
+    // NOTE: Array-type datasets are by definition input => not an outcome.
     if(!this.array) this.outcome = nodeParameterValue(node, 'outcome') === '1';
     this.url = xmlDecoded(nodeContentByTag(node, 'url'));
     if(this.url) {
@@ -8832,10 +9031,10 @@ class Dataset {
   }
   
   rename(name, notify=true) {
-    // Change the name of this dataset
+    // Change the name of this dataset.
     // When `notify` is FALSE, notifications are suppressed while the
-    // number of affected datasets and expressions are counted
-    // NOTE: prevent renaming the equations dataset (just in case...)
+    // number of affected datasets and expressions are counted.
+    // NOTE: Prevent renaming the equations dataset (just in case).
     if(this === MODEL.equations_dataset) return;
     name = UI.cleanName(name);
     if(!UI.validName(name)) {
@@ -8859,31 +9058,31 @@ class Dataset {
   }
   
   resetExpressions() {
-    // Recalculate vector to adjust to model time scale and run length
+    // Recalculate vector to adjust to model time scale and run length.
     this.computeVector();
-    // Reset all modifier expressions
+    // Reset all modifier expressions.
     for(let m in this.modifiers) if(this.modifiers.hasOwnProperty(m)) {
-      // NOTE: "empty" expressions for modifiers default to dataset default
+      // NOTE: "empty" expressions for modifiers default to dataset default.
       this.modifiers[m].expression.reset(this.defaultValue);
       this.modifiers[m].expression_cache = {};
     }
   }
 
   compileExpressions() {
-    // Recompile all modifier expressions
+    // Recompile all modifier expressions.
     for(let m in this.modifiers) if(this.modifiers.hasOwnProperty(m)) {
       this.modifiers[m].expression.compile();
     }
   }
 
   differences(ds) {
-    // Return "dictionary" of differences, or NULL if none
+    // Return "dictionary" of differences, or NULL if none.
     const d = differences(this, ds, UI.MC.DATASET_PROPS);
-    // Check for differences in data
+    // Check for differences in data.
     if(this.dataString !== ds.dataString) {
       d.data = {A: this.statisticsAsString, B: ds.statisticsAsString};
     }
-    // Check for differences in modifiers
+    // Check for differences in modifiers.
     const mdiff = {};
     for(let m in this.modifiers) if(this.modifiers.hasOwnProperty(m)) {
       const
@@ -8902,7 +9101,7 @@ class Dataset {
         mdiff[m] = [UI.MC.DELETED, dsm.selector, dsm.expression.text];
       }
     }
-    // Only add modifiers property if differences were detected
+    // Only add modifiers property if differences were detected.
     if(Object.keys(mdiff).length > 0) d.modifiers = mdiff; 
     if(Object.keys(d).length > 0) return d;
     return null;
@@ -8911,7 +9110,7 @@ class Dataset {
 } // END of class Dataset
 
 
-// CLASS ChartVariable defines properties of chart time series
+// CLASS ChartVariable defines properties of chart time series.
 class ChartVariable {
   constructor(c) {
     this.chart = c;
@@ -8941,15 +9140,33 @@ 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).
+    // Returns the display name for this variable. This is the name of
+    // the Linny-R entity and its attribute, followed by its scale factor
+    // unless it equals 1 (no scaling).
     const sf = (this.scale_factor === 1 ? '' :
         ` (x${VM.sig4Dig(this.scale_factor)})`);
-    //Display name of equation is just the equations dataset selector. 
+    // Display name of equation is just the equations dataset selector. 
     if(this.object instanceof DatasetModifier) {
       let eqn = this.object.selector;
+      // If for this variable the `wildcard_index` property has been set,
+      // this indicates that it is a Wildcard selector or a method, and
+      // that the specified result vector should be used.
       if(this.wildcard_index !== false) {
-        eqn = eqn.replace('??', this.wildcard_index);
+        // NOTE: A wildcard index (a number) can also indicate that this
+        // variable is a method, so check for a leading colon.
+        if(eqn.startsWith(':')) {
+          // For methods, use "entity name or prefix: method" as variable
+          // name, so first get the method object prefix, expand it if
+          // it identifies a specific model entity, and then append the
+          // method name (leading colon replaced by the prefixer ": ").
+          const
+              mop = this.object.expression.method_object_list[this.wildcard_index],
+              obj = MODEL.objectByID(mop);
+          eqn = (obj ? obj.displayName : (mop || '')) +
+              UI.PREFIXER + eqn.substring(1);
+        } else {
+          eqn = eqn.replace('??', this.wildcard_index);
+        }
       }
       return eqn + sf;
     }
@@ -9319,7 +9536,7 @@ class Chart {
 
   addVariable(n, a) {
     // Adds variable [entity name `n`|attribute `a`] to the chart unless it
-    // is already in the variable list
+    // is already in the variable list.
     let dn = n + UI.OA_SEPARATOR + a;
     // Adapt display name for special cases
     if(n === UI.EQUATIONS_DATASET_NAME) {
@@ -9339,31 +9556,26 @@ class Chart {
       return null;
     }
     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
+    // 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
-          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.setProperties(obj, dn, false, clr);
         v.wildcard_index = parseInt(indices[i]);
         this.variables.push(v);
-        vlist.push(v);
       }
-      return vlist;
-      // FALL-THROUGH: Equation name has no wildcard => use the equation
-      // object (= dataset modifier) as `obj`.
+    } else {
+      const v = new ChartVariable(this);
+      v.setProperties(obj, a, false, this.nextAvailableDefaultColor, 1, 1);
+      this.variables.push(v);
     }
-    const v = new ChartVariable(this);
-    v.setProperties(obj, a, false, this.nextAvailableDefaultColor, 1, 1);
-    this.variables.push(v);
     return this.variables.length - 1;
   }
 
@@ -10767,8 +10979,13 @@ class ExperimentRun {
     }
     // Calculate number of vectors/outcomes/equations to store.
     this.oc_list = MODEL.outcomes;
-    // NOTE: All equations are also considered to be outcomes.
-    this.eq_list = Object.keys(MODEL.equations_dataset.modifiers);
+    // NOTE: All equations are also considered to be outcomes EXCEPT
+    // methods (selectors starting with a colon).
+    this.eq_list = [];
+    const eml = Object.keys(MODEL.equations_dataset.modifiers);
+    for(let i = 0; i < eml.length; i++) {
+      if(!eml[i].startsWith(':')) this.eq_list.push(eml[i]);
+    }
     const
         cv = this.experiment.variables.length,
         oc = this.oc_list.length,
@@ -10807,7 +11024,7 @@ class ExperimentRun {
       // NOTE: This stores results only for "active" selectors (current run).
       this.results.push(new ExperimentRunResult(this, MODEL.outcomes[oi]));
       this.step++;
-      UI.setProgressNeedle(this.step / this.steps);
+      UI.setProgressNeedle(this.step / this.steps, '#d00080');
       setTimeout((x) => x.addOutcomeResults(oi + 1), 0, this);
     } else {
       this.addEquationResults(0);
@@ -10822,7 +11039,7 @@ class ExperimentRun {
       this.results.push(
           new ExperimentRunResult(this, MODEL.equations_dataset, k));      
       this.step++;
-      UI.setProgressNeedle(this.step / this.steps);
+      UI.setProgressNeedle(this.step / this.steps, '#2000d0');
       setTimeout((x) => x.addEquationResults(ei + 1), 0, this);
     } else {
       // Register when this result was stored.
@@ -11544,18 +11761,18 @@ class Experiment {
         return i;
       }
     }
-    // NOTE: variables are stored first, outcomes second, equations last,
+    // NOTE: Variables are stored first, outcomes second, equations last,
     // *while numbering continues*, hence index is position in unsorted
     // variable list, or position in outcome list, where this method
-    // takes into account that experiments store ONE modifier expression per
-    // outcome, and ALL equations
+    // takes into account that experiments store ONE modifier expression
+    // per outcome, and ALL equations except methods.
     const oci = MODEL.outcomeNames.indexOf(dn);
     if(oci >= 0) return oci + this.variables.length;
     return -1;
   }
 
   differences(x) {
-    // Return "dictionary" of differences, or NULL if none
+    // Return "dictionary" of differences, or NULL if none.
     const d = differences(this, x, UI.MC.EXPERIMENT_PROPS);
 /*
     @@TO DO: add diffs for array properties: