linny-r 1.1.22 → 1.1.23

package/package.json

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

package/static/index.html

@@ -1404,7 +1404,7 @@ and move the cursor over the status bar">
           <option value="1">Product</option>
           <option value="2">Cluster</option>
           <option value="3">Link</option>
-          <option value="4">Constraint</option>
+          <!-- <option value="4">Constraint</option> -->
           <option value="5">Actor</option>
           <option value="6">Dataset</option>
           <option value="7">Equation</option>
@@ -1820,7 +1820,7 @@ NOTE: * and ? will be interpreted as wildcards"
         <option value="1">Product</option>
         <option value="2">Cluster</option>
         <option value="3">Link</option>
-        <option value="4">Constraint</option>
+        <!-- <option value="4">Constraint</option> -->
         <option value="5">Actor</option>
         <option value="6">Dataset</option>
         <option value="7">Equation</option>
@@ -1957,7 +1957,7 @@ NOTE: * and ? will be interpreted as wildcards"
         <option value="1">Product</option>
         <option id="add-sa-variable-cluster" value="2">Cluster</option>
         <option value="3">Link</option>
-        <option value="4">Constraint</option>
+        <!-- <option value="4">Constraint</option> -->
         <option value="5">Actor</option>
         <option value="6">Dataset</option>
         <option id="add-sa-variable-equation" value="7">Equation</option>

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

@@ -738,8 +738,11 @@ class SensitivityAnalysis {
             oax = (obj ? obj.attributeExpression(vn[1]) : null);
         if(oax) {
           this.parameters.push(oax);
+        } else if(vn.length === 1 && obj instanceof Dataset) {
+          // Dataset without selector => push the dataset vector
+          this.parameters.push(obj.vector);
         } else {
-          UI.alert(`Parameter ${p} is not an expression`);
+          UI.alert(`Parameter ${p} is not a dataset or expression`);
         }
       }
       this.chart = new Chart(this.chart_title);
@@ -841,6 +844,7 @@ class SensitivityAnalysis {
     VM.halt();
     this.readyButtons();
     this.showProgress('');
+    this.must_pause = false;
   }
   
   clearResults() {

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

@@ -10513,7 +10513,7 @@ class GUISensitivityAnalysis extends SensitivityAnalysis {
     this.base_selectors.addEventListener(
         'blur', () => SENSITIVITY_ANALYSIS.setBaseSelectors());
 
-    this.delta = document.getElementById('sa-delta');
+    this.delta = document.getElementById('sensitivity-delta');
     this.delta.addEventListener(
         'focus', () => SENSITIVITY_ANALYSIS.editDelta());
     this.delta.addEventListener(
@@ -10610,6 +10610,8 @@ class GUISensitivityAnalysis extends SensitivityAnalysis {
   }
   
   updateControlPanel() {
+    // Shows the control panel, or when the analysis is running the
+    // legend to the outcomes (also to prevent changes to parameters) 
     this.base_selectors.value = MODEL.base_case_selectors;
     this.delta.value = VM.sig4Dig(MODEL.sensitivity_delta);
     const tr = [];
@@ -10900,6 +10902,8 @@ class GUISensitivityAnalysis extends SensitivityAnalysis {
     // NOTE: clusters have no suitable attributes, and equations are endogenous
     md.element('cluster').style.display = 'none';
     md.element('equation').style.display = 'none';
+    // NOTE: update to ensure that valid attributes are selectable
+    X_EDIT.updateVariableBar('add-sa-');
     md.show();
   }
 
@@ -10909,6 +10913,8 @@ class GUISensitivityAnalysis extends SensitivityAnalysis {
     md.element('type').innerText = 'outcome';
     md.element('cluster').style.display = 'block';
     md.element('equation').style.display = 'block';
+    // NOTE: update to ensure that valid attributes are selectable
+    X_EDIT.updateVariableBar('add-sa-');
     md.show();
   }
 
@@ -10977,9 +10983,14 @@ class GUISensitivityAnalysis extends SensitivityAnalysis {
         a = md.selectedOption('attr').text;
     let n = '';
     if(e === 'Equation' && a) {
+      // For equations, the attribute denotes the name
       n = a;
     } else if(o && a) {
+      // Most variables are defined by name + attribute ...
       n = o + UI.OA_SEPARATOR + a;
+    } else if(e === 'Dataset' && o) {
+      // ... but for datasets the selector is optional
+      n = o;
     }
     if(n) {
       if(t === 'parameter' && MODEL.sensitivity_parameters.indexOf(n) < 0) {
@@ -11021,6 +11032,7 @@ class GUISensitivityAnalysis extends SensitivityAnalysis {
     this.start_btn.classList.add('off');
     this.pause_btn.classList.remove('off');
     this.stop_btn.classList.add('off');
+    this.must_pause = false;
     return paused;
   }
 
@@ -11029,6 +11041,7 @@ class GUISensitivityAnalysis extends SensitivityAnalysis {
     this.pause_btn.classList.add('off');
     this.stop_btn.classList.add('off');
     this.start_btn.classList.remove('off', 'blink');
+    this.must_pause = false;
   }
   
   pausedButtons(aci) {
@@ -11047,6 +11060,8 @@ class GUISensitivityAnalysis extends SensitivityAnalysis {
     this.readyButtons();
     this.reset_btn.classList.add('off');
     this.selected_run = -1;
+    this.must_pause = false;
+    this.progress.innerHTML = '';
     this.updateDialog();
   }
 
@@ -11802,6 +11817,32 @@ class GUIExperimentManager extends ExperimentManager {
     }
   }
   
+  toggleChartRow(r, n, shift) {
+    // Toggle `n` consecutive rows, starting at row `r` (0 = top), to be
+    // (no longer) part of the chart combination set
+    const
+        x = this.selected_experiment,
+        // Let `n` be the number of the first run on row `r`
+        nconf = r * this.nr_of_configurations;
+    if(x && r < x.combinations.length / this.nr_of_configurations) {
+      // NOTE: first cell of row determines ADD or REMOVE
+      const add = x.chart_combinations.indexOf(n) < 0;
+      for(let i = 0; i < this.nr_of_configurations; i++) {
+        const ic = x.chart_combinations.indexOf(i);
+        if(add) {
+          if(ic < 0) x.chart_combinations.push(nconf + i);
+        } else {
+          if(!add) x.chart_combinations.splice(nconf + i, 1);        
+        }
+      }
+      this.updateData();
+    }
+  }
+
+  toggleChartColumn(c, shift) {
+    // Toggle column `c` (0 = leftmost) to be part of the chart combination set
+  }
+  
   toggleChartCombi(n, shift, alt) {
     // Set `n` to be the chart combination, or toggle if Shift-key is pressed,
     // or execute single run if Alt-key is pressed
@@ -12788,7 +12829,7 @@ N = ${rr.N}, vector length = ${rr.vector.length}` : '')].join('');
     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('var-count').innerText = x.runs[0].results.length;
     md.element('run-count').innerText = runs;
     md.element('run-s').innerText = (sruns === 1 ? '' : 's');
   }

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

@@ -2485,12 +2485,15 @@ class LinnyRModel {
     const ds_dict = {};
     for(let k in this.datasets) if(this.datasets.hasOwnProperty(k)) {
       const ds = this.datasets[k];
-      for(let m in ds.modifiers) if(ds.modifiers.hasOwnProperty(m)) {
-        const s = ds.modifiers[m].selector;
-        if(s in ds_dict) {
-          ds_dict[s].push(ds);
-        } else {
-          ds_dict[s] = [ds];
+      // NOTE: ignore selectors of the equations dataset
+      if(ds !== this.equations_dataset) {
+        for(let m in ds.modifiers) if(ds.modifiers.hasOwnProperty(m)) {
+          const s = ds.modifiers[m].selector;
+          if(s in ds_dict) {
+            ds_dict[s].push(ds);
+          } else {
+            ds_dict[s] = [ds];
+          }
         }
       }
     }
@@ -7644,9 +7647,11 @@ class Dataset {
   attributeExpression(a) {
     // Returns expression for selector `a`, or NULL if no such selector exists
     // NOTE: selectors no longer are case-sensitive
-    a = UI.nameToID(a);
-    for(let m in this.modifiers) if(this.modifiers.hasOwnProperty(m)) {
-      if(m === a) return this.modifiers[m].expression;
+    if(a) {
+      a = UI.nameToID(a);
+      for(let m in this.modifiers) if(this.modifiers.hasOwnProperty(m)) {
+        if(m === a) return this.modifiers[m].expression;
+      }
     }
     return null;
   }
@@ -9226,7 +9231,12 @@ class ExperimentRunResult {
         obj = MODEL.objectByID(this.object_id),
         dn = obj.displayName;
     // NOTE: for equations dataset, only display the modifier selector
-    if(obj === MODEL.equations_dataset) return this.attribute;
+    if(obj === MODEL.equations_dataset) {
+      const m = obj.modifiers[this.attribute.toLowerCase()];
+      if(m) return m.selector;
+      console.log('WARNING: Run result of non-existent equation', this.attribute);
+      return this.attribute;
+    }
     return (this.attribute ? dn + '|' + this.attribute : dn);
   }
 
@@ -9994,7 +10004,19 @@ class Experiment {
 
   get resultsAsCSV() {
     // Return results as specfied by the download settings
+    // NOTE: no runs => no results => return empty string
+    if(this.runs.length === 0) return '';
     const
+        // Local function to convert number to string
+        numval = (v, p) => {
+            // Return 0 as single digit
+            if(Math.abs(v) < VM.NEAR_ZERO) return '0';
+            // Return empty string for undefined or exceptional values
+            if(!v || v < VM.MINUS_INFINITY || v > VM.PLUS_INFINITY) return '';
+            // Return other values as float with specified precision
+            return v.toPrecision(p);
+          },
+        prec = this.download_settings.precision,
         allruns = this.download_settings.runs === 'all',
         sep = (this.download_settings.separator === 'tab' ? '\t' :
               (this.download_settings.separator === 'comma' ? ',' : ';')),
@@ -10019,24 +10041,21 @@ class Experiment {
             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;
+    let series_length = 0,
+        // By default, assume all variables to be output
+        start = 0,
+        stop = this.runs[0].results.length;
+    if(this.download_settings.variables === 'selected') {
+      // Only one variable
+      start = this.resultIndex(this.selected_variable);
+      stop = start + 1;
+    }
     for(let i = 0; i < data.run.length; i++) {
       const
           rnr = data.run[i],
@@ -10044,31 +10063,35 @@ class Experiment {
       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.rsecs += numval((r.time_recorded - r.time_started) * 0.001, 4);
+      data.ssecs += numval(r.solver_seconds, 4);
       data.warnings += r.warning_count;
-      for(let j = 0; j < nvars; j++) {
+      for(let j = start; j < stop; 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 rr = r.results[j];
+        if(rr) {
+          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 += numval(rr.sum, prec) + sep;
+            data.mean += numval(rr.mean, prec) + sep;
+            data.variance += numval(rr.variance, prec) + sep;
+            data.minimum += numval(rr.minimum, prec) + sep;
+            data.maximum += numval(rr.maximum, prec) + sep;
+            data.NZ += rr.non_zero_tally + sep;
+            data.last += numval(rr.last, prec) + sep;
+            data.exceptions += rr.exceptions + sep;
+          }
+        } else {
+          console.log('No run results for ', this.variables[vars[j]].displayName);
         }
       }
     }
@@ -10084,20 +10107,18 @@ class Experiment {
     }
     if(this.download_settings.series) {
       ds.push('t');
-      const
-          prec = this.download_settings.precision,
-          row = [];
+      const 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));
+          for(let k = start; k < stop; k++) {
+            const rr = this.runs[rnr].results[k];
+            if(rr) {
+              // NOTE: only experiment variables have vector data
+              if(rr.x_variable && i <= rr.N) {
+                row.push(numval(rr.vector[i], prec));
               } else {
                 row.push('');
               }

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

@@ -305,7 +305,6 @@ 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)
@@ -5183,7 +5182,16 @@ function VMI_push_var(x, args) {
   }
   if(Array.isArray(obj)) {
     // Object is a vector
-    x.push(t < obj.length ? obj[t] : VM.UNDEFINED);
+    let v = t < obj.length ? obj[t] : VM.UNDEFINED;
+    // NOTE: when the vector is the "active" parameter for sensitivity
+    // analysis, the value is multiplied by 1 + delta %
+    if(obj === MODEL.active_sensitivity_parameter) {
+      // NOTE: do NOT scale exceptional values
+      if(v > VM.MINUS_INFINITY && v < VM.PLUS_INFINITY) {
+        v *= (1 + MODEL.sensitivity_delta * 0.01);
+      }
+    }
+    x.push(v);
   } else if(xv) {
     // Variable references an earlier value computed for this expression `x`
     x.push(t >= 0 && t < x.vector.length ? x.vector[t] : obj.dv);
@@ -5316,8 +5324,10 @@ function VMI_push_dataset_modifier(x, args) {
         tot[1] + (tot[2] ? ':' + tot[2] : ''), ' value = ', VM.sig4Dig(v));
     console.log('  --', x.text, ' for owner ', x.object.displayName, x.attribute);
   }
-  // NOTE: unless error, push default value if exceptional ("undefined", etc.)
-  x.push(v < VM.PLUS_INFINITY ? v : ds.defaultValue);
+  // NOTE: if value is exceptional ("undefined", etc.), use default value
+  if(v >= VM.PLUS_INFINITY) v = ds.defaultValue;
+  // Finally, push the value onto the expression stack
+  x.push(v);
 }