linny-r 1.5.6 → 1.5.7

package/package.json

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

package/static/index.html

@@ -1933,7 +1933,9 @@ NOTE: * and ? will be interpreted as wildcards"
                title="Narrow chart">
         </div>
       </div>
-      <div id="chart-time-step">t = 0</div>
+      <div id="chart-time-div">
+        <div id="chart-time-step"></div>
+      </div>
     </div>
     <div id="chart-resize" class="resizer"></div>
   </div>

package/static/linny-r.css

@@ -2644,7 +2644,7 @@ td.equation-expression {
   margin: 0;
   width: 570px;
   height: 255px;
-  min-width: 455px;
+  min-width: 520px;
   min-height: 180px;
   max-height: 99vh;
   max-width: 99vw;
@@ -2950,12 +2950,16 @@ img.v-disab {
   margin-left: 4px;
 }
 
-#chart-time-step {
+#chart-time-div {
   position: absolute;
-  bottom: 3px;
+  bottom: 0px;
   right: 3px;
-  width: 50px;
-  font-size: 11px;
+  width: 55px;
+  height: 22px;
+}
+
+#chart-time-step {
+  font-size: 10px;
 }
 
 #chart-toggle-chevron,

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

@@ -473,7 +473,16 @@ class GUIChartManager extends ChartManager {
           ox = r.left * scale,
           w = r.width * scale,
           x = e.pageX -
-              this.svg_container.getBoundingClientRect().left + window.scrollX;
+              this.svg_container.getBoundingClientRect().left + window.scrollX,
+          y = e.pageY -
+              this.svg_container.getBoundingClientRect().top + window.scrollY,
+          yfract = (c.plot_oy - y / scale) / c.plot_height,
+          yres = Math.round(
+              Math.max(Math.abs(c.plot_min_y), Math.abs(c.plot_max_y)) / 500),
+          yval = c.plot_min_y + yfract * (c.plot_max_y - c.plot_min_y),
+          ytrunc = Math.round(yval / yres) * yres,
+          ylbl = (yfract < 0 || yfract > 1 || c.plot_min_y >= c.plot_max_y ?
+              '' : 'y = ' + VM.sig2Dig(parseFloat(ytrunc.toPrecision(2))));
       let n = '';
       if(c.histogram) {
         let vv = [];
@@ -487,17 +496,30 @@ class GUIChartManager extends ChartManager {
             v = vv[b % l],
             t = Math.floor(b / l);
         if(x > ox && b < bars) n = 'N = ' + v.bin_tallies[t];
-      } else {
+      } else if(this.runs_stat) {
+        const
+            runs = EXPERIMENT_MANAGER.selectedRuns(c),
+            rcnt = runs.length,
+            ri = Math.max(0, Math.min(rcnt, Math.floor(rcnt * (x - ox) / w)));
+        if(x > ox && ri < rcnt) n = 'Run #' + runs[ri];
+      } else if(x > ox - 5) {
         const
             runs = EXPERIMENT_MANAGER.selectedRuns(c),
             p = c.total_time_steps,
             first = (runs.length > 0 ? 1 : MODEL.start_period),
             last = (runs.length > 0 ? p : MODEL.end_period),
             t = Math.round(first - 0.5 + p * (x - ox) / w);
-        n = 't = ' + Math.max(0, Math.min(t, last));
+        if(t <= last) n = 't = ' + Math.max(0, t);
+      }
+      if(ylbl && n) {
+        n += '<br>' + ylbl;
+        this.time_step.style.marginTop = '-1px';
+      } else {
+        this.time_step.style.marginTop = '5px';
       }
+      
       this.time_step.innerHTML = n;
-      this.time_step.style.display = 'block';
+      this.time_step.style.display = 'inline-block';
     } else {
       this.time_step.style.display = 'none';
     }

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

@@ -2460,7 +2460,7 @@ class GUIController extends Controller {
     }
     x.update(xp);
     // NOTE: overrule `is_static` to make that IL is always evaluated for t=1
-    if(name === 'initial level') x.is_static = true; 
+    if(name === 'initial level') x.is_static = true;
     return true;
   }
   
@@ -3927,6 +3927,8 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     if(!this.updateExpressionInput('link-D', 'delay', l.flow_delay)) {
       return false;
     }
+    // Explicitly set delay to 0 if input is empty string.
+    if(!l.flow_delay.text.trim()) l.flow_delay.text = '0';
     const
         m = parseInt(md.element('multiplier').value),
         redraw = m !== l.multiplier &&

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

@@ -125,13 +125,15 @@ class GUIMonitor {
     for(let i = 0; i < b; i++) {
       total_time += VM.solver_times[i];
     }
-    const n = document.createElement('div');
+    const
+        n = document.createElement('div'),
+        ssecs = VM.solver_secs[b - 1];
     n.classList.add('progress-block');
     if(err) n.classList.add('error-pb');
     if(b % 2 == 0) n.classList.add('even-pb');
     n.setAttribute('title',
-        `Block #${b} took ${time.toPrecision(3)} seconds
-(solver: ${VM.solver_secs[b - 1]} seconds)`);
+        `Block #${b} took ${time.toPrecision(3)} seconds` +
+            (ssecs ? `\n(solver: ${ssecs} seconds)` : ''));
     n.setAttribute('data-blk', b); 
     n.addEventListener('click',
         (event) => {