linny-r 1.6.5 → 1.6.7

package/package.json

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

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

@@ -305,14 +305,15 @@ class ActorManager {
       // Set its round flags
       a.round_flags = ali[2];
       // Double-check: parse expression if weight has been changed.
-      if(a.weight.text != ali[3]) {
-        xp.expr = monoSpacedVariables(ali[3]);
+      const awx = monoSpacedVariables(ali[3]);
+      if(a.weight.text != awx) {
+        xp.expr = awx;
         xp.compile();
         if(xp.error) {
           UI.warningInvalidWeightExpression(a, xp.error);
           ok = false;
         } else {
-          a.weight.update(ali[3]);
+          a.weight.update(xp);
         }
       }
       // Update import/export status

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

@@ -332,6 +332,9 @@ class GUIExperimentManager extends ExperimentManager {
       document.getElementById('xp-reset-btn').classList.add('off');
     }
     this.updateParameters();
+    // NOTE: When UpdateDialog is called after an entity has been renamed,
+    // its variable list should be updated.
+    this.updateViewerVariable();
   }
 
   updateParameters() {
@@ -515,6 +518,10 @@ class GUIExperimentManager extends ExperimentManager {
         addDistinct(vn, vl); 
       }
       vl.sort((a, b) => UI.compareFullNames(a, b));
+      // NOTE: When the selected variable entity has been renamed, its
+      // name will not be in the list (and its old name cannot be inferred)
+      // so then clear it.
+      if(vl.indexOf(x.selected_variable) < 0) x.selected_variable = '';
       for(let i = 0; i < vl.length; i++) {
         const vn = vl[i];
         // NOTE: FireFox selector dropdown areas have a pale gray

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];