linny-r 2.0.10 → 2.0.12

package/package.json

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

package/static/index.html

@@ -1942,17 +1942,7 @@ NOTE: * and ? will be interpreted as wildcards"
            title="Delete selected dataset"
            style="position: absolute; right: 2px">
     </div>
-    <div id="dataset-header">
-      Datasets
-      <img id="ds-filter-btn" class="btn enab" src="images/filter.png"
-           title="Filter on name">
-    </div>
-    <div id="ds-filter-bar">
-      <input id="ds-filter-text" type="text"
-             placeholder="(name filtering pattern)"
-             title="Pattern may contain logical & (AND), | (OR) and ^ (NOT)
-Start with = to find exact match, with ~ to match first characters">
-    </div>
+    <div id="dataset-header">Datasets</div>
     <div id="dataset-scroll-area">
       <table id="dataset-table">
       </table>
@@ -1984,6 +1974,7 @@ Start with = to find exact match, with ~ to match first characters">
         <div id="dataset-export">&uarr;</div>
       </div>
     </div>
+    <div id="dataset-prefixed-count" class="blink"></div>
     <div id="dataset-separator"></div>
     <div id="dataset-modif-header">(no dataset selected)</div>
     <div id="dataset-modif-ds-name"></div>

package/static/linny-r.css

@@ -284,6 +284,7 @@ img.off {
   }
 }
 
+div.blink,
 img.blink {
   animation: blink 1s step-start 0s infinite;
 }
@@ -2665,6 +2666,15 @@ div.io-box {
   height: 59px;
 }
 
+#dataset-prefixed-count {
+  position: absolute;
+  bottom: 2px;
+  left: 2px;
+  max-width: 40%;
+  color: #700090;
+  font-weight: bold;
+}
+
 #dataset-outcome {
   position: absolute;
   bottom: 0px;

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

@@ -1266,30 +1266,30 @@ class ExperimentManager {
   }
 
   startExperiment(n=-1) {
-    // Recompile expressions, as these may have been changed by the modeler
+    // Recompile expressions, as these may have been changed by the modeler.
     MODEL.compileExpressions();
-    // Start sequence of solving model parametrizations
+    // Start sequence of solving model parametrizations.
     const x = this.selected_experiment;
     if(x) {
-      // Store original model settings
+      // Store original model settings.
       x.original_model_settings = MODEL.settingsString;
       x.original_round_sequence = MODEL.round_sequence;
-      // NOTE: switch off run chart display
+      // NOTE: Switch off run chart display.
       CHART_MANAGER.setRunsChart(false);
       // When Chart manager is showing, close it and notify modeler that charts
-      // should not be viewed during experiments
+      // should not be viewed during experiments.
       if(CHART_MANAGER.visible) {
         UI.buttons.chart.dispatchEvent(new Event('click'));
         UI.notify(UI.NOTICE.NO_CHARTS);
       }
-      // Change the buttons -- will return TRUE if experiment was paused
+      // Change the buttons -- will return TRUE if experiment was paused.
       const paused = this.resumeButtons();
       if(x.completed && n >= 0) {
         x.single_run = n; 
         x.active_combination_index = n;
         MODEL.running_experiment = x;
       } else if(!paused) {
-        // Clear previous run results (if any) unless resuming
+        // Clear previous run results (if any) unless resuming.
         x.clearRuns();
         x.inferVariables();
         x.time_started = new Date().getTime();
@@ -1369,11 +1369,14 @@ class ExperimentManager {
     // Perform post-processing after run results have been added.
     const x = MODEL.running_experiment;
     if(!x) return;
-    const aci = x.active_combination_index;
+    const
+        aci = x.active_combination_index,
+        single = (aci == x.single_run);
     // Always add solver messages.
     x.runs[aci].addMessages();
     const n = x.combinations.length;
-    if(!VM.halted && aci < n - 1 && aci != x.single_run) {
+    if(!VM.halted && aci < n - 1 && !single) {
+      // Continue with the next run.
       if(this.must_pause) {
         this.pausedButtons(aci);
         this.must_pause = false;
@@ -1384,12 +1387,13 @@ class ExperimentManager {
         // NOTE: When executing a remote command, wait for 1 second to
         // allow enough time for report writing.
         if(RECEIVER.active && RECEIVER.experiment) {
-          UI.setMessage('Reporting run #' + (x.active_combination_index - 1));
+          UI.setMessage('Reporting run #' + aci);
           delay = 1000;
         }
         setTimeout(() => EXPERIMENT_MANAGER.runModel(), delay);
       }
     } else {
+      // Stop the run sequence.
       x.time_stopped = new Date().getTime();
       if(x.single_run >= 0) {
         x.single_run = -1;
@@ -1409,18 +1413,19 @@ class ExperimentManager {
         RECEIVER.experiment = '';
         RECEIVER.callBack();
       }
-      // Restore original model settings
+      // Restore original model settings.
       MODEL.running_experiment = null;
       MODEL.parseSettings(x.original_model_settings);
       MODEL.round_sequence = x.original_round_sequence;
       // Reset the Virtual Machine so t=0 at the status line,
       // and ALL expressions are reset as well.
-      VM.reset();
+      if(!single) VM.reset();
       this.readyButtons();
     }
     this.drawTable();
     // Reset the model, as results of last run will be showing still.
-    UI.resetModel();
+    // NOTE: Do NOT do this after a single run.
+    if(!single) UI.resetModel();
     CHART_MANAGER.resetChartVectors();
     // NOTE: Clear chart only when done; charts do not update when an
     // experiment is running.

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

@@ -845,7 +845,7 @@ class GUIController extends Controller {
         'time-unit': 'time_unit',
         'method': 'method'
       });
-  
+    
     // Initially, no dialog being dragged or resized.
     this.dr_dialog = null;
     
@@ -1225,6 +1225,12 @@ class GUIController extends Controller {
     // Ensure that all modal windows respond to ESCape
     // (and more in general to other special keys).
     document.addEventListener('keydown', (event) => UI.checkModals(event));
+    // Ensure that all modal dialogs "swallow" mousedown events, as otherwise
+    // these may alo be processed by the main window drawing canvas.
+    for(const modal of document.getElementsByClassName('modal')) {
+      modal.addEventListener('mousedown', (event) => event.stopPropagation());
+    }
+  
   }
   
   setConstraintUnderCursor(c) {
@@ -1704,14 +1710,14 @@ class GUIController extends Controller {
   //
   
   draggableDialog(d) {
-    // Make dialog draggable
+    // Make dialog draggable.
     const
         dlg = document.getElementById(d + '-dlg'),
         hdr = document.getElementById(d + '-hdr');
     let cx = 0,
         cy = 0;
     if(dlg && hdr) {
-      // NOTE: dialogs are draggable only by their header
+      // NOTE: Dialogs are draggable only by their header.
       hdr.onmousedown = dialogHeaderMouseDown;
       dlg.onmousedown = dialogMouseDown;
       return dlg;
@@ -1722,13 +1728,13 @@ class GUIController extends Controller {
     
     function dialogMouseDown(e) {
       e = e || window.event;
-      // NOTE: no `preventDefault` so the header will also receive it
-      // Find the dialog element
+      // NOTE: No `preventDefault`, as this disables selector elements.
+      // Find the dialog element.
       let de = e.target;
       while(de && !de.id.endsWith('-dlg')) { de = de.parentElement; }
-      // Moves the dialog (`this`) to the top of the order
+      // Move the dialog (`this`) to the top of the order.
       const doi = UI.dr_dialog_order.indexOf(de);
-      // NOTE: do not reorder when already at end of list (= at top)
+      // NOTE: Do not reorder when already at end of list (= at top).
       if(doi >= 0 && doi !== UI.dr_dialog_order.length - 1) {
         UI.dr_dialog_order.splice(doi, 1);
         UI.dr_dialog_order.push(de);
@@ -1739,12 +1745,12 @@ class GUIController extends Controller {
     function dialogHeaderMouseDown(e) {
       e = e || window.event;
       e.preventDefault();
-      // Find the dialog element
+      // Find the dialog element.
       let de = e.target;
       while(de && !de.id.endsWith('-dlg')) { de = de.parentElement; }
-      // Record the affected dialog
+      // Record the affected dialog.
       UI.dr_dialog = de;
-      // Get the mouse cursor position at startup
+      // Get the mouse cursor position at startup.
       cx = e.clientX;
       cy = e.clientY;
       document.onmouseup = stopDragDialog;
@@ -1927,18 +1933,19 @@ class GUIController extends Controller {
   // Button functionality
   //
   
-  enableButtons(btns) {
+  enableButtons(btns, blink=false) {
     for(const btn of btns.trim().split(/\s+/)) {
       const b = document.getElementById(btn + '-btn');
-      b.classList.remove('disab', 'activ');
+      b.classList.remove('disab', 'activ', 'blink');
       b.classList.add('enab');
+      if(blink) b.classList.add('blink');
     }
   }
   
   disableButtons(btns) {
     for(const btn of btns.trim().split(/\s+/)) {
       const b = document.getElementById(btn + '-btn'); 
-      b.classList.remove('enab', 'activ', 'stay-activ');
+      b.classList.remove('enab', 'activ', 'stay-activ', 'blink');
       b.classList.add('disab');
     }
   }
@@ -2251,6 +2258,8 @@ class GUIController extends Controller {
     this.net_move_y = 0;
     // Get the paper coordinates indicated by the cursor.
     const cp = this.paper.cursorPosition(e.pageX, e.pageY);
+    this.mouse_x = cp[0];
+    this.mouse_y = cp[1];
     this.mouse_down_x = cp[0];
     this.mouse_down_y = cp[1];
     // De-activate "stay active" buttons if dysfunctional, or if SHIFT,
@@ -2632,17 +2641,11 @@ class GUIController extends Controller {
   // Handler for keyboard events
   //
   
-  checkModals(e) {
-    // Respond to Escape, Enter and shortcut keys.
-    const
-        ttype = e.target.type,
-        ttag = e.target.tagName,
-        modals = document.getElementsByClassName('modal');
-    // Modal dialogs: hide on ESC and move to next input on ENTER.
+  get topModal() {
+    // Return the topmost visible modal dialog, or NULL if none are showing.
+    const modals = document.getElementsByClassName('modal');
     let maxz = 0,
-        topmod = null,
-        code = e.code,
-        alt = e.altKey;
+        topmod = null;
     for(const m of modals) {
       const
           cs = window.getComputedStyle(m),
@@ -2652,6 +2655,18 @@ class GUIController extends Controller {
         maxz = z;
       }
     }
+    return topmod;
+  }
+  
+  checkModals(e) {
+    // Respond to Escape, Enter and shortcut keys.
+    const
+        ttype = e.target.type,
+        ttag = e.target.tagName,
+        code = e.code,
+        alt = e.altKey,
+        topmod = this.topModal;
+    // Modal dialogs: hide on ESC and move to next input on ENTER.
     // NOTE: Consider only the top modal (if any is showing).
     if(code === 'Escape') {
       e.stopImmediatePropagation();

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

@@ -11,7 +11,7 @@ for the Linny-R Dataset Manager dialog.
 */
 
 /*
-Copyright (c) 2017-2024 Delft University of Technology
+Copyright (c) 2017-2025 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
@@ -56,15 +56,11 @@ class GUIDatasetManager extends DatasetManager {
         'click', () => DATASET_MANAGER.load_csv_modal.show());
     document.getElementById('ds-delete-btn').addEventListener(
         'click', () => DATASET_MANAGER.deleteDataset());
-    document.getElementById('ds-filter-btn').addEventListener(
-        'click', () => DATASET_MANAGER.toggleFilter());
-    // Update when filter input text changes.
-    this.filter_text = document.getElementById('ds-filter-text');
-    this.filter_text.addEventListener(
-        'input', () => DATASET_MANAGER.changeFilter());
     this.dataset_table = document.getElementById('dataset-table');
-    // Data properties pane.
+    // Data properties pane below the dataset scroll area.
     this.properties = document.getElementById('dataset-properties');
+    // Number of prefixed datasets is displayed at bottom of left pane.
+    this.prefixed_count = document.getElementById('dataset-prefixed-count');
     // Toggle buttons at bottom of dialog.
     this.blackbox = document.getElementById('dataset-blackbox');
     this.blackbox.addEventListener(
@@ -144,12 +140,13 @@ class GUIDatasetManager extends DatasetManager {
   reset() {
     super.reset();
     this.selected_prefix_row = null;
+    this.selected_dataset = null;
     this.selected_modifier = null;
     this.edited_expression = null;
-    this.filter_pattern = null;
     this.clicked_object = null;
     this.last_time_clicked = 0;
     this.focal_table = null;
+    this.prefixed_datasets = [];
     this.expanded_rows = [];
   }
   
@@ -291,6 +288,17 @@ class GUIDatasetManager extends DatasetManager {
     for(const r of this.dataset_table.rows) if(r.dataset.prefix === lcp) return r;
     return null;
   }
+  
+  datasetsByPrefix(prefix) {
+    // Return the list of datasets having the specified prefix.
+    const
+        pid = UI.nameToID(prefix + UI.PREFIXER),
+        dsl = [];
+    for(const k of Object.keys(MODEL.datasets)) {
+      if(k.startsWith(pid)) dsl.push(k);
+    }
+    return dsl;
+  }
 
   selectPrefixRow(e) {
     // Select expand/collapse prefix row.
@@ -302,6 +310,7 @@ class GUIDatasetManager extends DatasetManager {
     const toggle = r.classList.contains('tree-btn');
     while(r.tagName !== 'TR') r = r.parentNode;
     this.selected_prefix_row = r;
+    this.prefixed_datasets = this.datasetsByPrefix(r.dataset.prefix);
     const sel = this.dataset_table.getElementsByClassName('sel-set');
     this.selected_dataset = null;
     if(sel.length > 0) {
@@ -311,7 +320,7 @@ class GUIDatasetManager extends DatasetManager {
     r.classList.add('sel-set');
     if(!e.target) r.scrollIntoView({block: 'center'});
     if(toggle || e.altKey || this.doubleClicked(r)) this.togglePrefixRow(e);
-    UI.enableButtons('ds-rename');      
+    this.updatePanes();      
   }
   
   updateDialog() {
@@ -321,18 +330,13 @@ class GUIDatasetManager extends DatasetManager {
         dnl = [],
         sd = this.selected_dataset,
         ioclass = ['', 'import', 'export'];
-    for(let d in MODEL.datasets) if(MODEL.datasets.hasOwnProperty(d) &&
-         // NOTE: do not list "black-boxed" entities
-        !d.startsWith(UI.BLACK_BOX) &&
-        // NOTE: do not list the equations dataset
-        MODEL.datasets[d] !== MODEL.equations_dataset) {
-      if(!this.filter_pattern || this.filter_pattern.length === 0 ||
-          patternMatch(MODEL.datasets[d].displayName, this.filter_pattern)) {
-        dnl.push(d);
-      }
+    for(let d in MODEL.datasets) if(MODEL.datasets.hasOwnProperty(d)) {
+      // NOTE: Do not list "black-boxed" entities or the equations dataset.
+      if(!d.startsWith(UI.BLACK_BOX) &&
+          MODEL.datasets[d] !== MODEL.equations_dataset) dnl.push(d);
     }
     dnl.sort((a, b) => UI.compareFullNames(a, b, true));
-    // First determine indentation levels, prefixes and names 
+    // First determine indentation levels, prefixes and names.
     const
         indent = [],
         pref_ids = [],
@@ -341,11 +345,11 @@ class GUIDatasetManager extends DatasetManager {
         xids = [];
     for(const dn of dnl) {
       const pref = UI.prefixesAndName(MODEL.datasets[dn].name);
-      // NOTE: only the name part (so no prefixes at all) will be shown
+      // NOTE: Only the name part (so no prefixes at all) will be shown.
       names.push(pref.pop());
       indent.push(pref.length);
-      // NOTE: ignore case but join again with ": " because prefixes
-      // can contain any character; only the prefixer is "reserved"
+      // NOTE: Ignore case but join again with ": " because prefixes
+      // can contain any character; only the prefixer is "reserved".
       const pref_id = pref.join(UI.PREFIXER).toLowerCase();
       pref_ids.push(pref_id);
       pref_names[pref_id] = pref;
@@ -363,11 +367,11 @@ class GUIDatasetManager extends DatasetManager {
       } else {
         ind_div = '';
       }
-      // NOTE: empty string should not add a collapse/expand row
+      // NOTE: Empty string should not add a collapse/expand row.
       if(pid && pid != prev_id && xids.indexOf(pid) < 0) {
         // NOTE: XX: aa may be followed by XX: YY: ZZ: bb, which requires
         // *two* collapsable lines: XX: YY and XX: YY: ZZ: before adding
-        // XX: YY: ZZ: bb
+        // XX: YY: ZZ: bb.
         const
             ps = pid.split(UI.PREFIXER),
             pps = prev_id.split(UI.PREFIXER),
@@ -375,20 +379,20 @@ class GUIDatasetManager extends DatasetManager {
             pns = pn.join(UI.PREFIXER),
             lpl = [];
         let lindent = 0;
-        // Ignore identical leading prefixes
+        // Ignore identical leading prefixes.
         while(ps.length > 0 && pps.length > 0 && ps[0] === pps[0]) {
           lpl.push(ps.shift());
           pps.shift();
           pn.shift();
           lindent++;
         }
-        // Add a "collapse" row for each new prefix
+        // Add a "collapse" row for each new prefix.
         while(ps.length > 0) {
           lpl.push(ps.shift());
           lindent++;
           const lpid = lpl.join(UI.PREFIXER);
           dl.push(['<tr data-prefix="', lpid,
-              '" data-prefix-name="', pns, '" class="dataset"',
+              '" data-prefix-name="', pns.slice(0, lpid.length), '" class="dataset"',
               'onclick="DATASET_MANAGER.selectPrefixRow(event);"><td>',
               // NOTE: data-prefix="x" signals that this is an extra row
               (lindent > 0 ?
@@ -398,7 +402,7 @@ class GUIDatasetManager extends DatasetManager {
               '<div data-prefix="x" class="tree-btn">',
               (this.expanded_rows.indexOf(lpid) >= 0 ? '\u25BC' : '\u25BA'),
               '</div>', pn.shift(), '</td></tr>'].join(''));
-          // Add to the list to prevent multiple c/x-rows for the same prefix
+          // Add to the list to prevent multiple c/x-rows for the same prefix.
           xids.push(lpid);
         }
       }
@@ -437,6 +441,7 @@ class GUIDatasetManager extends DatasetManager {
         sd = this.selected_dataset,
         btns = 'ds-data ds-clone ds-delete ds-rename';
     if(sd) {
+      this.prefixed_count.style.display = 'none';
       this.properties.style.display = 'block';
       document.getElementById('dataset-default').innerHTML =
           VM.sig4Dig(sd.default_value) +
@@ -469,8 +474,22 @@ class GUIDatasetManager extends DatasetManager {
       UI.enableButtons(btns);
     } else {
       this.properties.style.display = 'none';
+      const
+          pdsl = this.prefixed_datasets.length,
+          npds = pluralS(pdsl, 'dataset');
+      this.prefixed_count.innerText = npds;
+      this.prefixed_count.style.display = (pdsl ? 'block' : 'none');
       UI.disableButtons(btns);
-      if(this.selected_prefix_row) UI.enableButtons('ds-rename');
+      if(this.selected_prefix_row) {
+        UI.enableButtons('ds-rename ds-delete', true);
+        document.getElementById('ds-rename-btn')
+            .title = `Rename ${npds} by changing prefix "${this.selectedPrefix}"`;
+        document.getElementById('ds-delete-btn')
+            .title = `Delete ${npds} having prefix "${this.selectedPrefix}"`;        
+      } else {
+        document.getElementById('ds-rename-btn').title = 'Rename selected dataset';
+        document.getElementById('ds-delete-btn').title = 'Delete selected dataset';
+      }
     }
     this.updateModifiers();
   }
@@ -555,37 +574,14 @@ class GUIDatasetManager extends DatasetManager {
     if(d) DOCUMENTATION_MANAGER.update(d, shift);
   }
   
-  toggleFilter() {
-    const
-        btn = document.getElementById('ds-filter-btn'),
-        bar = document.getElementById('ds-filter-bar'),
-        dsa = document.getElementById('dataset-scroll-area');
-    if(btn.classList.toggle('stay-activ')) {
-      bar.style.display = 'block';
-      dsa.style.top = '81px';
-      dsa.style.height = 'calc(100% - 141px)';
-      this.changeFilter();
-    } else {
-      bar.style.display = 'none';
-      dsa.style.top = '62px';
-      dsa.style.height = 'calc(100% - 122px)';
-      this.filter_pattern = null; 
-      this.updateDialog();
-    }
-  }
-  
-  changeFilter() {
-    this.filter_pattern = patternList(this.filter_text.value);
-    this.updateDialog();
-  }
-  
   selectDataset(event, id) {
-    // Select dataset, or edit it when Alt- or double-clicked
+    // Select dataset, or edit it when Alt- or double-clicked.
     this.focal_table = this.dataset_table;
     const
         d = MODEL.datasets[id] || null,
         edit = event.altKey || this.doubleClicked(d);
     this.selected_dataset = d;
+    this.prefixed_datasets.length = 0;
     if(d && edit) {
       this.last_time_clicked = 0;
       this.editData();
@@ -748,18 +744,34 @@ class GUIDatasetManager extends DatasetManager {
       this.updateDialog();
     }    
   }
+  
+  get selectedAsList() {
+  // Return list of datasets selected directly or by prefix.
+    const dsl = [];
+    // Prevent including the equations dataset (just in case).
+    if(this.selected_dataset && this.selected_dataset !== MODEL.equations_dataset) {
+      dsl.push(this.selected_dataset);
+    } else {
+      // NOTE: List of prefixed datasets contains keys, not objects.
+      for(const k of this.prefixed_datasets) {
+        const ds = MODEL.datasets[k];
+        if(ds !== MODEL.equations_dataset) dsl.push();
+      }
+    }
+    return dsl;
+  }
 
   deleteDataset() {
-    const d = this.selected_dataset;
-    // Double-check, just in case...
-    if(d && d !== MODEL.equations_dataset) {
-      MODEL.removeImport(d);
-      MODEL.removeExport(d);
-      delete MODEL.datasets[d.identifier];
-      this.selected_dataset = null;
-      this.updateDialog();
-      MODEL.updateDimensions();      
+    // Delete selected dataset(s).
+    for(const ds of this.selectedAsList) {
+      MODEL.removeImport(ds);
+      MODEL.removeExport(ds);
+      delete MODEL.datasets[ds.identifier];
     }
+    this.selected_dataset = null;
+    this.prefixed_datasets.length = 0;
+    this.updateDialog();
+    MODEL.updateDimensions();      
   }
   
   toggleBlackBox() {
@@ -1249,7 +1261,7 @@ class GUIDatasetManager extends DatasetManager {
           ods = MODEL.namedObjectByID(id),
           ds = ods || MODEL.addDataset(n);
       // NOTE: `ds` will now be either a new dataset or an existing one.
-      if(ds) {
+      if(ds instanceof Dataset) {
         // Keep track of added/updated datasets.
         const
             odv = ds.default_value,
@@ -1262,6 +1274,8 @@ class GUIDatasetManager extends DatasetManager {
           added++;
         }
         ds.computeStatistics();
+      } else {
+        UI.warn(`Name conflict: ${ds.type} "${ds.displayName}" already exists`);
       }
     }
     // Notify modeler of changes (if any).

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

@@ -844,8 +844,8 @@ class GUIExperimentManager extends ExperimentManager {
   }
   
   showInfo(n, shift) {
-    // Display documentation for the n-th experiment defined in the model
-    // NOTE: skip when viewer is showing!
+    // Display documentation for the n-th experiment defined in the model.
+    // NOTE: Skip when viewer is showing!
     if(!UI.hidden('experiment-viewer')) return;
     if(n < MODEL.experiments.length) {
       // NOTE: mouse move over title in viewer passes n = -1 
@@ -856,7 +856,7 @@ class GUIExperimentManager extends ExperimentManager {
   
   showRunInfo(n, shift) {
     // Display information on the n-th combination if docu-viewer is visible
-    // and cursor is moved over run cell while Shift button is held down
+    // and cursor is moved over run cell while Shift button is held down.
     if(shift && DOCUMENTATION_MANAGER.visible) {
       const info = this.runInfo(n);
       if(info) {

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

@@ -949,7 +949,16 @@ class Finder {
         }
       }
       // Set the new default selector (if changed).
-      if(md.new_defsel !== false) ds.default_selector = md.new_defsel;
+      if(md.new_defsel !== false) {
+        // NOTE: `new_defsel` is a key; the actual selector name may have upper case
+        // letters, so get the selector name.
+        const dsm = ds.modifiers[md.new_defsel];
+        if(dsm) {
+          ds.default_selector = dsm.selector;
+        } else {
+          throw(`Unknown selector: ${md.new_defsel}`);
+        }
+      }
     }
     // Notify modeler of changes (if any).
     const msg = [];

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

@@ -289,6 +289,8 @@ class GUIRepositoryBrowser extends RepositoryBrowser {
         'click', () => REPOSITORY_BROWSER.performInclusion());
     this.include_modal.cancel.addEventListener(
         'click', () => REPOSITORY_BROWSER.cancelInclusion());
+    this.include_modal.element('prefix').addEventListener(
+        'blur', () => REPOSITORY_BROWSER.suggestBindings());
     this.include_modal.element('actor').addEventListener(
         'blur', () => REPOSITORY_BROWSER.updateActors());
 
@@ -614,6 +616,22 @@ class GUIRepositoryBrowser extends RepositoryBrowser {
     md.show('prefix');
   }
   
+  suggestBindings() {
+    // Select for each "Cluster: XXX" drop-down the one that matches the
+    // value of the prefix input field.
+    const
+        md = this.include_modal,
+        prefix = md.element('prefix').value.trim(),
+        sa = md.element('scroll-area'),
+        sels = sa.querySelectorAll('select');
+    for(const sel of sels) {
+      const
+          oid = UI.nameToID(prefix) + ':_' + sel.id,
+          ids = [...sel.options].map(o => o.value);
+      if(ids.indexOf(oid) >= 0) sel.value = oid;
+    }
+  }
+  
   updateActors() {
     // Add actor (if specified) to model, and then updates the selector options
     // for each actor binding selector.

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

@@ -501,6 +501,30 @@ class LinnyRModel {
     return this.namedObjectByID(UI.nameToID(name));
   }
   
+  validVariable(name) {
+    // Return TRUE if `name` references an entity plus valid attribute.
+    const
+        ea = name.split('|'),
+        en = ea[0].trim(),
+        e = this.objectByName(en);
+    if(!e) return `Unknown model entity "${en}"`;
+    const
+        ao = ea[1].split('@'),
+        a = ao[0].trim();
+    // Valid if no attribute, as all entity types have a default attribute. 
+    if(!a) return true;
+    // Attribute should be valid for the entity type.
+    const
+        et = e.type.toLowerCase(),
+        ac = VM.attribute_codes[VM.entity_letter_codes[et]];
+    if(ac.indexOf(a) >= 0 || (e instanceof Cluster && a.startsWith('=')) ||
+        (e instanceof Dataset && e.modifiers.hasOwnProperty(a.toLowerCase()))) {
+      return true;
+    }
+    if(e instanceof Dataset) return `Dataset ${e.displayName} has no modifier "${a}"`;
+    return `Invalid attribute "${a}"`;
+  }
+  
   setByType(type) {
     // Return a "dictionary" object with entities of the specified types
     if(type === 'Process') return this.processes;
@@ -4370,22 +4394,24 @@ class IOBinding {
         datastyle = (this.is_data ?
             '; text-decoration: 1.5px dashed underline' : '');
     let html = ['<tr class="', ioc[this.io_type],  '-param">',
-        '<td style="padding-bottom:2px">',
-        '<span style="font-style:normal; font-weight:normal', datastyle, '">',
+        '<td style="padding-bottom: 2px">',
+        '<span style="font-style: normal; font-weight: normal', datastyle, '">',
         this.entity_type, ':</span> ', this.name_in_module].join('');
     if(this.io_type === 1) {
       // An IMPORT binding generates two rows: the formal name (in the module)
-      // and the actual name (in the current model) as dropdown box
-      // NOTE: the first (default) option is the *prefixed* formal name, which
-      // means that the parameter is not bound to an entity in the current model
+      // and the actual name (in the current model) as dropdown box.
+      // NOTE: The first (default) option is the *prefixed* formal name, which
+      // means that the parameter is not bound to an entity in the current model.
       html += ['<br>&rdca;<select id="', this.id, '" name="', this.id,
-          '" class="i-param"><option value="_CLUSTER">Cluster: ',
+          '" class="i-param"><option value="_CLUSTER" style="color: purple">Cluster: ',
           this.name_in_module, '</option>'].join('');
       const
           s = MODEL.setByType(this.entity_type),
-          index = Object.keys(s).sort();
+          tail = ':_' + this.name_in_module.toLowerCase(),
+          index = Object.keys(s).sort(
+              (a, b) => compareTailFirst(a, b, tail));
       if(s === MODEL.datasets) {
-        // NOTE: do not list the model equations as dataset
+        // NOTE: Do not list the model equations as dataset.
         const i = index.indexOf(UI.EQUATIONS_DATASET_ID);
         if(i >= 0) index.splice(i, 1);
       }
@@ -4467,12 +4493,14 @@ class IOContext {
   }
 
   actualName(n, an='') {
-    // Returns the actual name for a parameter with formal name `n`
+    // Return the actual name for a parameter with formal name `n`
     // (and for processes and clusters: with actor name `an` if specified and
-    // not "(no actor)")
-    // NOTE: do not modify (no actor), nor the "dataset dot"
+    // not "(no actor)").
+    // NOTE: Do not modify (no actor), nor the "dataset dot".
     if(n === UI.NO_ACTOR || n === '.') return n;
-    // NOTE: the top cluster of the included model has the prefix as its name
+    // NOTE: Do not modify "prefix-relative" variables.
+    if(n.startsWith(':')) return n;
+    // NOTE: The top cluster of the included model has the prefix as its name.
     if(n === UI.TOP_CLUSTER_NAME || n === UI.FORMER_TOP_CLUSTER_NAME) {
       return this.prefix;
     }
@@ -4489,7 +4517,7 @@ class IOContext {
       return n;
     }
     // All other entities are prefixed
-    return (this.prefix ? this.prefix + ': ' : '') + n;
+    return (this.prefix ? this.prefix + UI.PREFIXER : '') + n;
   }
   
   get clusterName() {
@@ -4581,19 +4609,19 @@ class IOContext {
   }
   
   supersede(obj) {
-    // Logs that entity `obj` is superseded, i.e., that this entity already
+    // Log that entity `obj` is superseded, i.e., that this entity already
     // exists in the current model, and is initialized anew from the XML of
     // the model that is being included. The log is shown to modeler afterwards.
     addDistinct(obj.type + UI.PREFIXER + obj.displayName, this.superseded);
   }
   
   rewrite(x, n1='', n2='') {
-    // Replaces entity names of variables used in expression `x` by their
-    // actual name after inclusion
-    // NOTE: when strings `n1` and `n2` are passed, replace entity name `n1`
+    // Replace entity names of variables used in expression `x` by their
+    // actual name after inclusion.
+    // NOTE: When strings `n1` and `n2` are passed, replace entity name `n1`
     // by `n2` in all variables (this is not IO-related, but used when the
-    // modeler renames an entity)
-    // NOTE: nothing to do if expression contains no variables 
+    // modeler renames an entity).
+    // NOTE: Nothing to do if expression contains no variables.
     if(x.text.indexOf('[') < 0) return;
     const rcnt = this.replace_count;
     let s = '',
@@ -4607,28 +4635,28 @@ class IOContext {
     while(true) {
       p = x.text.indexOf('[', q + 1);
       if(p < 0) {
-        // No more '[' => add remaining part of text, and quit
+        // No more '[' => add remaining part of text, and quit.
         s += x.text.slice(q + 1);
         break;
       }
-      // Add part from last ']' up to new '['
+      // Add part from last ']' up to new '['.
       s += x.text.slice(q + 1, p);
       // Find next ']'
       q = indexOfMatchingBracket(x.text, p);
-      // Get the bracketed text (without brackets)
+      // Get the bracketed text (without brackets).
       ss = x.text.slice(p + 1, q);
-      // Separate into variable and attribute + offset string (if any)
+      // Separate into variable and attribute + offset string (if any).
       vb = ss.lastIndexOf('|');
       if(vb >= 0) {
         v = ss.slice(0, vb);
-        // NOTE: attribute string includes the vertical bar '|'
+        // NOTE: Attribute string includes the vertical bar '|'.
         a = ss.slice(vb);
       } else {
-        // Separate into variable and offset string (if any)
+        // Separate into variable and offset string (if any).
         vb = ss.lastIndexOf('@');
         if(vb >= 0) {
           v = ss.slice(0, vb);
-          // NOTE: attribute string includes the "at" sign '@'
+          // NOTE: Attribute string includes the "at" sign '@'.
           a = ss.slice(vb);
         } else {
           v = ss;
@@ -4650,12 +4678,13 @@ class IOContext {
           brace = '';
         }
       }
-      // NOTE: patterns used to compute statistics must not be rewritten 
+      // NOTE: Patterns used to compute statistics must not be rewritten.
       let doit = true;
       stat = v.split('$');
       if(stat.length > 1 && VM.statistic_operators.indexOf(stat[0]) >= 0) {
         if(brace) {
-          // NOTE: this does not hold for statistics for experiment outcomes
+          // NOTE: This does not hold for statistics for experiment outcomes,
+          // because there no patterns but actual names are used.
           brace += stat[0] + '$';
           v = stat.slice(1).join('$');
         } else {
@@ -4663,21 +4692,21 @@ class IOContext {
         }
       }
       if(doit) {
-        // NOTE: when `n1` and `n2` have been specified, compare `v` with `n1`,
-        // and if matching, replace it by `n2`
+        // NOTE: When `n1` and `n2` have been specified, compare `v` with `n1`,
+        // and if matching, replace it by `n2`.
         if(n1 && n2) {
           // NOTE: UI.replaceEntity handles link names by replacing either the
-          // FROM or TO node name if it matches with `n1`
+          // FROM or TO node name if it matches with `n1`.
           const r = UI.replaceEntity(v, n1, n2);
-          // Only replace `v` by `r` in case of a match
+          // Only replace `v` by `r` in case of a match.
           if(r) {
             this.replace_count++;
             v = r;
           }
         } else {
           // When `n1` and `n2` are NOT specified, rewrite the variable
-          // using the parameter bindings
-          // NOTE: link variables contain TWO entity names
+          // using the parameter bindings.
+          // NOTE: Link variables contain TWO entity names.
           if(v.indexOf(UI.LINK_ARROW) >= 0) {
             const ln = v.split(UI.LINK_ARROW);
             v = this.actualName(ln[0]) + UI.LINK_ARROW + this.actualName(ln[1]);
@@ -4686,24 +4715,24 @@ class IOContext {
           }
         }
       }
-      // Add [actual name|attribute string] while preserving "by reference"
+      // Add [actual name|attribute string] while preserving "by reference".
       s += `[${brace}${by_ref}${v}${a}]`;
     }
-    // Increase expression count when 1 or more variables were replaced
+    // Increase expression count when 1 or more variables were replaced.
     if(this.replace_count > rcnt) this.expression_count++;
-    // Replace the original expression by the new one
+    // Replace the original expression by the new one.
     x.text = s;
-    // Force expression to recompile
+    // Force expression to recompile.
     x.code = null;
   }
   
   addedNode(node) {
-    // Record that node was added
+    // Record that node was added.
     this.added_nodes.push(node);
   }
 
   addedLink(link) {
-    // Record that link was added
+    // Record that link was added.
     this.added_links.push(link);
   }
 
@@ -9196,12 +9225,17 @@ class Dataset {
     // Data is stored simply as semicolon-separated floating point numbers,
     // with N-digit precision to keep model files compact (default: N = 8).
     let d = [];
-    for(const v of this.data) {
-      // Convert number to string with the desired precision.
-      const f = v.toPrecision(CONFIGURATION.dataset_precision);
-      // Then parse it again, so that the number will be represented
-      // (by JavaScript) in the most compact representation.
-      d.push(parseFloat(f));
+    // NOTE: Guard against empty strings and other invalid data.
+    for(const v of this.data) if(v) {
+      try {
+        // Convert number to string with the desired precision.
+        const f = v.toPrecision(CONFIGURATION.dataset_precision);
+        // Then parse it again, so that the number will be represented
+        // (by JavaScript) in the most compact representation.
+        d.push(parseFloat(f));
+      } catch(err) {
+        console.log('-- Notice: dataset', this.displayName, 'has invalid data', v);
+      }
     }
     return d.join(';');
   }

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

@@ -303,11 +303,21 @@ function markFirstDifference(s1, s2) {
 //
 
 function ciCompare(a, b) {
-  // Performs case-insensitive comparison that does differentiate
-  // between accented characters (as this differentiates between identifiers)
+  // Perform case-insensitive comparison that does differentiate
+  // between accented characters (as this differentiates between identifiers).
   return a.localeCompare(b, undefined, {sensitivity: 'accent'});
 }
 
+function compareTailFirst(a, b, tail) {
+  // Sort strings while prioritizing the group of elements that end on `tail`.
+  const
+      a_tail = a.endsWith(tail),
+      b_tail = b.endsWith(tail);
+  if(a_tail && !b_tail) return -1;
+  if(!a_tail && b_tail) return 1;
+  return ciCompare(a, b);
+}
+
 function endsWithDigits(str) {
   // Returns trailing digts of `str` (empty string will evaluate as FALSE)
   let i = str.length - 1,
@@ -1143,6 +1153,7 @@ if(NODE) module.exports = {
   differences: differences,
   markFirstDifference: markFirstDifference,
   ciCompare: ciCompare,
+  compareTailFirst: compareTailFirst,
   endsWithDigits: endsWithDigits,
   indexOfMatchingBracket: indexOfMatchingBracket,
   monoSpaced: monoSpaced,

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

@@ -951,7 +951,13 @@ class ExpressionParser {
         // Variable name may start with a colon to denote that the owner
         // prefix should be added.
         name = UI.colonPrefixedName(name, this.owner_prefix);
-        if(x.x) {
+        // First check whether name refers to a valid attribute of an
+        // existing model entity.
+        const check = MODEL.validVariable(name);
+        if(check !== true) {
+          // If not TRUE, check will be an error message. 
+          msg = check;
+        } else if(x.x) {
           // Look up name in experiment outcomes list.
           x.v = x.x.resultIndex(name);
           if(x.v < 0 && name.indexOf('#') >= 0 &&
@@ -989,7 +995,26 @@ class ExpressionParser {
           if(x.r === false && x.t === false) {
             msg = 'Experiment run not specified';
           } else if(x.v === false) {
-            msg = `No experiments have variable "${name}" as result`;
+            // NOTE: Variable may not be defined as outcome of any experiment.
+            // This will be handled at runtime by VMI_push_run_result, but
+            // it will be helpful to notify modelers at compile time when an
+            // experiment is running, and also when they are editing an
+            // expression (so when a modal dialog is showing).
+            const
+                notice = `No experiments have variable "${name}" as result`,
+                tm = UI.topModal;
+            // NOTE: Only notify when expression-editing modals are showing.
+            if(tm) {
+              const mid = tm.id.replace('-modal', '');
+              if(['actor', 'note', 'link', 'boundline-data', 'process',
+                    'product', 'equation', 'expression'].indexOf(mid) >= 0) {
+                UI.notify(notice);
+              }
+            }
+            if(MODEL.running_experiment) {
+              // Log message only for block 1.
+              VM.logMessage(1, VM.WARNING + notice);
+            }
           }
         }
         if(msg) {
@@ -2311,6 +2336,17 @@ class VirtualMachine {
       P: 'process',
       Q: 'product'
     };
+    // Reverse lookup for entity letter codes.
+    this.entity_letter_codes = {
+      actor: 'A',
+      constraint: 'B',
+      cluster: 'C',
+      dataset: 'D',
+      equation: 'E',
+      link: 'L',
+      process: 'P',
+      product: 'Q'
+    };
     this.entity_letters = 'ABCDELPQ';
     // Standard attributes of Linny-R entities.
     this.attribute_names = {
@@ -7168,7 +7204,13 @@ function VMI_push_run_result(x, args) {
     let xp = rrspec.x,
         rn = rrspec.r,
         rri = rrspec.v;
-    if(xp === false) xp = MODEL.running_experiment;
+    if(xp === false) {
+      // If no experiment is specified, use the running experiment.
+      // NOTE: To facilitate testing a "single run" without using the
+      // Experiment manager, default to the experiment that is selected
+      // in the Experiment manager (but not "running").
+      xp = MODEL.running_experiment || EXPERIMENT_MANAGER.selected_experiment;
+    }
     if(xp instanceof Experiment) {
       if(Array.isArray(rn)) {
         // Let the running experiment infer run number from selector list `rn`
@@ -7176,7 +7218,22 @@ function VMI_push_run_result(x, args) {
         rn = xp.matchingCombinationIndex(rn); 
       } else if(rn < 0) {
         // Relative run number: use current run # + r (first run has number 0).
-        rn += xp.active_combination_index;
+        if(xp === MODEL.running_experiment) {
+          rn += xp.active_combination_index;
+        } else if(xp.chart_combinations.length) {
+          // Modeler has selected one or more runs in the viewer table.
+          // FInd the highest number of a selected run that has been performed.
+          let last = -1;
+          for(const ccn of xp.chart_combinations) {
+            if(ccn > last && ccn < xp.runs.length) last = ccn;
+          }
+          // If no performed runs are selected, use the last performed run. 
+          if(last < 0) last = xp.runs.length - 1;
+          rn += last;
+        } else {
+          // Choose the run relative to the total number of completed runs.
+          rn += xp.runs.length - 1;
+        }
       } else if(rrspec.nr !== false) {
         // Run number inferred from local time step of expression.
         const