linny-r 1.1.19 → 1.1.21

package/README.md

@@ -25,7 +25,7 @@ Technical documentation will be developed on GitHub: https://github.com/pwgbots/
 Linny-R is developed as a JavaScript package, and requires that **Node.js** is installed on your computer. 
 This software can be downloaded from <a href="https://nodejs.org" target="_blank">https://nodejs.org</a>. 
 Make sure that you choose the correct installer for your computer.
-Linny-R is developed using the _current_ release. Presently (October 2022) this is 19.0.0. 
+Linny-R is developed using the _current_ release. Presently (February 2023) this is 19.6.0. 
 
 Run the installer and accept the default settings.
 There is **no** need to install the optional _Tools for Native Modules_.
@@ -36,7 +36,7 @@ Verify the installation by typing:
 
 ``node --version``
 
-The response should be the version number of Node.js, for example: v19.0.0.
+The response should be the version number of Node.js, for example: v19.6.0.
 
 ## Installing Linny-R
 It is advisable to install Linny-R in a directory on your computer, not in a cloud. 
@@ -169,8 +169,8 @@ Open the Command Line Interface (CLI) of your computer, change to your `WORKING_
 This response should be something similar to:
 
 <pre>
-Node.js server for Linny-R version 1.1.14
-Node.js version: v19.0.0
+Node.js server for Linny-R version 1.1.21
+Node.js version: v19.6.0
 ... etc.
 </pre>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linny-r",
-  "version": "1.1.19",
+  "version": "1.1.21",
   "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;
@@ -6739,9 +6739,14 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
       options.push('<option selected disabled value="-1"></option>');
       const d = MODEL.equations_dataset;
       if(d) {
+        const slist = [];
         for(let m in d.modifiers) if(d.modifiers.hasOwnProperty(m)) {
-          const s = d.modifiers[m].selector;
-          options.push(`<option value="${s}">${s}</option>`);
+          slist.push(d.modifiers[m].selector);
+        }
+        // Sort to present equations in alphabetical order
+        slist.sort();
+        for(let i = 0; i < slist.length; i++) {
+          options.push(`<option value="${slist[i]}">${slist[i]}</option>`);
         }
       }
       va.innerHTML = options.join('');
@@ -9819,6 +9824,12 @@ class GUIChartManager extends ChartManager {
     } else if(this.chart_index >= 0) {
       // Only accept when all conditions are met
       ev.preventDefault();
+      if(obj instanceof DatasetModifier) {
+        // Equations can be added directly as chart variable
+        this.addVariable(obj.name);
+        return;
+      }
+      // For other entities, the attribute must be specified
       this.add_variable_modal.show();
       const
           tn = VM.object_types.indexOf(obj.type),

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:',
@@ -1045,7 +1047,7 @@ class ExpressionParser {
       // NOTE: + and - operators are special case, since they may also
       // be part of a floating point number, hence the more elaborate check
       while(pl <= this.eot && (SEPARATOR_CHARS.indexOf(cpl) < 0 ||
-          ('+-'.indexOf(cpl) >= 0 && digs && pcpl === 'e'))) {
+          ('+-'.indexOf(cpl) >= 0 && digs && pcpl.toLowerCase() === 'e'))) {
         digs = digs || '0123456789'.indexOf(cpl) >= 0;
         this.los++;
         pl++;
@@ -6247,6 +6249,8 @@ function VMI_set_const_bounds(args) {
     // if this is the first round
     if(VM.current_round) {
       l = vbl.actualLevel(VM.t);
+      //PATCH!!
+      if(l < 0.0005) l = 0;
     } else {
       l = 0;
     }