linny-r 1.1.20 → 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.20",
+  "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

@@ -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-vm.js

@@ -1047,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++;
@@ -6249,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;
     }