linny-r 1.5.4 → 1.5.5

package/package.json

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

package/static/linny-r.css

@@ -3634,6 +3634,11 @@ th.scen-hdr {
 
 th.scen-hdr {
   text-align: left;
+  cursor: pointer;
+}
+
+th.scen-hdr:hover {
+  box-shadow: 0px 0px 0px 2px rgba(96,64,0,0.5) inset;  
 }
 
 th.leaf-conf {

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

@@ -1140,6 +1140,7 @@ class ExperimentManager {
     this.callback = null;
     this.selected_experiment = null;
     this.suitable_charts = [];
+    this.plot_dimensions = [];
   }
   
   updateChartList() {

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

@@ -360,11 +360,15 @@ class GUIExperimentManager extends ExperimentManager {
     this.params_div.style.display = 'block';
     const tr = [];
     for(let i = 0; i < x.dimensions.length; i++) {
+      const pi = 'd' + i;
       tr.push(['<tr class="dataset',
-          (this.selected_parameter == 'd'+i ? ' sel-set' : ''),
-          '" onclick="EXPERIMENT_MANAGER.selectParameter(\'d',
-          i, '\');"><td>',
-          setString(x.dimensions[i]),
+          // Highlight selected dimension with background color.
+          (this.selected_parameter == pi ? ' sel-set' : ''),
+          // Show dimension in bold purple if it is a plot dimension.
+          (x.plot_dimensions.indexOf(i) >= 0 ? ' def-sel' : ''),
+          '" onclick="EXPERIMENT_MANAGER.selectParameter(\'', pi,
+          // Click selects, shift-click will also toggle plot/no plot.
+          '\', event.shiftKey);"><td>', setString(x.dimensions[i]),
           '</td></tr>'].join(''));
     }
     this.dimension_table.innerHTML = tr.join('');
@@ -635,11 +639,13 @@ class GUIExperimentManager extends ExperimentManager {
             } else {
               rsp = '';            
             }
-            // Calculate the dimension selector index
+            // Calculate the dimension selector index.
             const dsi = Math.floor(
                 i / rowsperdim[j]) % this.clean_rows[j].length;
             lth += ['<th', rsp, ' class="scen-hdr" style="background-color: ',
-                'rgba(100, 170, 255, ', 1 - j * bstep, ')">',
+                'rgba(100, 170, 255, ', 1 - j * bstep,
+                ')" onclick="EXPERIMENT_MANAGER.toggleChartRow(', i,
+                ', ', rowsperdim[j], ', event.shiftKey);">',
                 this.clean_rows[j][dsi], '</th>'].join('');
           }
         }
@@ -661,22 +667,29 @@ class GUIExperimentManager extends ExperimentManager {
     }
   }
   
-  toggleChartRow(r, n, shift) {
+  toggleChartRow(r, n=1, shift=false) {
     // Toggle `n` consecutive rows, starting at row `r` (0 = top), to be
-    // (no longer) part of the chart combination set
+    // (no longer) part of the chart combination set.
+    // @@TO DO: shift-key indicates "add row(s) to selection"
     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);        
+        // Let `first` be the number of the first run on row `r`.
+        ncols = this.nr_of_configurations,
+        nrows = x.combinations.length / ncols;
+    if(x && r < nrows) {
+      // NOTE: First cell in rows determines ADD or REMOVE.
+      const add = shift || x.chart_combinations.indexOf(r) < 0;
+      if(!shift) x.chart_combinations.length = 0;
+      for(let i = 0; i < ncols; i++) {
+        for(let j = 0; j < n; j++) {
+          const
+              c = r + j + i * nrows,
+              ic = x.chart_combinations.indexOf(c);
+          if(add) {
+            if(ic < 0) x.chart_combinations.push(c);
+          } else {
+            if(ic >= 0) x.chart_combinations.splice(ic, 1);        
+          }
         }
       }
       this.updateData();
@@ -1048,10 +1061,22 @@ N = ${rr.N}, vector length = ${rr.vector.length}` : '')].join('');
     }
   }
   
-  selectParameter(p) {
+  selectParameter(p, shift=false) {
+    const dim = p.startsWith('d');
     this.selected_parameter = p;
-    this.focal_table = (p.startsWith('d') ? this.dimension_table :
-        this.chart_table);
+    this.focal_table = (dim ? this.dimension_table : this.chart_table);
+    if(dim && shift) {
+      const
+          x = this.selected_experiment,
+          di = parseInt(p.substring(1)),
+          pi = x.plot_dimensions.indexOf(di);
+      if(pi < 0) {
+        x.plot_dimensions.push(di);
+      } else {
+        x.plot_dimensions.splice(pi, 1);
+      }
+      if(CHART_MANAGER.runs_stat) CHART_MANAGER.updateDialog();
+    }
     this.updateDialog();
   }
   

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

@@ -9522,13 +9522,26 @@ class Chart {
         rh = height - rt - margin - font_height,
         // Keep track of the number of visible chart variables
         vv = 0;
-    // Reserve vertical space for title (if shown)
+    // Reserve vertical space for title (if shown).
     if(this.show_title) {
       // NOTE: use title font size 120% of default
       const th = 1.2 * font_height + margin;
       rt += th;
       rh -= th;
     }
+    // If run result statistics are plotted, reserve vertical space for
+    // bar chart run dimension selectors.
+    const
+        selx = EXPERIMENT_MANAGER.selected_experiment,
+        stat_bars = CHART_MANAGER.runs_stat;
+    if(stat_bars) {
+      if(selx) {
+        // First plot dimension will replace run numbers, so only reserve
+        // space for additional plot dimensions.
+        const dh = 1.2 * font_height * (selx.plot_dimensions.length - 1);
+        if(dh > 0) rh -= dh;
+      }
+    }
     if(this.variables.length > 0) {
       // Count visible variables and estimate total width of their names
       // as well as the width of the longest name
@@ -9584,7 +9597,7 @@ class Chart {
             if(v.visible) {
               // Add arrow indicating sort direction to name if applicable.
               const vn = v.displayName + CHART_MANAGER.sort_arrows[v.sorted];
-              if(v.stacked || this.histogram) {
+              if(v.stacked || this.histogram || stat_bars) {
                 this.addSVG(['<rect x="', x, '" y="', y - sym_size + 2,
                     '" width="', sym_size, '" height="', sym_size,
                     '" fill="', v.color,'" fill-opacity="0.35" stroke="',
@@ -9612,10 +9625,7 @@ class Chart {
 
     // NOTE: chart may display experiment run results, rather than MODEL results
     let runnrs = '';
-    const
-        selx = EXPERIMENT_MANAGER.selected_experiment,
-        runs = EXPERIMENT_MANAGER.selectedRuns(this),
-        stat_bars = CHART_MANAGER.runs_stat;
+    const runs = EXPERIMENT_MANAGER.selectedRuns(this);
     if(runs.length > 0) {
       const stat = (stat_bars ?
           EXPERIMENT_MANAGER.selectedStatisticName + ' for ': ''); 
@@ -9786,7 +9796,10 @@ class Chart {
     }
     
     if(time_steps > 0) {
-      let dx = 0, dy = 0, x = 0, y = rt + rh + font_height;
+      let dx = 0,
+          dy = 0,
+          x = 0,
+          y = rt + rh + font_height;
       if(this.histogram) {
         // Draw bin boundaries along the horizontal axis
         dx = rw / this.bins;
@@ -9818,8 +9831,18 @@ class Chart {
                 '" x2="', x, '" y2="', rt + rh + 3,
                 '" stroke="black" stroke-width="1.5"/>']);
           }
-          // Draw experiment number in middle of its horizontal area.
-          this.addText(x - dx / 2, y, '#' + runs[i]);
+          if(selx.plot_dimensions.length > 0) {
+            // Draw run selectors for each plot dimension above each other.
+            const ac = selx.combinations[runs[i]];
+            let pdy = y;
+            for(let j = 0; j < selx.plot_dimensions.length; j++) {
+              this.addText(x - dx / 2, pdy, ac[selx.plot_dimensions[j]]);
+              pdy += font_height;
+            }
+          } else {
+            // Draw experiment number in middle of its horizontal area.
+            this.addText(x - dx / 2, y, '#' + runs[i]);
+          }
           x += dx;
         }
       } else {
@@ -10850,6 +10873,7 @@ class Experiment {
     this.dimensions = [];
     this.charts = [];
     this.actual_dimensions = [];
+    this.plot_dimensions = [];
     this.combinations = [];
     this.variables = [];
     this.configuration_dims = 0;
@@ -11058,7 +11082,8 @@ class Experiment {
       '"><title>', xmlEncoded(this.title),
       '</title><notes>', xmlEncoded(this.comments),
       '</notes><dimensions>', d,
-      '</dimensions><chart-titles>', ct,
+      '</dimensions><plot-dimensions>', this.plot_dimensions.join(','),
+      '</plot-dimensions><chart-titles>', ct,
       '</chart-titles><settings-selectors>', ss,
       '</settings-selectors><settings-dimensions>', sd,
       '</settings-dimensions><combination-selectors>', cs,
@@ -11103,6 +11128,13 @@ class Experiment {
         }
       }
     }
+    n = nodeContentByTag(node, 'plot-dimensions');
+    if(n) {
+      this.plot_dimensions = n.split(',');
+      for(let i = 0; i < this.plot_dimensions.length; i++) {
+        this.plot_dimensions[i] = parseInt(this.plot_dimensions[i]);
+      }
+    }
     n = childNodeByTag(node, 'chart-titles');
     if(n && n.childNodes) {
       for(let i = 0; i < n.childNodes.length; i++) {

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

@@ -590,9 +590,64 @@ function mergeDistinct(list, into) {
   }
 }
 
+function iteratorSet(list) {
+  // Returns TRUE iff list is something like ['i=1', 'i=2', 'i=3'].
+  if(list.length === 0) return false;
+  // Analyze the first element: must start with i=, j= or k=.
+  const
+      parts = list[0].split('='),
+      iterator = parts[0];
+  if(parts.length !== 2 || 'ijk'.indexOf(iterator) < 0) return false;
+  // Left-hand part must be an integer number: the first iterator value.
+  const first = parts[1] - 0;
+  if(first != parts[1]) return false;
+  // If OK, generate the list one would expect.
+  const
+      series = [],
+      last = first + list.length - 1;
+  for(let i = first; i <= last; i++) {
+    series.push(iterator + '=' + i);
+  }
+  // Then compare with the list to be tested.
+  if(list.join(',') === series.join(',')) {
+    // If match, return a shorthand string like 'i=1, ..., i=5'.
+    // NOTE: No ellipsis if fewer than 4 steps.
+    if(list.length < 4) return `{${list.join(', ')}}`;
+    return `{${list[0]}, ..., ${list[list.length - 1]}}`;
+  }
+  return false;
+}
+
+function integerSet(list) {
+  // Returns TRUE iff all elements in list evaluate as integer numbers.
+  if(list.length === 0) return false;
+  for(let i = 0; i < list.length; i++) {
+    if(list[i] - 0 != list[i]) return false;
+  }
+  return true;
+}
+
 function setString(sl) {
   // Returns elements of stringlist `sl` in set notation
-  return '{' + sl.join(', ') + '}';
+  if(integerSet(sl)) {
+    // If all set elements are integers, return a range shorthand.
+    const sorted = sl.slice().sort();
+    let i = 0,
+        j = 1;
+    while(i < sorted.length) {
+      while(j < sorted.length && sorted[j] - sorted[j - 1] === 1) j++;
+      if(j - i > 2) {
+        sorted[i] += ', ... , ' + sorted[j - 1];
+        sorted.splice(i + 1, j - i - 1);
+        j = i + 1;
+      }
+      i = j;
+      j++;
+    }
+    return '{' + sorted.join(', ') + '}';
+  }
+  // Otherwise, return an iterator set shorthand, or the complete set.
+  return iteratorSet(sl) || '{' + sl.join(', ') + '}';
 }
 
 function tupelString(sl) {