linny-r 1.5.8 → 1.6.1

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

@@ -309,35 +309,55 @@ class DocumentationManager {
   }
 
   update(e, shift) {
-    // Display name of entity under cursor on the infoline, and details in
-    // the documentation dialog
+    // Display name of entity under cursor on the infoline, and details
+    // in the documentation dialog.
     if(!e) return;
-    const
-        et = e.type,
+    let et = e.type,
         edn = e.displayName;
-    // TO DO: when debugging, display additional data for nodes on the infoline 
+    if(et === 'Equation' && e.selector.startsWith(':')) et = 'Method';
+    // TO DO: when debugging, display additional data for nodes on the
+    // infoline. 
     UI.setMessage(
         e instanceof NodeBox ? e.infoLineName : `<em>${et}:</em> ${edn}`);
-    // NOTE: update the dialog ONLY when shift is pressed (this permits modelers
-    // to rapidly browse comments without having to click on entities, and then
-    // release the shift key to move to the documentation dialog to edit)
-    // Moreover, the documentation dialog must be visible, and the entity must
-    // have the `comments` property
-    if(!this.editing && shift && this.visible && e.hasOwnProperty('comments')) {
-      this.title.innerHTML = `<em>${et}:</em>&nbsp;${edn}`;
-      this.entity = e;
-      this.markup = (e.comments ? e.comments : '');
-      this.editor.value = this.markup;
-      this.viewer.innerHTML = this.markdown;
-      this.edit_btn.classList.remove('disab');
-      this.edit_btn.classList.add('enab');
-      // NOTE: permit documentation of the model by raising the dialog
-      if(this.entity === MODEL) this.dialog.style.zIndex = 101;
+    // NOTE: Update the dialog ONLY when shift is pressed. This permits
+    // modelers to rapidly browse comments without having to click on
+    // entities, and then release the shift key to move to the documentation
+    // dialog to edit. Moreover, the documentation dialog must be visible,
+    // and the entity must have the `comments` property.
+    // NOTE: Equations constitute an exception, as DatasetModifiers do
+    // not have the `comments` property. Now that methods can be defined
+    // (since version 1.6.0), the documentation window displays the eligible
+    // prefixes when the cursor is Shift-moved over the name of a method
+    // (in the Equation Manager).
+    if(!this.editing && shift && this.visible) {
+      if(e.hasOwnProperty('comments')) {
+        this.title.innerHTML = `<em>${et}:</em>&nbsp;${edn}`;
+        this.entity = e;
+        this.markup = (e.comments ? e.comments : '');
+        this.editor.value = this.markup;
+        this.viewer.innerHTML = this.markdown;
+        this.edit_btn.classList.remove('disab');
+        this.edit_btn.classList.add('enab');
+        // NOTE: Permit documentation of the model by raising the dialog.
+        if(this.entity === MODEL) this.dialog.style.zIndex = 101;
+      } else if(e instanceof DatasetModifier) {
+        this.title.innerHTML = e.selector;
+        this.viewer.innerHTML = 'Method <tt>' + e.selector +
+            '</tt> does not apply to any entity';
+        if(e.expression.eligible_prefixes) {
+          const el = Object.keys(e.expression.eligible_prefixes)
+              .sort(compareSelectors);
+          if(el.length > 0) this.viewer.innerHTML = [
+              'Method <tt>', e.selector, '</tt> applies to ',
+              pluralS(el.length, 'prefixed entity group'),
+              ':<ul><li>', el.join('</li><li>'), '</li></ul>'].join('');
+        }
+      }
     }
   }
   
   rewrite(str) {
-    // Apply all the rewriting rules to `str`
+    // Apply all the rewriting rules to `str`.
     str = '\n' + str + '\n';
     this.rules.forEach(
         (rule) => { str = str.replace(rule.pattern, rule.rewrite); });
@@ -345,28 +365,29 @@ class DocumentationManager {
   }
   
   makeList(par, isp, type) {
-    // Split on the *global multi-line* item separator pattern
+    // Split on the *global multi-line* item separator pattern.
     const splitter = new RegExp(isp, 'gm'),
           list = par.split(splitter);
     if(list.length < 2) return false;
-    // Now we know that the paragraph contains at least one list item line
+    // Now we know that the paragraph contains at least one list item line.
     let start = 0;
-    // Paragraph may start with plain text, so check using the original pattern
+    // Paragraph may start with plain text, so check using the original
+    // pattern.
     if(!par.match(isp)) {
       // If so, retain this first part as a separate paragraph...
       start = 1;
-      // NOTE: add it only if it contains text
+      // NOTE: Add it only if it contains text.
       par = (list[0].trim() ? `<p>${this.rewrite(list[0])}</p>` : '');
-      // ... and clear it as list item
+      // ... and clear it as list item.
       list[0] = '';
     } else {
       par = '';
     }
-    // Rewrite each list item fragment that contains text 
+    // Rewrite each list item fragment that contains text.
     for(let j = start; j < list.length; j++) {
       list[j] = (list[j].trim() ? `<li>${this.rewrite(list[j])}</li>` : '');
     }
-    // Return assembled parts
+    // Return assembled parts.
     return [par, '<', type, 'l>', list.join(''), '</', type, 'l>'].join('');
   }
   
@@ -375,16 +396,16 @@ class DocumentationManager {
     const html = this.markup.split(/\n{2,}/);
     let list;
     for(let i = 0; i < html.length; i++) {
-      // Paragraph with only dashes and spaces becomes a horizontal rule 
+      // Paragraph with only dashes and spaces becomes a horizontal rule.
       if(html[i].match(/^( *-)+$/)) {
         html[i] = '<hr>';
-      // Paragraph may contain a bulleted list 
+      // Paragraph may contain a bulleted list.
       } else if ((list = this.makeList(html[i], /^ *- +/, 'u')) !== false) {
         html[i] = list;
-      // Paragraph may contain a numbered list 
+      // Paragraph may contain a numbered list.
       } else if ((list = this.makeList(html[i], /^ *\d+. +/, 'o')) !== false) {
         html[i] = list;
-      // Otherwise: default HTML paragraph
+      // Otherwise: default HTML paragraph.
       } else {
         html[i] = `<p>${this.rewrite(html[i])}</p>`;
       }
@@ -411,7 +432,7 @@ class DocumentationManager {
   }
   
   insertSymbol(sym) {
-    // Insert symbol (clicked item in list below text area) into text area 
+    // Insert symbol (clicked item in list below text area) into text area.
     this.editor.focus();
     let p = this.editor.selectionStart;
     const
@@ -434,7 +455,7 @@ class DocumentationManager {
       } else if(this.entity instanceof Constraint) {
         UI.paper.drawConstraint(this.entity);
       } else if (typeof this.entity.draw === 'function') {
-        // Only draw if the entity responds to that method
+        // Only draw if the entity responds to that method.
         this.entity.draw();
       }
     }
@@ -481,14 +502,14 @@ class DocumentationManager {
   }
 
   addMessage(msg) {
-    // Append message to the info messages list
+    // Append message to the info messages list.
     if(msg) this.info_messages.push(msg);
-    // Update dialog only when it is showing
+    // Update dialog only when it is showing.
     if(!UI.hidden(this.dialog.id)) this.showInfoMessages(true);
   }
   
   showInfoMessages(shift) {
-    // Show all messages that have appeared on the status line
+    // Show all messages that have appeared on the status line.
     const 
         n = this.info_messages.length,
         title = pluralS(n, 'message') + ' since the current model was loaded';
@@ -504,21 +525,21 @@ class DocumentationManager {
             '<div class="', m.status, first, '-msg">', m.text, '</div></div>');
       }
       this.viewer.innerHTML = divs.join('');
-      // Set the dialog title
+      // Set the dialog title.
       this.title.innerHTML = title;
     }
   }
 
   showArrowLinks(arrow) {
-    // Show list of links represented by a composite arrow
+    // Show list of links represented by a composite arrow.
     const
         n = arrow.links.length,
         msg = 'Arrow represents ' + pluralS(n, 'link');
     UI.setMessage(msg);
     if(this.visible && !this.editing) {
-      // Set the dialog title
+      // Set the dialog title.
       this.title.innerHTML = msg;
-      // Show list
+      // Show list.
       const lis = [];
       let l, dn, c, af;
       for(let i = 0; i < n; i++) {
@@ -550,7 +571,8 @@ class DocumentationManager {
   }
 
   showHiddenIO(node, arrow) {
-    // Show list of products or processes linked to node by an invisible arrow
+    // Show list of products or processes linked to node by an invisible
+    // arrow (i.e., links represented by a block arrow).
     let msg, iol;
     if(arrow === UI.BLOCK_IN) {
       iol = node.hidden_inputs;
@@ -566,9 +588,9 @@ class DocumentationManager {
     UI.on_block_arrow = true;
     UI.setMessage(msg);
     if(this.visible && !this.editing) {
-      // Set the dialog title
+      // Set the dialog title.
       this.title.innerHTML = msg;
-      // Show list
+      // Show list.
       const lis = [];
       for(let i = 0; i < iol.length; i++) {
         lis.push(`<li>${iol[i].displayName}</li>`);
@@ -579,17 +601,19 @@ class DocumentationManager {
   }
 
   showAllDocumentation() {
+    // Show (as HTML) all model entities (categorized by type) with their
+    // associated comments (if added by the modeler).
     const
         html = [],
         sl = MODEL.listOfAllComments;
     for(let i = 0; i < sl.length; i++) {
       if(sl[i].startsWith('_____')) {
-        // 5-underscore leader indicates: start of new category
+        // 5-underscore leader indicates: start of new category.
         html.push('<h2>', sl[i].substring(5), '</h2>');
       } else {
         // Expect model element name...
         html.push('<p><tt>', sl[i], '</tt><br><small>');
-        // ... immediately followed by its associated marked-up comments
+        // ... immediately followed by its associated marked-up comments.
         i++;
         this.markup = sl[i];
         html.push(this.markdown, '</small></p>');
@@ -597,7 +621,7 @@ class DocumentationManager {
     }
     this.title.innerHTML = 'Complete model documentation';
     this.viewer.innerHTML = html.join('');
-    // Deselect entity and disable editing
+    // Deselect entity and disable editing.
     this.entity = null;
     this.edit_btn.classList.remove('enab');
     this.edit_btn.classList.add('disab');

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

@@ -139,16 +139,27 @@ class EquationManager {
       const
           m = ed.modifiers[UI.nameToID(msl[i])],
           wild = (m.selector.indexOf('??') >= 0),
+          method = m.selector.startsWith(':'),
+          issue = (m.expression.compile_issue ? ' compile-issue' :
+              (m.expression.compute_issue ? ' compute-issue' : '')),
           clk = '" onclick="EQUATION_MANAGER.selectModifier(event, \'' +
-              m.selector + '\'';
+              m.selector + '\'',
+          mover = (method ? ' onmouseover="EQUATION_MANAGER.showInfo(\'' +
+              m.identifier + '\', event.shiftKey);"' : '');
       if(m === sm) smid += i;
       ml.push(['<tr id="eqmtr', i, '" class="dataset-modif',
           (m === sm ? ' sel-set' : ''),
           '"><td class="equation-selector',
-          (m.expression.isStatic ? '' : ' it'),
-          (wild ? ' wildcard' : ''), clk, ', false);">',
+          (method ? ' method' : ''),
+          // Display in gray when method cannot be applied.
+          (m.expression.noMethodObject ? ' no-object' : ''),
+          (m.expression.isStatic ? '' : ' it'), issue,
+          (wild ? ' wildcard' : ''), clk, ', false);"', mover, '>',
           (wild ? wildcardFormat(m.selector) : m.selector),
-          '</td><td class="equation-expression',
+          '</td><td class="equation-expression', issue,
+          (issue ? '"title="' +
+              safeDoubleQuotes(m.expression.compile_issue ||
+                  m.expression.compute_issue) : ''),
           clk, ');">', m.expression.text, '</td></tr>'].join(''));
     }
     this.table.innerHTML = ml.join('');
@@ -164,6 +175,8 @@ class EquationManager {
   
   showInfo(id, shift) {
     // @@TO DO: Display documentation for the equation => extra comments field?
+    const d = MODEL.equations_dataset.modifiers[id];
+    if(d) DOCUMENTATION_MANAGER.update(d, shift);
   }
   
   selectModifier(event, id, x=true) {
@@ -255,20 +268,23 @@ class EquationManager {
     if(!this.selected_modifier) return;
     const
         sel = this.rename_modal.element('name').value,
-        // Keep track of old name
+        // Keep track of old name.
         oldm = this.selected_modifier,
         olds = oldm.selector,
-        // NOTE: addModifier returns existing one if selector not changed
+        // NOTE: addModifier returns existing one if selector not changed.
         m = MODEL.equations_dataset.addModifier(sel);
-    // NULL indicates invalid name
+    // NULL indicates invalid name.
     if(!m) return;
-    // If only case has changed, update the selector
-    // NOTE: equation names may contain spaces; if so, reduce to single space
+    // If only case has changed, update the selector.
+    // NOTE: Equation names may contain spaces; if so, reduce to single space.
     if(m === oldm) {
       m.selector = sel.trim().replace(/\s+/g, ' ');
     } else {
-      // When a new modifier has been added, more actions are needed
+      // When a new modifier has been added, more actions are needed.
       m.expression = oldm.expression;
+      // NOTE: The `attribute` property of the expression must be updated
+      // because it identifies the "owner" of the expression.
+      m.expression.attribute = m.selector;
       this.deleteEquation();
       this.selected_modifier = m;
     }

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

@@ -114,11 +114,14 @@ class GUIExperimentManager extends ExperimentManager {
     document.getElementById('xv-download-btn').addEventListener(
         'click', () => EXPERIMENT_MANAGER.promptForDownload());
     // The viewer's drop-down selectors
-    document.getElementById('viewer-variable').addEventListener( 
+    this.viewer_variable = document.getElementById('viewer-variable');
+    this.viewer_variable.addEventListener( 
         'change', () => EXPERIMENT_MANAGER.setVariable());
-    document.getElementById('viewer-statistic').addEventListener( 
+    this.viewer_statistic = document.getElementById('viewer-statistic');
+    this.viewer_statistic.addEventListener( 
         'change', () => EXPERIMENT_MANAGER.setStatistic());
-    document.getElementById('viewer-scale').addEventListener( 
+    this.viewer_scale = document.getElementById('viewer-scale');
+    this.viewer_scale.addEventListener( 
         'change', () => EXPERIMENT_MANAGER.setScale());
     // The spin buttons
     document.getElementById('xp-cd-minus').addEventListener( 
@@ -272,12 +275,12 @@ class GUIExperimentManager extends ExperimentManager {
   
   updateDialog() {
     this.updateChartList();
-    // Warn modeler if no meaningful experiments can be defined
+    // Warn modeler if no meaningful experiments can be defined.
     if(MODEL.outcomeNames.length === 0 && this.suitable_charts.length === 0) {
       this.default_message.style.display = 'block';
       this.params_div.style.display = 'none';
       this.selected_experiment = null;
-      // Disable experiment dialog menu buttons
+      // Disable experiment dialog menu buttons.
       UI.disableButtons('xp-new xp-rename xp-view xp-delete xp-ignore');
     } else {
       this.default_message.style.display = 'none';
@@ -388,7 +391,7 @@ class GUIExperimentManager extends ExperimentManager {
           x.charts[i].title, '</td></tr>'].join(''));
     }
     this.chart_table.innerHTML = tr.join('');
-    // Do not show viewer unless at least 1 dependent variable has been defined
+    // Do not show viewer unless at least 1 dependent variable has been defined.
     if(x.charts.length === 0 && MODEL.outcomeNames.length === 0) canview = false;
     if(tr.length >= this.suitable_charts.length) {
       document.getElementById('xp-c-add-btn').classList.add('v-disab');
@@ -409,7 +412,7 @@ class GUIExperimentManager extends ExperimentManager {
       dbtn.classList.add('v-disab');
       cbtn.classList.add('v-disab');
     }
-    // Enable viewing only if > 1 dimensions and > 1 outcome variables
+    // Enable viewing only if > 1 dimensions and > 1 outcome variables.
     if(canview) {
       UI.enableButtons('xp-view');
     } else {
@@ -478,38 +481,51 @@ class GUIExperimentManager extends ExperimentManager {
     if(x) {
       this.design.style.display = 'none';
       document.getElementById('viewer-title').innerHTML = x.title;
-      document.getElementById('viewer-statistic').value = x.selected_statistic;
+      this.viewer_statistic.value = x.selected_statistic;
       this.updateViewerVariable();
       // NOTE: calling updateSpinner with dir=0 will update without changes
       this.updateSpinner('c', 0);
       this.drawTable(); 
-      document.getElementById('viewer-scale').value = x.selected_scale;
+      this.viewer_scale.value = x.selected_scale;
       this.setColorScale(x.selected_color_scale);
       this.viewer.style.display = 'block';
     }
   }
   
   updateViewerVariable() {
-    // Update the variable drop-down selector of the viewer
+    // Update the variable drop-down selector of the viewer.
     const x = this.selected_experiment;
     if(x) {
       x.inferVariables();
       const
           ol = [],
-          vl = MODEL.outcomeNames;
+          ov = MODEL.outcomeNames,
+          vl = [...ov];
       for(let i = 0; i < x.variables.length; i++) {
-        addDistinct(x.variables[i].displayName, vl); 
+        const
+            vn = x.variables[i].displayName,
+            oi = ov.indexOf(vn);
+        // If an outcome dataset or equation is plotted in an experiment
+        // chart, remove its name from the outcome variable list.
+        if(oi >= 0) ov.splice(oi, 1);
+        addDistinct(vn, vl); 
       }
       vl.sort((a, b) => UI.compareFullNames(a, b));
       for(let i = 0; i < vl.length; i++) {
-        ol.push(['<option value="', vl[i], '"',
-            (vl[i] == x.selected_variable ? ' selected="selected"' : ''),
-            '>', vl[i], '</option>'].join(''));
-      }
-      document.getElementById('viewer-variable').innerHTML = ol.join('');
-      if(x.selected_variable === '') {
-        x.selected_variable = vl[0];
+        const vn = vl[i];
+        // NOTE: FireFox selector dropdown areas have a pale gray
+        // background that darkens when color is set, so always set it
+        // to white (like Chrome). Then set color of outcome variables
+        // to fuchsia to differentiate from variables for which time
+        // series are stored as experiment run results.
+        ol.push(['<option value="', vn, '" style="background-color: white',
+            (ov.indexOf(vn) >= 0 ? '; color: #b00080"' : '"'),
+            (vn == x.selected_variable ? ' selected="selected"' : ''),
+            '>', vn, '</option>'].join(''));
       }
+      this.viewer_variable.innerHTML = ol.join('');
+      // Initially, select the first variable on the list.
+      if(x.selected_variable === '') x.selected_variable = vl[0];
     }
   }
   
@@ -684,8 +700,10 @@ class GUIExperimentManager extends ExperimentManager {
         for(let j = 0; j < n; j++) {
           const
               c = r + j + i * nrows,
+              run = x.runs[c],
               ic = x.chart_combinations.indexOf(c);
-          if(add) {
+          // NOTE: Only add if run has been executed and stored.
+          if(add && run) {
             if(ic < 0) x.chart_combinations.push(c);
           } else {
             if(ic >= 0) x.chart_combinations.splice(ic, 1);        
@@ -952,7 +970,7 @@ N = ${rr.N}, vector length = ${rr.vector.length}` : '')].join('');
     // Update view for selected variable
     const x = this.selected_experiment;
     if(x) {
-      x.selected_variable = document.getElementById('viewer-variable').value;
+      x.selected_variable = this.viewer_variable.value;
       this.updateData();
     }
   }
@@ -961,7 +979,7 @@ N = ${rr.N}, vector length = ${rr.vector.length}` : '')].join('');
     // Update view for selected variable.
     const x = this.selected_experiment;
     if(x) {
-      x.selected_statistic = document.getElementById('viewer-statistic').value;
+      x.selected_statistic = this.viewer_statistic.value;
       this.updateData();
       // NOTE: Update of Chart Manager is needed only when it is showing
       // run statistics.
@@ -1027,7 +1045,7 @@ N = ${rr.N}, vector length = ${rr.vector.length}` : '')].join('');
     // Update view for selected scale
     const x = this.selected_experiment;
     if(x) {
-      x.selected_scale = document.getElementById('viewer-scale').value;
+      x.selected_scale = this.viewer_scale.value;
       this.updateData();
       // NOTE: Update of Chart Manager is needed when it is showing
       // run statistics because solver times may be plotted.

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

@@ -162,24 +162,24 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
   Monadic operators take precedence over dyadic operators.
   Use parentheses to override the default evaluation precedence.
 </p>`;
-    // Add listeners to the GUI elements
+    // Add listeners to the GUI elements.
     const md = UI.modals.expression;
     md.ok.addEventListener('click', () => X_EDIT.parseExpression());
     md.cancel.addEventListener('click', () => X_EDIT.cancel());
-    // NOTE: this modal also has an information button in its header
+    // NOTE: This modal also has an information button in its header.
     md.info.addEventListener(
         'click', () => X_EDIT.toggleExpressionInfo());
-    document.getElementById('variable-obj').addEventListener(
+    this.obj.addEventListener(
         'change', () => X_EDIT.updateVariableBar());
-    document.getElementById('variable-name').addEventListener(
+    this.name.addEventListener(
         'change', () => X_EDIT.updateAttributeSelector());
     document.getElementById('variable-insert').addEventListener(
         'click', () => X_EDIT.insertVariable());
   }
 
   editExpression(event) {
-    // Infers which entity property expression is to edited from the button
-    // that was clicked, and then opens the dialog
+    // Infer which entity property expression is to edited from the button
+    // that was clicked, and then opens the dialog.
     const
         btn = event.target,
         ids = btn.id.split('-'), // 3-tuple [entity type, attribute, 'x']
@@ -196,7 +196,8 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
       let n = '',
           a = '';
       if(ids[0] === 'link') {
-        n = document.getElementById('link-from-name').innerHTML + UI.LINK_ARROW +
+        n = document.getElementById('link-from-name').innerHTML +
+            UI.LINK_ARROW +
             document.getElementById('link-to-name').innerHTML;
       } else {
         n = document.getElementById(ids[0] + '-name').value;
@@ -211,20 +212,19 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
       this.edited_expression = UI.edited_object.attributeExpression(ids[1]);
     }
     const md = UI.modals.expression;
-    md.element('property').innerHTML = prop;
-    md.element('text').value = document.getElementById(
-        this.edited_input_id).value.trim();
-    document.getElementById('variable-obj').value = 0;
+    this.property.innerHTML = prop;
+    this.text.value = document.getElementById(this.edited_input_id).value.trim();
+    this.obj.value = 0;
     this.updateVariableBar();
     this.clearStatusBar();
     md.show('text');
   }
  
   cancel() {
-    // Closes the expression editor dialog
+    // Close the expression editor dialog.
     UI.modals.expression.hide();
     // Clear the "shortcut flag" that may be set by Shift-clicking the
-    // "add chart variable" button in the chart dialog 
+    // "add chart variable" button in the chart dialog.
     EQUATION_MANAGER.add_to_chart = false;
     // CLear other properties that relate to the edited expression.
     this.edited_input_id = '';
@@ -232,20 +232,25 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
   }
   
   parseExpression() {
-    // Parses the contents of the expression editor
-    let xt = this.text.value;
-    // NOTE: the Insert button is quite close to the OK button, and often
-    // the modeler clicks OK before Insert, leaving the expression empty;
-    // hence assume that modeler meant to insert a variable if text is empty,
-    // but all three variable components have been selected
+    // Parse the contents of the expression editor.
+    let xt = this.text.value.trim();
+    // NOTE: The Insert button is quite close to the OK button, and often
+    // the modeler clicks OK before Insert, leaving the expression empty.
+    // Hence assume that modeler meant to insert a variable if text is
+    // empty but all three variable components have been selected.
     if(xt === '') {
       const
           n = this.name.options[this.name.selectedIndex].innerHTML,
           a = this.attr.options[this.attr.selectedIndex].innerHTML;
       if(n && a) xt = `[${n}${UI.OA_SEPARATOR}${a}]`;
     }
+    // Remove all non-functional whitespace from variable references. 
+    xt = monoSpacedVariables(xt);
+    // Update the text shown in the editor, otherwise the position of
+    // errors in the text may be incorrect.
+    this.text.value = xt;
     // NOTE: If the expression is a dataset modifier or an equation, pass
-    // the dataset and the selector as extra parameters for the parser 
+    // the dataset and the selector as extra parameters for the parser.
     let own = null,
         sel = '';
     if(!this.edited_input_id && DATASET_MANAGER.edited_expression) {
@@ -270,7 +275,7 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
     } else {
       if(this.edited_input_id) {
         document.getElementById(this.edited_input_id).value = xp.expr;
-        // NOTE: entity properties must be exogenous parameters
+        // NOTE: Entity properties must be exogenous parameters.
         const eo = UI.edited_object; 
         if(eo && xp.is_level_based &&
             !(eo instanceof Dataset || eo instanceof Note)) {

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

@@ -441,6 +441,7 @@ class Finder {
       }
     }
     document.getElementById('finder-item-header').innerHTML = hdr;
+    occ.sort(compareSelectors);
     for(let i = 0; i < occ.length; i++) {
       const e = MODEL.objectByID(occ[i]);
       el.push(['<tr id="eotr', i, '" class="dataset" onclick="FINDER.reveal(\'',

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

@@ -175,7 +175,7 @@ class GUIMonitor {
     this.block_count = VM.block_count;
     // Shows the appropriate text in the monitor's textarea
     let b = this.shown_block;
-    // By default, show information on the block being calculated
+    // By default, show information on the block being calculated.
     if(b === 0) b = this.block_count;
     if(this.block_count === 0) {
       this.messages_text.value = VM.no_messages;
@@ -184,9 +184,9 @@ class GUIMonitor {
       this.messages_text.value = VM.messages[b - 1];
       this.equations_text.value = VM.equations[b - 1];
     }
-    // Legend to variables is not block-dependent
-    this.variables_text.value = VM.variablesLegend(b);
-    // Show the text area for the selected tab
+    // Legend to variables is not block-dependent.
+    this.variables_text.value = VM.variablesLegend();
+    // Show the text area for the selected tab.
     if(this.tab !== tab) {
       let mt = 'monitor-' + this.tab;
       document.getElementById(mt).style.display = 'none';