linny-r 1.8.2 → 1.9.1

package/package.json

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

package/static/index.html

@@ -750,6 +750,13 @@ NOTE: Unit symbols are case-sensitive, so BTU ≠ Btu">
                    placeholder="1e-4" type="text" autocomplete="off">
           </td>
         </tr>
+        <tr title="When checked, small slack uses are reported in monitor">
+          <td style="padding: 0px; width: 20px">
+            <div id="solver-show-notices" class="box clear"></div>
+          </td>
+          <td style="padding-bottom:4px">Report small slack uses</td>
+          </td>
+        </tr>
       </table>
     </div>
   </div>
@@ -876,7 +883,7 @@ NOTE: Unit symbols are case-sensitive, so BTU &ne; Btu">
             <a href="https://creativecommons.org/licenses/by-sa/4.0"
                target="_blank">
             Creative Commons Attribution-ShareAlike (CC BY-SA) license</a>.
-            <img src="../images/by-sa.svg" style="height:21px; margin-top:3px"> 
+            <img src="images/by-sa.svg" style="height:21px; margin-top:3px"> 
           </td>
         </tr>
       </table>
@@ -908,7 +915,7 @@ NOTE: Unit symbols are case-sensitive, so BTU &ne; Btu">
             <a href="https://creativecommons.org/licenses/by-sa/4.0"
                target="_blank">
             Creative Commons Attribution-ShareAlike (CC BY-SA) license</a>.
-            <img src="../images/by-sa.svg" style="height:21px; margin-top:3px"> 
+            <img src="images/by-sa.svg" style="height:21px; margin-top:3px"> 
           </td>
         </tr>
       </table>
@@ -1848,6 +1855,8 @@ NOTE: * and ? will be interpreted as wildcards"
            title="Edit selected equation">
       <img id="eq-delete-btn" class="btn disab" src="images/delete.png"
            title="Delete selected equation">
+      <img id="eq-view-btn" class="btn enab" src="images/zoom-in.png"
+           title="Switch to multi-line expression display">
     </div>
     <img id="equation-outcome" class="not-selected" src="images/outcome.png"
          title="Click to consider/ignore selected equation as experiment outcome">
@@ -2266,6 +2275,8 @@ NOTE: * and ? will be interpreted as wildcards"
              title="Rename selected experiment">
         <img id="xp-view-btn" class="btn disab" src="images/table.png"
              title="View selected experiment">
+        <img id="xp-order-btn" class="btn enab" src="images/sel-order.png"
+             title="Specify ordering of selectors">
         <img id="xp-reset-btn" class="btn enab off" src="images/reset.png"
              title="Clear results for selected experiment">
         <img id="xp-delete-btn" class="btn disab" src="images/delete.png"
@@ -2429,6 +2440,24 @@ NOTE: * and ? will be interpreted as wildcards"
     </div>
   </div>
 
+  <!-- the SELECTOR ORDER dialog permits specifying how selectors should
+       be sorted. The selectors may contain a leading or trailing * as
+       wildcard, and can be separated by spacrs, comma's or semicolons.
+   -->
+  <div id="sel-order-modal" class="modal">
+    <div id="sel-order-dlg" class="inp-dlg">
+      <div class="dlg-title">
+        Ordering of selectors
+        <img class="ok-btn" src="images/ok.png">
+        <img class="cancel-btn" src="images/cancel.png">
+      </div>
+      <textarea id="sel-order-lines" autocomplete="off"
+         placeholder="Selectors must be separated by spaces or new lines."
+         autocorrect="off" autocapitalize="off" spellcheck="false">
+      </textarea>
+    </div>
+  </div>
+
   <!-- the PARAMETER dialog prompts for a dataset or chart name -->
   <div id="xp-parameter-modal" class="modal">
     <div id="xp-parameter-dlg" class="inp-dlg">

package/static/linny-r.css

@@ -2506,12 +2506,26 @@ td.equation-expression {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  font-family: monospace;
+  font-size: 12px;
 }
 
 td.equation-expression {
   min-width: 60%;
 }
 
+td.equation-expression-multi {
+  border-left: solid 1px Silver;
+  white-space: normal;
+  overflow-x: hidden;
+  overflow-y: auto;
+  text-overflow: ellipsis;
+  font-family: monospace;
+  font-size: 11px;
+  line-height: 13px;
+  max-height: 65px;
+}
+
 #dataset-blackbox {
   position: absolute;
   bottom: 6px;
@@ -4006,6 +4020,17 @@ div.no-colors {
   width: calc(100% - 6px);
 }
 
+#sel-order-dlg {
+  width: 220px;
+  height: min-content;
+}
+
+#sel-order-lines {
+  margin: 2px;
+  width: calc(100% - 4px);
+  height: 220px;
+}
+
 #xp-parameter-dlg {
   width: 270px;
   height: 45px;  

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

@@ -11,7 +11,7 @@ warning or information messages are displayed.
 */
 
 /*
-Copyright (c) 2017-2022 Delft University of Technology
+Copyright (c) 2017-2024 Delft University of Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -1025,7 +1025,12 @@ class GUIController extends Controller {
           ' as preferred solver');
       return;
     }
-    const pd = postData({action: 'change', solver: sid});
+    const pd = postData({
+        action: 'change',
+        solver: sid,
+        user: VM.solver_user,
+        token: VM.solver_token
+      });
     fetch('solver/', pd)
       .then((response) => {
           if(!response.ok) {
@@ -3684,6 +3689,7 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     md.element('preference').innerHTML = html.join('');
     md.element('int-feasibility').value = MODEL.integer_tolerance;
     md.element('mip-gap').value = MODEL.MIP_gap;
+    this.setBox('solver-show-notices', MODEL.show_notices);
     md.show();
   }
   
@@ -3712,6 +3718,7 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     }
     MODEL.integer_tolerance = Math.max(1e-9, Math.min(0.1, itol));
     MODEL.MIP_gap = Math.max(0, Math.min(0.5, mgap));
+    MODEL.show_notices = this.boxChecked('solver-show-notices');
     // Close the dialog.
     md.hide();
   }

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

@@ -54,6 +54,9 @@ class EquationManager {
         'click', () => EQUATION_MANAGER.editEquation());
     document.getElementById('eq-delete-btn').addEventListener(
         'click', () => EQUATION_MANAGER.deleteEquation());
+    this.view_btn = document.getElementById('eq-view-btn');
+    this.view_btn.addEventListener(
+        'click', () => EQUATION_MANAGER.toggleMultiLineDisplay());
     this.outcome_btn = document.getElementById('equation-outcome');
     this.outcome_btn.addEventListener(
         'click', () => EQUATION_MANAGER.toggleOutcome());
@@ -78,6 +81,7 @@ class EquationManager {
         'click', () => EQUATION_MANAGER.clone_modal.hide());
 
     // Initialize the dialog properties
+    this.multi_line = false;
     this.reset();
   }
 
@@ -130,6 +134,19 @@ class EquationManager {
     }
   }
   
+  toggleMultiLineDisplay() {
+    // Toggle between single-line view and multi-line expressions.
+    this.multi_line = !this.multi_line;
+    if(this.multi_line) {
+      this.view_btn.src = 'images/zoom-out.png';
+      this.view_btn.title = 'Switch to single-line expression display';
+    } else {
+      this.view_btn.src = 'images/zoom-in.png';
+      this.view_btn.title = 'Switch to multi-line expression display';
+    }
+    this.updateDialog();
+  }
+  
   updateDialog() {
     // Updates equation list, highlighting selected equation (if any)
     const
@@ -148,10 +165,11 @@ class EquationManager {
           m = ed.modifiers[UI.nameToID(msl[i])],
           wild = (m.selector.indexOf('??') >= 0),
           method = m.selector.startsWith(':'),
+          multi = (this.multi_line ? '-multi' : ''),
           issue = (m.expression.compile_issue ? ' compile-issue' :
               (m.expression.compute_issue ? ' compute-issue' : '')),
           clk = '" onclick="EQUATION_MANAGER.selectModifier(event, \'' +
-              m.selector + '\'',
+              escapedSingleQuotes(m.selector) + '\'',
           mover = (method ? ' onmouseover="EQUATION_MANAGER.showInfo(\'' +
               m.identifier + '\', event.shiftKey);"' : '');
       if(m === sm) smid += i;
@@ -165,7 +183,7 @@ class EquationManager {
           (wild ? ' wildcard' : ''), clk, ', false);"', mover, '>',
           (m.outcome_equation ? '<span class="outcome"></span>' : ''),
           (wild ? wildcardFormat(m.selector) : m.selector),
-          '</td><td class="equation-expression', issue,
+          '</td><td class="equation-expression', multi, issue,
           (issue ? '"title="' +
               safeDoubleQuotes(m.expression.compile_issue ||
                   m.expression.compute_issue) : ''),

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

@@ -46,6 +46,9 @@ class GUIExperimentManager extends ExperimentManager {
     this.view_btn = document.getElementById('xp-view-btn');
     this.view_btn.addEventListener(
         'click', () => EXPERIMENT_MANAGER.viewerMode());
+    this.sel_order_btn = document.getElementById('xp-order-btn');
+    this.sel_order_btn.addEventListener(
+        'click', () => EXPERIMENT_MANAGER.showSelectorOrder());
     this.reset_btn = document.getElementById('xp-reset-btn');
     this.reset_btn.addEventListener(
         'click', () => EXPERIMENT_MANAGER.clearRunResults());
@@ -154,6 +157,13 @@ class GUIExperimentManager extends ExperimentManager {
     this.rename_modal.cancel.addEventListener(
         'click', () => EXPERIMENT_MANAGER.rename_modal.hide());
     
+    this.sel_order_modal = new ModalDialog('sel-order');
+    this.sel_order_modal.ok.addEventListener(
+        'click', () => EXPERIMENT_MANAGER.modifySelectorOrder());
+    this.sel_order_modal.cancel.addEventListener(
+        'click', () => EXPERIMENT_MANAGER.sel_order_modal.hide());
+    this.sel_order_lines = this.sel_order_modal.element('lines');
+
     this.parameter_modal = new ModalDialog('xp-parameter');
     this.parameter_modal.ok.addEventListener(
         'click', () => EXPERIMENT_MANAGER.addParameter());
@@ -473,9 +483,23 @@ class GUIExperimentManager extends ExperimentManager {
       }
     }
   }
+
+  showSelectorOrder() {
+    // Show selector order modal.
+    this.sel_order_lines.value = MODEL.selector_order_string;
+    this.sel_order_modal.show();
+  }
   
+  modifySelectorOrder() {
+    // Save text area contents as new selector order string.
+    MODEL.selector_order_string = this.sel_order_lines.value.trim();
+    MODEL.selector_order_list = MODEL.selector_order_string.trim().split(/\s+/);
+    this.sel_order_modal.hide();
+    UI.updateControllerDialogs('DX');
+  }
+
   designMode() {
-    // Switch to default view
+    // Switch to default view.
     this.viewer.style.display = 'none';
     this.design.style.display = 'block';
   }

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

@@ -66,6 +66,7 @@ Attributes, however, are case sensitive!">[Actor X|CF]</code> for cash flow.
   <code title="Relative time step (t &minus; t&#8320; + 1)">rt</code>,
   <code title="Number of current block">b</code>,
   <code title="Time step within current block">bt</code>,
+  <code title="Time step within current chunk">ct</code>,
   <code title="Duration of 1 time step (in hours)">dt</code>,
   <code title="Run length (# time steps)">N</code>,
   <code title="Block length (# time steps)">n</code>,
@@ -380,7 +381,7 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
       }
       va.innerHTML = options.join('');
       // NOTE: Chart Manager variable dialog is 60px wider
-      va.style.width = (prefix ? 'calc(100% - 84px)' : 'calc(100% - 142px)');
+      va.style.width = (prefix ? 'calc(100% - 86px)' : 'calc(100% - 142px)');
       return;
     }
     // Add "empty" as first and initial option, as it denotes "use default"

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

@@ -333,7 +333,12 @@ class GUIFileManager {
           return response.text();
         })
       .then((data) => {
-          UI.postResponseOK(data);
+          if(!UI.postResponseOK(data) && data.indexOf('not implemented') >= 0) {
+            // Switch off auto-save when server does not implement it.
+            AUTO_SAVE.interval = 0;
+            AUTO_SAVE.not_implemented = true;
+            console.log('Auto-save disabled');
+          }
           bcl.remove('stay-activ');
         })
       .catch((err) => {

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

@@ -40,7 +40,7 @@ class Finder {
     this.dialog = UI.draggableDialog('finder');
     UI.resizableDialog('finder', 'FINDER');
     this.close_btn = document.getElementById('finder-close-btn');
-    // Make toolbar buttons responsive
+    // Make toolbar buttons responsive.
     this.close_btn.addEventListener('click', (e) => UI.toggleDialog(e));
     this.filter_input = document.getElementById('finder-filter-text');
     this.filter_input.addEventListener('input', () => FINDER.changeFilter());
@@ -78,6 +78,7 @@ class Finder {
     this.filtered_types.length = 0;
     this.selected_entity = null;
     this.filter_input.value = '';
+    this.filter_string = '';
     this.filter_pattern = null;
     this.entity_types = VM.entity_letters;
     this.find_links = true;
@@ -105,7 +106,7 @@ class Finder {
   }
   
   enterKey() {
-    // Open "edit properties" dialog for the selected entity
+    // Open "edit properties" dialog for the selected entity.
     const srl = this.entity_table.getElementsByClassName('sel-set');
     if(srl.length > 0) {
       const r = this.entity_table.rows[srl[0].rowIndex];
@@ -118,7 +119,7 @@ class Finder {
   }
   
   upDownKey(dir) {
-    // Select row above or below the selected one (if possible)
+    // Select row above or below the selected one (if possible).
     const srl = this.entity_table.getElementsByClassName('sel-set');
     if(srl.length > 0) {
       const r = this.entity_table.rows[srl[0].rowIndex + dir];
@@ -139,7 +140,7 @@ class Finder {
     let imgs = '';
     this.entities.length = 0;
     this.filtered_types.length = 0;
-    // No list unless a pattern OR a specified SUB-set of entity types
+    // No list unless a pattern OR a specified SUB-set of entity types.
     if(fp || et && et !== VM.entity_letters) {
       if(et.indexOf('A') >= 0) {
         imgs += '<img src="images/actor.png">';
@@ -151,7 +152,7 @@ class Finder {
           }
         }
       }
-      // NOTE: do not list black-boxed entities
+      // NOTE: Do not list black-boxed entities.
       if(et.indexOf('P') >= 0) {
         imgs += '<img src="images/process.png">';
         for(let k in MODEL.processes) if(MODEL.processes.hasOwnProperty(k)) {
@@ -191,7 +192,7 @@ class Finder {
           const ds = MODEL.datasets[k];
           if(!k.startsWith(UI.BLACK_BOX) && (!fp || patternMatch(
               ds.displayName, this.filter_pattern))) {
-            // NOTE: do not list the equations dataset
+            // NOTE: Do not list the equations dataset.
             if(ds !== MODEL.equations_dataset) {
               enl.push(k);
               this.entities.push(MODEL.datasets[k]);
@@ -217,11 +218,11 @@ class Finder {
       if(et.indexOf('L') >= 0) {
         imgs += '<img src="images/link.png">';
         for(let k in MODEL.links) if(MODEL.links.hasOwnProperty(k)) {
-          // NOTE: "black-boxed" link identifiers are not prefixed => other test
+          // NOTE: "black-boxed" link identifiers are not prefixed => other test.
           const
               l = MODEL.links[k],
               ldn = l.displayName,
-              // A links is "black-boxed" when BOTH nodes are "black-boxed"
+              // A link is "black-boxed" when BOTH nodes are "black-boxed".
               bb = ldn.split(UI.BLACK_BOX).length > 2;
           if(!bb && (!fp || patternMatch(ldn, this.filter_pattern))) {
             enl.push(k);
@@ -233,7 +234,7 @@ class Finder {
       if(et.indexOf('B') >= 0) {
         imgs += '<img src="images/constraint.png">';
         for(let k in MODEL.constraints) {
-          // NOTE: likewise, constraint identifiers can be prefixed by %
+          // NOTE: Likewise, constraint identifiers can be prefixed by %.
           if(MODEL.constraints.hasOwnProperty(k)) {
             if(!k.startsWith(UI.BLACK_BOX) && (!fp || patternMatch(
                 MODEL.constraints[k].displayName, this.filter_pattern))) {
@@ -244,6 +245,35 @@ class Finder {
           }
         }
       }
+      // Also allow search for scale unit names.
+      if(et.indexOf('U') >= 0) {
+        imgs += '<img src="images/scale.png">';
+        for(let k in MODEL.products) if(MODEL.products.hasOwnProperty(k)) {
+          if(fp && !k.startsWith(UI.BLACK_BOX) && patternMatch(
+              MODEL.products[k].scale_unit, this.filter_pattern)) {
+            enl.push(k);
+            this.entities.push(MODEL.products[k]);
+            addDistinct('Q', this.filtered_types);
+          }
+        }
+      }
+      // Also allow search for link multiplier symbols.
+      if(et.indexOf('M') >= 0) {
+        if(imgs.indexOf('/link.') < 0) imgs += '<img src="images/link.png">';
+        for(let k in MODEL.links) if(MODEL.links.hasOwnProperty(k)) {
+          // NOTE: "black-boxed" link identifiers are not prefixed => other test.
+          const
+              l = MODEL.links[k],
+              m = VM.LM_LETTERS.charAt(l.multiplier),
+              // A link is "black-boxed" when BOTH nodes are "black-boxed".
+              bb = l.displayName.split(UI.BLACK_BOX).length > 2;
+          if(fp && !bb && this.filter_string.indexOf(m) >= 0) {
+            enl.push(k);
+            this.entities.push(l);
+            addDistinct('L', this.filtered_types);
+          }
+        }
+      }
       enl.sort((a, b) => UI.compareFullNames(a, b, true));
     }
     document.getElementById('finder-entity-imgs').innerHTML = imgs;
@@ -259,7 +289,7 @@ class Finder {
           e.type.toLowerCase(), '.png">', e.displayName,
           '</td></tr>'].join(''));
     }
-    // NOTE: reset `selected_entity` if not in the new list
+    // NOTE: Reset `selected_entity` if not in the new list.
     if(seid === 'etr') this.selected_entity = null;
     this.entity_table.innerHTML = el.join('');
     UI.scrollIntoView(document.getElementById(seid));
@@ -316,18 +346,18 @@ class Finder {
     let hdr = '(no entity selected)';
     if(se) {
       hdr = `<em>${se.type}:</em> <strong>${se.displayName}</strong>`;
-      // Make occurrence list
+      // Make occurrence list.
       if(se instanceof Process || se instanceof Cluster) {
-        // Processes and clusters "occur" in their parent cluster
+        // Processes and clusters "occur" in their parent cluster.
         if(se.cluster) occ.push(se.cluster.identifier);
       } else if(se instanceof Product) {
-        // Products "occur" in clusters where they have a position
+        // Products "occur" in clusters where they have a position.
         const cl = se.productPositionClusters;
         for(let i = 0; i < cl.length; i++) {
           occ.push(cl[i].identifier);
         }
       } else if(se instanceof Actor) {
-        // Actors "occur" in clusters where they "own" processes or clusters
+        // Actors "occur" in clusters where they "own" processes or clusters.
         for(let k in MODEL.processes) if(MODEL.processes.hasOwnProperty(k)) {
           const p = MODEL.processes[k];
           if(p.actor === se) occ.push(p.identifier);
@@ -337,13 +367,13 @@ class Finder {
           if(c.actor === se) occ.push(c.identifier);
         }
       } else if(se instanceof Link || se instanceof Constraint) {
-        // Links and constraints "occur" in their "best" parent cluster
+        // Links and constraints "occur" in their "best" parent cluster.
         const c = MODEL.inferParentCluster(se);
         if(c) occ.push(c.identifier);
       }
-      // NOTE: no "occurrence" of datasets or equations
+      // NOTE: No "occurrence" of datasets or equations.
       // @@TO DO: identify MODULES (?)
-      // All entities can also occur as chart variables
+      // All entities can also occur as chart variables.
       for(let j = 0; j < MODEL.charts.length; j++) {
         const c = MODEL.charts[j];
         for(let k = 0; k < c.variables.length; k++) {
@@ -355,12 +385,12 @@ class Finder {
           }
         }
       }
-      // Now also look for occurrences of entity references in expressions
+      // Now also look for occurrences of entity references in expressions.
       const
           raw = escapeRegex(se.displayName),
           re = new RegExp(
               '\\[\\s*!?' + raw.replace(/\s+/g, '\\s+') + '\\s*[\\|\\@\\]]');
-      // Check actor weight expressions
+      // Check actor weight expressions.
       for(let k in MODEL.actors) if(MODEL.actors.hasOwnProperty(k)) {
         const a = MODEL.actors[k];
         if(re.test(a.weight.text)) {
@@ -368,7 +398,7 @@ class Finder {
           xol.push(a.identifier);
         }
       }
-      // Check all process attribute expressions
+      // Check all process attribute expressions.
       for(let k in MODEL.processes) if(MODEL.processes.hasOwnProperty(k)) {
         const p = MODEL.processes[k];
         if(re.test(p.lower_bound.text)) {
@@ -384,7 +414,7 @@ class Finder {
           xol.push(p.identifier);
         }
       }
-      // Check all product attribute expressions
+      // Check all product attribute expressions.
       for(let k in MODEL.products) if(MODEL.products.hasOwnProperty(k)) {
         const p = MODEL.products[k];
         if(re.test(p.lower_bound.text)) {
@@ -404,7 +434,7 @@ class Finder {
           xol.push(p.identifier);
         }
       }
-      // Check all notes in clusters for their color expressions and field
+      // Check all notes in clusters for their color expressions and field.
       for(let k in MODEL.clusters) if(MODEL.clusters.hasOwnProperty(k)) {
         const c = MODEL.clusters[k];
         for(let i = 0; i < c.notes.length; i++) {
@@ -416,7 +446,7 @@ class Finder {
           }
         }
       }
-      // Check all link rate expressions
+      // Check all link rate expressions.
       for(let k in MODEL.links) if(MODEL.links.hasOwnProperty(k)) {
         const l = MODEL.links[k];
         if(re.test(l.relative_rate.text)) {
@@ -428,7 +458,7 @@ class Finder {
           xol.push(l.identifier);
         }
       }
-      // Check all dataset modifier expressions
+      // Check all dataset modifier expressions.
       for(let k in MODEL.datasets) if(MODEL.datasets.hasOwnProperty(k)) {
         const ds = MODEL.datasets[k];
         for(let m in ds.modifiers) if(ds.modifiers.hasOwnProperty(m)) {
@@ -451,22 +481,22 @@ class Finder {
           '</td></tr>'].join(''));
     }
     this.item_table.innerHTML = el.join('');
-    // Clear the table row list
+    // Clear the table row list.
     el.length = 0;
-    // Now fill it with entity+attribute having a matching expression
+    // Now fill it with entity+attribute having a matching expression.
     for(let i = 0; i < xal.length; i++) {
       const
           id = xol[i],
           e = MODEL.objectByID(id),
           attr = (e instanceof Note ? '' : xal[i]);
       let img = e.type.toLowerCase(),
-          // NOTE: a small left-pointing triangle denotes that the right-hand
-          // part has the left hand part as its attribute
+          // NOTE: A small left-pointing triangle denotes that the right-hand
+          // part has the left hand part as its attribute.
           cs = '',
           td = attr + '</td><td>&#x25C2;</td><td style="width:95%">' +
               e.displayName;
-      // NOTE: equations may have LONG names while the equations dataset name
-      // is irrelevant, hence use 3 columns (no triangle)
+      // NOTE: Equations may have LONG names while the equations dataset
+      // name is irrelevant, hence use 3 columns (no triangle).
       if(e === MODEL.equations_dataset) {
         img = 'equation';
         cs = ' colspan="3"';
@@ -484,7 +514,7 @@ class Finder {
   }
   
   drag(ev) {
-    // Start dragging the selected entity
+    // Start dragging the selected entity.
     let t = ev.target;
     while(t && t.nodeName !== 'TD') t = t.parentNode;
     ev.dataTransfer.setData('text', MODEL.objectByName(t.innerText).identifier);
@@ -493,30 +523,31 @@ class Finder {
   
   changeFilter() {
     // Filter expression can start with 1+ entity letters plus `?` to
-    // look only for the entity types denoted by these letters
+    // look only for the entity types denoted by these letters.
     let ft = this.filter_input.value,
         et = VM.entity_letters;
-    if(/^(\*|[ABCDELPQ]+)\?/i.test(ft)) {
+    if(/^(\*|U|M|[ABCDELPQ]+)\?/i.test(ft)) {
       ft = ft.split('?');
-      // NOTE: *? denotes "all entity types except constraints"
+      // NOTE: *? denotes "all entity types except constraints".
       et = (ft[0] === '*' ? 'ACDELPQ' : ft[0].toUpperCase());
       ft = ft.slice(1).join('=');
     }
+    this.filter_string = ft;
     this.filter_pattern = patternList(ft);
     this.entity_types = et;
     this.updateDialog();
   }
   
   showInfo(id, shift) {
-    // Displays documentation for the entity identified by `id`
+    // Display documentation for the entity identified by `id`.
     const e = MODEL.objectByID(id);
     if(e) DOCUMENTATION_MANAGER.update(e, shift);
   }
   
   selectEntity(id, alt=false) {
-    // Looks up entity, selects it in the left pane, and updates the
-    // right pane; opens the "edit properties" modal dialog on double-click
-    // and Alt-click if the entity is editable
+    // Look up entity, select it in the left pane, and update the right
+    // pane. Open the "edit properties" modal dialog on double-click
+    // and Alt-click if the entity is editable.
     const obj = MODEL.objectByID(id);
     this.selected_entity = obj;
     this.updateDialog();
@@ -551,7 +582,7 @@ class Finder {
   }
   
   reveal(id) {
-    // Shows selected occurrence
+    // Show selected occurrence.
     const
         se = this.selected_entity,
         obj = (se ? MODEL.objectByID(id) : null);
@@ -559,7 +590,7 @@ class Finder {
     // If cluster, make it focal...
     if(obj instanceof Cluster) {
       UI.makeFocalCluster(obj);
-      // ... and select the entity unless it is an actor or dataset
+      // ... and select the entity unless it is an actor or dataset.
       if(!(se instanceof Actor || se instanceof Dataset)) {
         MODEL.select(se);
         if(se instanceof Link || se instanceof Constraint) {
@@ -572,7 +603,7 @@ class Finder {
     } else if(obj instanceof Process || obj instanceof Note) {
       // If occurrence is a process or a note, then make its cluster focal...
       UI.makeFocalCluster(obj.cluster);
-      // ... and select it
+      // ... and select it.
       MODEL.select(obj);
       UI.scrollIntoView(obj.shape.element.childNodes[0]);
     } else if(obj instanceof Product) {
@@ -586,7 +617,7 @@ class Finder {
         if(a) UI.scrollIntoView(a.shape.element.childNodes[0]);
       }
     } else if(obj instanceof Chart) {
-      // If occurrence is a chart, select and show it in the chart manager
+      // If occurrence is a chart, select and show it in the chart manager.
       CHART_MANAGER.chart_index = MODEL.charts.indexOf(obj);
       if(CHART_MANAGER.chart_index >= 0) {
         if(UI.hidden('chart-dlg')) {
@@ -595,7 +626,7 @@ class Finder {
       }
       CHART_MANAGER.updateDialog();
     }
-    // NOTE: return the object to save a second lookup by revealExpression
+    // NOTE: Return the object to save a second lookup by revealExpression.
     return obj;
   }