linny-r 1.5.7 → 1.5.8

package/package.json

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

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

@@ -477,9 +477,9 @@ class GUIChartManager extends ChartManager {
           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),
+          yhigh = Math.max(Math.abs(c.plot_min_y), Math.abs(c.plot_max_y)),
+          yres = (yhigh > 1000 ? Math.round(yhigh / 500) : 1),
           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))));

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

@@ -4743,8 +4743,12 @@ class VirtualMachine {
     // than the standard, as it should not go beyond the end time plus
     // look-ahead.
     if(this.block_count < this.nr_of_blocks) return this.chunk_length;
-    let rem = MODEL.runLength % MODEL.block_length;
-    if(rem === 0) rem = MODEL.block_length;
+    // Last block length equals remainder of simulation period divided
+    // by block length.
+    let rem = (MODEL.runLength - MODEL.look_ahead) % MODEL.block_length;
+    // If this remainder equals 0, the last block is a full chunk.
+    if(rem === 0) return this.chunk_length;
+    // Otherwise, the last block if remainder + look-ahead time steps.
     return rem + MODEL.look_ahead;
   }