linny-r 1.1.19 → 1.1.20

package/package.json

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

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

@@ -5825,7 +5825,7 @@ class GUIMonitor {
       this.equations_text.value = VM.equations[b - 1];
     }
     // Legend to variables is not block-dependent
-    this.variables_text.value = VM.variablesLegend;
+    this.variables_text.value = VM.variablesLegend(b);
     // Show the text area for the selected tab
     if(this.tab !== tab) {
       let mt = 'monitor-' + this.tab;

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

@@ -2631,7 +2631,7 @@ class LinnyRModel {
       // NOTE: peak increase also applies to products
       p.b_peak_inc = [p.level[0]];
       p.la_peak_inc = [p.level[0]];
-      
+      p.b_peak = [p.level[0]];      
     }
     for(obj in this.links) if(this.links.hasOwnProperty(obj)) {
       l = this.links[obj];
@@ -4226,7 +4226,8 @@ class Note extends ObjectWithXYWH {
         if(obj instanceof DatasetModifier) {
           this.fields.push(new NoteField(tag, obj.expression));
         } else if(obj) {
-          const attr = (ena.length > 1 ? ena[1].trim() : '');
+          // If attribute omitted, use default attribute of entity type
+          const attr = (ena.length > 1 ? ena[1].trim() : obj.defaultAttribute);
           // Variable may specify a vector-type attribute
           let val = obj.attributeValue(attr);
           // If not, it may be a cluster unit balance

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

@@ -130,10 +130,12 @@ class Expression {
     this.code = null;
     const xp = new ExpressionParser(this.text, this.object, this.attribute);
     if(xp.error === '') {
-      // NOTE: except for dataset modifiers, expressions should not be based
-      // on levels-still-to-be-computed-by-the-solver, so caution the modeler
-      // when this appears to be the case
-      if(xp.is_level_based &&
+      // NOTE: except for dataset modifiers and note colors, expressions
+      // should not be based on levels-still-to-be-computed-by-the-solver,
+      // so caution the modeler when this appears to be the case
+      // NOTE: when note color expressions are edited, they are compiled
+      // to check their syntax; then their object is null
+      if(xp.is_level_based && this.object &&
           !(this.object instanceof Dataset || this.object instanceof Note)) {
         // NOTE: this should not occur, so log more details
         console.log('Level-based issue:',