linny-r 1.1.20 → 1.1.22

package/README.md

@@ -25,7 +25,7 @@ Technical documentation will be developed on GitHub: https://github.com/pwgbots/
 Linny-R is developed as a JavaScript package, and requires that **Node.js** is installed on your computer. 
 This software can be downloaded from <a href="https://nodejs.org" target="_blank">https://nodejs.org</a>. 
 Make sure that you choose the correct installer for your computer.
-Linny-R is developed using the _current_ release. Presently (October 2022) this is 19.0.0. 
+Linny-R is developed using the _current_ release. Presently (February 2023) this is 19.6.0. 
 
 Run the installer and accept the default settings.
 There is **no** need to install the optional _Tools for Native Modules_.
@@ -36,7 +36,7 @@ Verify the installation by typing:
 
 ``node --version``
 
-The response should be the version number of Node.js, for example: v19.0.0.
+The response should be the version number of Node.js, for example: v19.6.0.
 
 ## Installing Linny-R
 It is advisable to install Linny-R in a directory on your computer, not in a cloud. 
@@ -169,8 +169,8 @@ Open the Command Line Interface (CLI) of your computer, change to your `WORKING_
 This response should be something similar to:
 
 <pre>
-Node.js server for Linny-R version 1.1.14
-Node.js version: v19.0.0
+Node.js server for Linny-R version 1.1.21
+Node.js version: v19.6.0
 ... etc.
 </pre>
 

package/package.json

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

package/static/index.html

@@ -159,7 +159,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
                       '[LINNY_R_VERSION]', v);
               // Update the version number in the browser's upper left corner
               document.getElementById('linny-r-version-number').innerHTML = v;
-              if(info[1] !== 'up-to-date') {
+              // NOTE: server detects "version 0" when npmjs website was
+              // not reached; if so, do not suggest a new version exists
+              if(info[1] !== 'up-to-date' && info[1] !== '0') {
                 // Inform user that newer version exists
                 UI.check_update_modal.element('msg').innerHTML = [
                     '<a href="', GITHUB_REPOSITORY,
@@ -2107,6 +2109,8 @@ NOTE: * and ? will be interpreted as wildcards"
         <div id="xv-no-scale" class="color-scale no-colors"></div>
         <img id="xv-copy-btn" class="btn enab" src="images/table-to-clpbrd.png"
              title="Copy table to clipboard (as HTML)">
+        <img id="xv-download-btn" class="btn enab" src="images/save-data.png"
+             title="Download results (CSV file)">
       </div>
     </div>
     <div id="experiment-resize" class="resizer"></div>
@@ -2151,6 +2155,83 @@ NOTE: * and ? will be interpreted as wildcards"
     </div>
   </div>
 
+  <!-- the DOWNLOAD dialog asks which outcomes to save, and how -->
+  <div id="xp-download-modal" class="modal">
+    <div id="xp-download-dlg" class="inp-dlg">
+      <div class="dlg-title">
+        Download results
+        <img class="cancel-btn" src="images/cancel.png">
+        <img class="ok-btn" src="images/ok.png">
+      </div>
+      <fieldset id="xp-download-variables">
+        <legend>Variables:</legend>
+        <div>
+          <input type="radio" id="xp-download-selected-v"
+                 name="variables" value="selected">
+          <label for="selected">Only the selected variable</label>
+        </div>
+        <div>
+          <input type="radio" id="xp-download-all-v"
+                 name="variables" value="all">
+          <label for="all">All variables (N =
+              <span id="xp-download-var-count"></span>)
+          </label>
+        </div>
+      </fieldset>
+      <fieldset id="xp-download-runs">
+        <legend>Runs:</legend>
+        <div>
+          <input type="radio" id="xp-download-selected-r"
+                 name="runs" value="selected">
+          <label for="selected">Only the selected
+              run<span id="xp-download-run-s">s</span>
+          </label>
+        </div>
+        <div>
+          <input type="radio" id="xp-download-all-r"
+                 name="runs" value="all">
+          <label for="all">All runs (N =
+              <span id="xp-download-run-count"></span>)
+          </label>
+        </div>
+      </fieldset>
+      <fieldset id="xp-download-data">
+        <legend>Data:</legend>
+        <div>
+          <input type="checkbox" id="xp-download-statistics" value="1">
+          <label for="stats">Statistics</label>
+        </div>
+        <div>
+          <input type="checkbox" id="xp-download-series" value="1">
+          <label for="series">Time series data</label>
+        </div>
+        <div>
+          <input type="checkbox" id="xp-download-solver" value="1">
+          <label for="series">Solver information</label>
+        </div>
+      </fieldset>
+      <fieldset id="xp-download-format">
+        <legend>Format:</legend>
+        <div style="margin-left: 5px">
+          <label for="xp-download-separator">Separator:</label>
+          <select id="xp-download-separator">
+            <option value="comma">Comma</option>
+            <option value="semicolon">Semicolon</option>
+            <option value="tab">Tab</option>
+          </select>
+          <label for="xp-download-quotes">String quotes:</label>
+          <select id="xp-download-quotes">
+            <option value="none">None</option>
+            <option value="single">Single</option>
+            <option value="double">Double</option>
+          </select>
+          <label for="xp-download-precision">Precision:</label>
+          <input type="text" id="xp-download-precision"> digits
+        </div>
+      </fieldset>
+    </div>
+  </div>
+
   <!-- the SETTINGS dialog permits editing the model settings dimensions -->
   <div id="xp-settings-modal" class="modal">
     <div id="xp-settings-dlg" class="inp-dlg">

package/static/linny-r.css

@@ -2966,9 +2966,9 @@ td.sa-not-run {
   display: none;
   z-index: 20;
   margin: 0;
-  width: 400px;
+  width: 425px;
   height: 275px;
-  min-width: 400px;
+  min-width: 425px;
   min-height: 250px;
   max-height: 99vh;
   max-width: 99vw;
@@ -3403,7 +3403,8 @@ div.no-colors {
 #sa-copy-btn,
 #sa-copy-data-btn,
 #xv-copy-btn,
-#xv-chart-btn {
+#xv-chart-btn,
+#xv-download-btn {
   display: inline-block;
   vertical-align: bottom;
   width: 19px;
@@ -3530,6 +3531,63 @@ span.sd-clear {
   margin-left: 5px;
 }
 
+/* the DOWNLOAD dialog prompts for selection of outcomes */
+#xp-download-dlg {
+  width: 335px;
+  height: 168px;
+}
+
+#xp-download-variables {
+  position: absolute;
+  top: 22px;
+  left: 1px;
+  width: 163px;
+  border: none;
+  padding-left: 0px;  
+}
+
+#xp-download-runs {
+  position: absolute;
+  top: 22px;
+  left: 180px;
+  width: 146px;
+  border: none;
+  padding-left: 0px;  
+}
+
+#xp-download-data {
+  position: absolute;
+  top: 84px;
+  left: 1px;
+  width: 163px;
+  border: none;
+  padding-left: 0px;  
+}
+
+#xp-download-format {
+  position: absolute;
+  top: 84px;
+  left: 180px;
+  width: 146px;
+  border: none;
+  padding-left: 0px;  
+}
+
+#xp-download-separator,
+#xp-download-quotes {
+  font-size: 11px;
+  height: 19px;
+  margin-bottom: 3px;
+}
+
+#xp-download-precision {
+  font-size: 12px;
+  height: 15px !important;
+  width: 20px;
+  text-align: center;  
+}
+
+
 /* the ACTOR DIMENSION dialog allows editing this dimension */
 #xp-actor-dimension-dlg {
   width: 150px;

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

@@ -2808,7 +2808,7 @@ class ModalDialog {
   }
 
   show(name=null) {
-    // Makes dialog visible and focuses on element with  `focal`
+    // Makes dialog visible and focuses on element with `focal`
     this.modal.style.display = 'block';
     if(name) this.element(name).focus();
   }
@@ -6739,9 +6739,14 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
       options.push('<option selected disabled value="-1"></option>');
       const d = MODEL.equations_dataset;
       if(d) {
+        const slist = [];
         for(let m in d.modifiers) if(d.modifiers.hasOwnProperty(m)) {
-          const s = d.modifiers[m].selector;
-          options.push(`<option value="${s}">${s}</option>`);
+          slist.push(d.modifiers[m].selector);
+        }
+        // Sort to present equations in alphabetical order
+        slist.sort();
+        for(let i = 0; i < slist.length; i++) {
+          options.push(`<option value="${slist[i]}">${slist[i]}</option>`);
         }
       }
       va.innerHTML = options.join('');
@@ -9819,6 +9824,12 @@ class GUIChartManager extends ChartManager {
     } else if(this.chart_index >= 0) {
       // Only accept when all conditions are met
       ev.preventDefault();
+      if(obj instanceof DatasetModifier) {
+        // Equations can be added directly as chart variable
+        this.addVariable(obj.name);
+        return;
+      }
+      // For other entities, the attribute must be specified
       this.add_variable_modal.show();
       const
           tn = VM.object_types.indexOf(obj.type),
@@ -11282,6 +11293,8 @@ class GUIExperimentManager extends ExperimentManager {
         'click', () => EXPERIMENT_MANAGER.designMode());
     document.getElementById('xv-copy-btn').addEventListener(
         'click', () => EXPERIMENT_MANAGER.copyTableToClipboard());
+    document.getElementById('xv-download-btn').addEventListener(
+        'click', () => EXPERIMENT_MANAGER.promptForDownload());
     // The viewer's drop-down selectors
     document.getElementById('viewer-variable').addEventListener( 
         'change', () => EXPERIMENT_MANAGER.setVariable());
@@ -11380,6 +11393,12 @@ class GUIExperimentManager extends ExperimentManager {
     this.clusters_modal.element('delete-btn').addEventListener(
         'click', () => EXPERIMENT_MANAGER.deleteClusterFromIgnoreList());
 
+    this.download_modal = new ModalDialog('xp-download');
+    this.download_modal.ok.addEventListener(
+        'click', () => EXPERIMENT_MANAGER.downloadDataAsCSV());
+    this.download_modal.cancel.addEventListener(
+        'click', () => EXPERIMENT_MANAGER.download_modal.hide());
+
     // Initialize properties
     this.reset();
   }
@@ -12739,6 +12758,77 @@ N = ${rr.N}, vector length = ${rr.vector.length}` : '')].join('');
     UI.notify('Table copied to clipboard (as HTML)');
   }
   
+  promptForDownload() {
+    // Show the download modal
+    const x = this.selected_experiment;
+    if(!x) return;
+    const
+        md = this.download_modal,
+        ds = x.download_settings,
+        runs = x.runs.length,
+        sruns = x.chart_combinations.length;
+    if(!runs) {
+      UI.notify('No experiment results');
+      return;
+    }
+    md.element(ds.variables + '-v').checked = true;
+    // Disable "selected runs" button when no runs have been selected
+    if(sruns) {
+      md.element('selected-r').disabled = false;
+      md.element(ds.runs + '-r').checked = true;
+    } else {
+      md.element('selected-r').disabled = true;
+      // Check "all runs" but do not change download setting
+      md.element('all-r').checked = true;
+    }
+    this.download_modal.show();
+    md.element('statistics').checked = ds.statistics;
+    md.element('series').checked = ds.series;
+    md.element('solver').checked = ds.solver;
+    md.element('separator').value = ds.separator;
+    md.element('quotes').value = ds.quotes;
+    md.element('precision').value = ds.precision;
+    md.element('var-count').innerText = x.variables.length;
+    md.element('run-count').innerText = runs;
+    md.element('run-s').innerText = (sruns === 1 ? '' : 's');
+  }
+  
+  downloadDataAsCSV() {
+    // Push results to browser
+    if(this.selected_experiment) {
+      const md = this.download_modal;
+      this.selected_experiment.download_settings = {
+          variables: md.element('all-v').checked ? 'all' : 'selected',
+          runs: md.element('all-r').checked ? 'all' : 'selected',
+          statistics: md.element('statistics').checked,
+          series: md.element('series').checked,
+          solver: md.element('solver').checked,
+          separator: md.element('separator').value,
+          quotes: md.element('quotes').value,
+          precision: safeStrToInt(md.element('precision').value,
+              CONFIGURATION.results_precision),
+      };
+      md.hide();
+      const data = this.selected_experiment.resultsAsCSV;
+      if(data) {
+        UI.setMessage('CSV file size: ' + UI.sizeInBytes(data.length));
+        const el = document.getElementById('xml-saver');
+        el.href = 'data:attachment/text,' + encodeURI(data);
+        console.log('Encoded CSV file size:', el.href.length);
+        el.download = 'results.csv';
+        if(el.href.length > 25*1024*1024 &&
+            navigator.userAgent.search('Chrome') <= 0) {
+          UI.notify('CSV file size exceeds 25 MB. ' +
+              'If it does not download, select fewer runs');
+        }
+        el.click();
+        UI.normalCursor();
+      } else {
+        UI.notify('No data');
+      }
+    }
+  }
+  
 } // END of class GUIExperimentManager
 
 

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

@@ -10,7 +10,7 @@ Linny-R project.
 */
 
 /*
-Copyright (c) 2017-2022 Delft University of Technology
+Copyright (c) 2017-2023 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
@@ -7482,71 +7482,7 @@ class Dataset {
     for(let k in this.modifiers) if(this.modifiers.hasOwnProperty(k)) {
       sl.push(this.modifiers[k].selector);
     }
-    return sl.sort((s1, s2) => {
-        // Dataset selectors comparison is case-insensitive, and puts wildcards
-        // last, where * comes later than ?
-        // NOTE: without wildcards, strings that are identical except for the
-        // digits they *end* on are sorted on this "end number" (so abc12 > abc2)
-        // NOTE: this also applies to percentages ("end number"+ %)
-        if(s1 === s2) return 0;
-        if(s1 === '*') return 1;
-        if(s2 === '*') return -1;
-        const
-            star1 = s1.indexOf('*'),
-            star2 = s2.indexOf('*');
-        if(star1 >= 0) {
-          if(star2 < 0) return 1;
-          return s1.localeCompare(s2);
-        }
-        if(star2 >= 0) return -1;  
-        // Replace ? by | because | has a higher ASCII value than all other chars
-        let s_1 = s1.replace('?', '|').toLowerCase(), 
-            s_2 = s2.replace('?', '|').toLowerCase(),
-            // NOTE: treat selectors ending on a number or percentage as special case
-            n_1 = endsWithDigits(s_1),
-            p_1 = (s1.endsWith('%') ? endsWithDigits(s1.slice(0, -1)) : '');
-        if(n_1) {
-          const
-              ss_1 = s1.slice(0, -n_1.length),
-              n_2 = endsWithDigits(s2);
-          if(n_2 && ss_1 === s2.slice(0, -n_2.length)) {
-            return parseInt(n_1) - parseInt(n_2);
-          }
-        } else if(p_1) {
-          const
-              ss_1 = s1.slice(0, -p_1.length - 1),
-              p_2 = (s2.endsWith('%') ? endsWithDigits(s2.slice(0, -1)) : '');
-          if(p_2 && ss_1 === s2.slice(0, -p_2.length - 1)) {
-            return parseInt(p_1) - parseInt(p_2);
-          }
-        }
-        // Also sort selectors ending on minuses lower than those ending on plusses,
-        // and such that X-- comes before X-, like X+ automatically comes before X++
-        // ASCII(+) = 43, ASCII(-) = 45, so replace trailing minuses by as many spaces
-        // (ASCII 32) and add a '!' (ASCII 33) -- this then "sorts things out"
-        let n = s_1.length,
-            i = n - 1;
-        while(i >= 0 && s_1[i] === '-') i--;
-        // If trailing minuses, replace by as many spaces and add an exclamation point
-        if(i < n - 1) {
-          s_1 = s_1.substr(0, i);
-          while(s_1.length < n) s_1 += ' ';
-          s_1 += '!';
-        }
-        // Do the same for the second "normalized" selector
-        n = s_2.length;
-        i = n - 1;
-        while(i >= 0 && s_2[i] === '-') i--;
-        if(i < n - 1) {
-          s_2 = s_2.substr(0, i);
-          while(s_2.length < n) s_2 += ' ';
-          s_2 += '!';
-        }
-        // Now compare the two "normalized" selectors
-        if(s_1 < s_2) return -1;
-        if(s_1 > s_2) return 1;
-        return 0;
-      });
+    return sl.sort(compareSelectors);
   }
 
   get plainSelectors() {
@@ -7803,9 +7739,14 @@ class Dataset {
       p += ' outcome="1"';
     }
     if(this.black_box) p += ' black-box="1"';
-    const ml = [];
+    const ml = [],
+          sl = [];
     for(let m in this.modifiers) if(this.modifiers.hasOwnProperty(m)) {
-      ml.push(this.modifiers[m].asXML);
+      sl.push(m);
+    }
+    sl.sort(compareSelectors);
+    for(let i = 0; i < sl.length; i++) {
+      ml.push(this.modifiers[sl[i]].asXML);
     }
     // NOTE: "black-boxed" datasets are stored anonymously without comments
     const id = UI.nameToID(n);
@@ -9651,6 +9592,16 @@ class Experiment {
   constructor(n) {
     this.title = n;
     this.comments = '';
+    this.download_settings = {
+        variables: 'selected',
+        runs: 'selected',
+        statistics: true,
+        series: false,
+        solver: false,
+        separator: 'semicolon',
+        quotes: 'none',
+        precision: CONFIGURATION.results_precision
+      };
     this.dimensions = [];
     this.charts = [];
     this.actual_dimensions = [];
@@ -9774,6 +9725,14 @@ class Experiment {
       (this.completed ? '" completed="1' : ''),
       '" started="', this.time_started,
       '" stopped="', this.time_stopped,
+      '" variables="', this.download_settings.variables,
+      '" runs="', this.download_settings.runs,
+      '" statistics="', this.download_settings.statistics ? 1 : 0,
+      '" series="', this.download_settings.series ? 1 : 0,
+      '" solver="', this.download_settings.solver ? 1 : 0,
+      '" separator="', this.download_settings.separator,
+      '" quotes="', this.download_settings.quotes,
+      '" precision="', this.download_settings.precision,
       '"><title>', xmlEncoded(this.title),
       '</title><notes>', xmlEncoded(this.comments),
       '</notes><dimensions>', d,
@@ -9796,6 +9755,18 @@ class Experiment {
     this.completed = nodeParameterValue(node, 'completed') === '1';
     this.time_started = safeStrToInt(nodeParameterValue(node, 'started'));
     this.time_stopped = safeStrToInt(nodeParameterValue(node, 'stopped'));
+    // Restore last download dialog settings for this experiment 
+    this.download_settings = {
+        variables: nodeParameterValue(node, 'variables') || 'selected',
+        runs: nodeParameterValue(node, 'runs') || 'selected',
+        statistics: nodeParameterValue(node, 'statistics') !== '0',
+        series: nodeParameterValue(node, 'series') === '1',
+        solver: nodeParameterValue(node, 'solver') === '1',
+        separator: nodeParameterValue(node, 'separator') || 'semicolon',
+        quotes: nodeParameterValue(node, 'quotes') || 'none',
+        precision: safeStrToInt(nodeParameterValue(node, 'precision'),
+            CONFIGURATION.results_precision)
+      };
     this.title = xmlDecoded(nodeContentByTag(node, 'title'));
     this.comments = xmlDecoded(nodeContentByTag(node, 'notes'));
     let c, n = childNodeByTag(node, 'dimensions');
@@ -10021,6 +9992,124 @@ class Experiment {
     return null;
   }
 
+  get resultsAsCSV() {
+    // Return results as specfied by the download settings
+    const
+        allruns = this.download_settings.runs === 'all',
+        sep = (this.download_settings.separator === 'tab' ? '\t' :
+              (this.download_settings.separator === 'comma' ? ',' : ';')),
+        quo = (this.download_settings.quotes === 'single' ? "'" :
+              (this.download_settings.quotes === 'double' ? '"' : '')),
+        vars = [],
+        data = {
+            nr: `${quo}Run number${quo}${sep}`,
+            combi: `${quo}Selectors${quo}${sep}`,
+            rsecs: `${quo}Run duration${quo}${sep}`,
+            ssecs: `${quo}Solver time${quo}${sep}`,
+            warnings: `${quo}Warnings${quo}${sep}`,
+            variable: `${quo}Variable${quo}${sep}`,
+            N: `${quo}N${quo}${sep}`,
+            sum: `${quo}Sum${quo}${sep}`,
+            mean: `${quo}Mean${quo}${sep}`,
+            variance: `${quo}Variance${quo}${sep}`,
+            minimum: `${quo}Minimum${quo}${sep}`,
+            maximum: `${quo}Maximum${quo}${sep}`,
+            NZ: `${quo}Non-zero${quo}${sep}`,
+            last: `${quo}Last${quo}${sep}`,
+            exceptions: `${quo}Exceptions${quo}${sep}`,
+            run: []
+          };
+    // Make list of indices of variables to include
+    if(this.download_settings.variables === 'selected') {
+      // Only one variable
+      vars.push(this.resultIndex(this.selected_variable));
+    } else {
+      // All variables
+      for(let i = 0; i < this.variables.length; i++) {
+        vars.push(i);
+      }
+    }
+    const nvars = vars.length;
+    for(let i = 0; i < this.combinations.length; i++) {
+      if(i < this.runs.length &&
+          (allruns || this.chart_combinations.indexOf(i) >= 0)) {
+        data.run.push(i);
+      }
+    }
+    let series_length = 0;
+    for(let i = 0; i < data.run.length; i++) {
+      const
+          rnr = data.run[i],
+          r = this.runs[rnr];
+      data.nr += r.number;
+      data.combi += quo + this.combinations[rnr].join('|') + quo;
+      // Run duration in seconds
+      data.rsecs += VM.sig2Dig((r.time_recorded - r.time_started) * 0.001);
+      data.ssecs += VM.sig2Dig(r.solver_seconds);
+      data.warnings += r.warning_count;
+      for(let j = 0; j < nvars; j++) {
+        // Add empty cells for run attributes
+        data.nr += sep;
+        data.combi += sep;
+        data.rsecs += sep;
+        data.ssecs += sep;
+        data.warnings += sep;
+        const rr = r.results[vars[j]];
+        data.variable += rr.displayName + sep;
+        // Series may differ in length; the longest determines the
+        // number of rows of series data to be added
+        series_length = Math.max(series_length, rr.vector.length);
+        if(this.download_settings.statistics) {
+          data.N += rr.N + sep;
+          data.sum += rr.sum + sep;
+          data.mean += rr.mean + sep;
+          data.variance += rr.variance + sep;
+          data.minimum += rr.minimum + sep;
+          data.maximum += rr.maximum + sep;
+          data.NZ += rr.non_zero_tally + sep;
+          data.last += rr.last + sep;
+          data.exceptions += rr.exceptions + sep;
+        }
+      }
+    }
+    const ds = [data.nr, data.combi];
+    if(this.download_settings.solver) {
+      ds.push(data.rsecs, data.ssecs, data.warnings);
+    }
+    // Always add the row with variable names
+    ds.push(data.variable);
+    if(this.download_settings.statistics) {
+      ds.push(data.N, data.sum, data.mean, data.variance, data.minimum,
+          data.maximum, data.NZ, data.last, data.exceptions);
+    }
+    if(this.download_settings.series) {
+      ds.push('t');
+      const
+          prec = this.download_settings.precision,
+          row = [];
+      for(let i = 0; i < series_length; i++) {
+        row.length = 0;
+        row.push(i);
+        for(let j = 0; j < data.run.length; j++) {
+          const rnr = data.run[j];
+          for(let k = 0; k < vars.length; k++) {
+            const rr = this.runs[rnr].results[vars[k]];
+            if(i < rr.vector.length) {
+              const v = rr.vector[i];
+              if(v >= VM.MINUS_INFINITY && v <= VM.PLUS_INFINITY) {
+                row.push(v.toPrecision(prec));
+              } else {
+                row.push('');
+              }
+            }
+          }
+        }
+        ds.push(row.join(sep));
+      }
+    }
+    return ds.join('\n');
+  }
+  
 } // END of CLASS Experiment
 
 

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

@@ -9,7 +9,7 @@ This JavaScript file (linny-r-utils.js) defines a variety of "helper" functions
 that are used in other Linny-R modules.
 */
 /*
-Copyright (c) 2017-2022 Delft University of Technology
+Copyright (c) 2017-2023 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
@@ -326,6 +326,72 @@ function escapeRegex(str) {
   return str.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
 }
 
+function compareSelectors(s1, s2) {
+  // Dataset selectors comparison is case-insensitive, and puts wildcards
+  // last, where * comes later than ?
+  // NOTE: without wildcards, strings that are identical except for the
+  // digits they *end* on are sorted on this "end number" (so abc12 > abc2)
+  // NOTE: this also applies to percentages ("end number"+ %)
+  if(s1 === s2) return 0;
+  if(s1 === '*') return 1;
+  if(s2 === '*') return -1;
+  const
+      star1 = s1.indexOf('*'),
+      star2 = s2.indexOf('*');
+  if(star1 >= 0) {
+    if(star2 < 0) return 1;
+    return s1.localeCompare(s2);
+  }
+  if(star2 >= 0) return -1;  
+  // Replace ? by | because | has a higher ASCII value than all other chars
+  let s_1 = s1.replace('?', '|').toLowerCase(), 
+      s_2 = s2.replace('?', '|').toLowerCase(),
+      // NOTE: treat selectors ending on a number or percentage as special case
+      n_1 = endsWithDigits(s_1),
+      p_1 = (s1.endsWith('%') ? endsWithDigits(s1.slice(0, -1)) : '');
+  if(n_1) {
+    const
+        ss_1 = s1.slice(0, -n_1.length),
+        n_2 = endsWithDigits(s2);
+    if(n_2 && ss_1 === s2.slice(0, -n_2.length)) {
+      return parseInt(n_1) - parseInt(n_2);
+    }
+  } else if(p_1) {
+    const
+        ss_1 = s1.slice(0, -p_1.length - 1),
+        p_2 = (s2.endsWith('%') ? endsWithDigits(s2.slice(0, -1)) : '');
+    if(p_2 && ss_1 === s2.slice(0, -p_2.length - 1)) {
+      return parseInt(p_1) - parseInt(p_2);
+    }
+  }
+  // Also sort selectors ending on minuses lower than those ending on plusses,
+  // and such that X-- comes before X-, like X+ automatically comes before X++
+  // ASCII(+) = 43, ASCII(-) = 45, so replace trailing minuses by as many spaces
+  // (ASCII 32) and add a '!' (ASCII 33) -- this then "sorts things out"
+  let n = s_1.length,
+      i = n - 1;
+  while(i >= 0 && s_1[i] === '-') i--;
+  // If trailing minuses, replace by as many spaces and add an exclamation point
+  if(i < n - 1) {
+    s_1 = s_1.substr(0, i);
+    while(s_1.length < n) s_1 += ' ';
+    s_1 += '!';
+  }
+  // Do the same for the second "normalized" selector
+  n = s_2.length;
+  i = n - 1;
+  while(i >= 0 && s_2[i] === '-') i--;
+  if(i < n - 1) {
+    s_2 = s_2.substr(0, i);
+    while(s_2.length < n) s_2 += ' ';
+    s_2 += '!';
+  }
+  // Now compare the two "normalized" selectors
+  if(s_1 < s_2) return -1;
+  if(s_1 > s_2) return 1;
+  return 0;
+}
+
 //
 // Functions that perform set-like operations on lists of string
 //

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

@@ -305,6 +305,7 @@ class Expression {
     // Pop the time step
     this.step.pop();
     this.trace('--STOP: ' + this.variableName);
+DEBUGGING = false;
     // Clear context for #
     this.wildcard_number = false;
     // If error, display the call stack (only once)
@@ -1047,7 +1048,7 @@ class ExpressionParser {
       // NOTE: + and - operators are special case, since they may also
       // be part of a floating point number, hence the more elaborate check
       while(pl <= this.eot && (SEPARATOR_CHARS.indexOf(cpl) < 0 ||
-          ('+-'.indexOf(cpl) >= 0 && digs && pcpl === 'e'))) {
+          ('+-'.indexOf(cpl) >= 0 && digs && pcpl.toLowerCase() === 'e'))) {
         digs = digs || '0123456789'.indexOf(cpl) >= 0;
         this.los++;
         pl++;
@@ -6034,21 +6035,19 @@ function VMI_jump(x, index) {
 }
 
 function VMI_jump_if_false(x, index) {
-  // Pops the top number A from the stack, and if A is FALSE (zero or
+  // Tests the top number A of the stack, and if A is FALSE (zero or
   // VM.UNDEFINED) sets the program counter of the VM to `index` minus 1,
   // as the counter is ALWAYS increased by 1 after calling a VMI function
   const r = x.top(true);
-  // NOTE: FALSE indicates a stack error => skip this operation
-  if(r !== false) {
-    if(DEBUGGING) console.log(`JUMP-IF-FALSE (${r}, ${index})`);
-    if(r === 0 || r === VM.UNDEFINED) {
-      // Only jump on FALSE, leaving the stack "as is", so that in case
-      // of no THEN the expression result equals the IF condition value
-      x.program_counter = index - 1;
-    } else {
-      // Remove the value from the stack
-      x.stack.pop();
-    }
+  if(DEBUGGING) console.log(`JUMP-IF-FALSE (${r}, ${index})`);
+  if(r === 0 || r === VM.UNDEFINED || r === false) {
+    // Only jump on FALSE, leaving the stack "as is", so that in case
+    // of no THEN the expression result equals the IF condition value
+    // NOTE: Also do this on a stack error (r === false)
+    x.program_counter = index - 1;
+  } else {
+    // Remove the value from the stack
+    x.stack.pop();
   }
 }
 
@@ -6249,6 +6248,8 @@ function VMI_set_const_bounds(args) {
     // if this is the first round
     if(VM.current_round) {
       l = vbl.actualLevel(VM.t);
+      //PATCH!!
+      if(l < 0.0005) l = 0;
     } else {
       l = 0;
     }