linny-r 1.6.6 → 1.6.8

package/package.json

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

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

@@ -443,6 +443,7 @@ class GUIController extends Controller {
     // Keep track of time since last message displayed on the infoline.
     this.time_last_message = new Date('01 Jan 2001 00:00:00 GMT');
     this.message_display_time = 3000;
+    this.last_message_type = '';
 
     // Initialize "main" modals, i.e., those that relate to the controller,
     // not to other dialog objects.
@@ -2572,28 +2573,32 @@ class GUIController extends Controller {
     // Displays message on infoline unless no type (= plain text) and some
     // info, warning or error message is already displayed
     super.setMessage(msg, type);
+    const types = ['notification', 'warning', 'error'];
     let d = new Date(),
         t = d.getTime(),
-        dt = t - this.time_last_message;
+        dt = t - this.time_last_message,
+        mti = types.indexOf(type),
+        lmti = types.indexOf(this.last_message_type);
     if(type) {
-      // Update global variable (and force display) only for "real" messages
-      this.time_last_message = t;
-      dt = this.message_display_time;
-      SOUNDS[type].play().catch(() => {
-          console.log('NOTICE: Sounds will only play after first user action');
-        });
+      // Only log "real" messages.
       const
           now = [d.getHours(), d.getMinutes().toString().padStart(2, '0'),
               d.getSeconds().toString().padStart(2, '0')].join(':'),
           im = {time: now, text: msg, status: type};
       DOCUMENTATION_MANAGER.addMessage(im);
-      // When receiver is active, add message to its log
+      // When receiver is active, add message to its log.
       if(RECEIVER.active) RECEIVER.log(`[${now}] ${msg}`);
     }
-    // Display text only if previous message has "timed out" or was plain text
-    if(dt >= this.message_display_time) {
+    // Display text only if previous message has "timed out" or was less
+    // urgent than this one.
+    if(mti > lmti || dt >= this.message_display_time) {
+      this.time_last_message = t;
+      this.last_message_type = type;
+      if(type) SOUNDS[type].play().catch(() => {
+          console.log('NOTICE: Sounds will only play after first user action');
+        });
       const il = document.getElementById('info-line');
-      il.classList.remove('error', 'warning', 'notification');
+      il.classList.remove(...types);
       il.classList.add(type);
       il.innerHTML = msg;
     }

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

@@ -295,7 +295,7 @@ module.exports = class MILPSolver {
                 vnr = parseInt(v.substring(1));
             // Add zeros for unreported variables until column number matches.
             while(col < vnr) {
-              x_values.push('0');
+              x_values.push(0);
               col++;
             }
             x_values.push(x_dict[v]);
@@ -397,7 +397,7 @@ module.exports = class MILPSolver {
         // Fill dictionary with variable name: value entries 
         while(i < output.length) {
           const m = output[i].match(/^.*name="(X[^"]+)".*value="([^"]+)"/);
-          if(m !== null)  x_dict[m[1]] = m[2];
+          if(m !== null)  x_dict[m[1]] = parseFloat(m[2]);
           i++;
         }
         // Fill the solution vector, adding 0 for missing columns
@@ -453,7 +453,7 @@ module.exports = class MILPSolver {
         // Fill dictionary with variable name: value entries 
         while(i < output.length) {
           const v = output[i].split(/\s+/);
-          x_dict[v[0]] = v[1];
+          x_dict[v[0]] = parseFloat(v[1]);
           i++;
         }
         // Fill the solution vector, adding 0 for missing columns
@@ -485,7 +485,7 @@ module.exports = class MILPSolver {
         // Fill dictionary with variable name: value entries 
         while(i < output.length) {
           const v = output[i].split(/\s+/);
-          x_dict[v[0]] = v[1];
+          x_dict[v[0]] = parseFloat(v[1]);
           i++;
         }
         // Fill the solution vector, adding 0 for missing columns

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

@@ -5,8 +5,8 @@ The Linny-R language and tool have been developed by Pieter Bots at Delft
 University of Technology, starting in 2009. The project to develop a browser-
 based version started in 2017. See https://linny-r.org for more information.
 
-This JavaScript file (linny-r-classes.js) defines the object classes used in the
-Linny-R project.
+This JavaScript file (linny-r-classes.js) defines the object classes used in
+the Linny-R project.
 */
 
 /*
@@ -7468,7 +7468,8 @@ class Node extends NodeBox {
   }
 
   actualLevel(t) {
-    // Returns the production level c.q. stock level for this node in time step t
+    // Returns the production level c.q. stock level for this node in
+    // time step t.
     if(t < 0) return this.initial_level.result(1);
     if(t < this.level.length) return this.level[t];
     return VM.UNDEFINED;
@@ -7476,7 +7477,7 @@ class Node extends NodeBox {
   
   nonZeroLevel(t) {
     // Returns the level or 0 when level is negligible relative to the
-    // bounds on the node
+    // bounds on the node.
     if(t < 0) return this.initial_level.result(1);
     if(t < this.level.length) {
       const l = this.level[t];