linny-r 1.7.2 → 1.7.4

package/README.md

@@ -30,7 +30,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 2023) this is 21.1.0. 
+Linny-R is developed using the _current_ release. Presently (November 2023) this is 21.2.0. 
 
 Run the installer and accept the default settings.
 There is **no** need to install the optional _Tools for Native Modules_.
@@ -41,7 +41,7 @@ Verify the installation by typing:
 
 ``node --version``
 
-The response should be the version number of Node.js, for example: v21.1.0.
+The response should be the version number of Node.js, for example: v21.2.0.
 
 ## Installing Linny-R
 It is advisable to install Linny-R in a directory on your computer, not in a cloud. 
@@ -147,10 +147,10 @@ directory and type:
 
 ## Configuring the MILP solver
 
-Linny-R presently supports four MILP solvers: Gurobi, CPLEX, SCIP and LP_solve. 
-Gurobi and CPLEX are _considerably_ more powerful than the open source solvers SCIP and LP_solve,
+Linny-R presently supports five MILP solvers: Gurobi, MOSEK, CPLEX, SCIP and LP_solve. 
+Gurobi, MOSEK and CPLEX are _considerably_ more powerful than the open source solvers SCIP and LP_solve,
 but they require a license.
-Academic licenses can be obtained by students and staff of eligible institutions. 
+Academic licenses can be obtained by students and staff of eligible institutions.
 
 > **Important**
 > When installing a solver, it is advisable to accept the default file
@@ -182,6 +182,17 @@ It will look for this application in the directory specified in the environment
 or more specifically in the environment variable CPLEX_STUDIO_BINARIES<em>nnnn</em>
 (where _nnnn_ denotes the CPLEX version number) on your computer.
 
+#### Installing MOSEK
+
+The software you need to install is **MOSEK**.
+More information on how to obtain a license, and instructions for installing
+MOSEK on your computer can be obtained via this URL:
+<a href="https://www.mosek.com/resources/getting-started/"
+   target="_blank">https://www.mosek.com/resources/getting-started/</a>
+
+When running a model, Linny-R will try to execute the command line application `mosek`.
+It will look for this application in the directory specified in the environment variable PATH on your computer.
+
 #### Installing SCIP
 
 The SCIP software is open source. Instructions for installation can be found via this URL:
@@ -234,8 +245,8 @@ Open the Command Line Interface (CLI) of your computer, change to your Linny-R d
 This response should be something similar to:
 
 <pre>
-Node.js server for Linny-R version 1.7.0
-Node.js version: v21.1.0
+Node.js server for Linny-R version 1.7.4
+Node.js version: v21.2.0
 ... etc.
 </pre>
 
@@ -245,9 +256,9 @@ The Linny-R GUI should show in your browser window,
 while in the CLI you should see a long series of server log messages like:
 
 <pre>
-[2023-10-29 22:55:17] Static file: /index.html
-[2023-10-29 22:55:17] Static file: /scripts/iro.min.js
-[2023-10-29 22:55:17] Static file: /images/open.png
+[2023-11-19 22:55:17] Static file: /index.html
+[2023-11-19 22:55:17] Static file: /scripts/iro.min.js
+[2023-11-19 22:55:17] Static file: /images/open.png
 ... etc.
 </pre>
 
@@ -278,7 +289,7 @@ and then the diagram will be updated to reflect the obtained solution.
 Meanwhile, in the CLI, you should see a server log message like:
 
 <pre>
-Solve block 1 a
+Solve block 1 a with SCIP
 </pre>
 
 To end a modeling session, you can shut down the server by clicking on the
@@ -295,7 +306,7 @@ Optionally, you can add more arguments to the `node` command:
 dpi=[number]       to overrule the default resolution (300 dpi) for Inkscape 
 launch             to automatically launch Linny-R in your default browser
 port=[number]      to overrule the default port number (5050)
-solver=[name]      to overrule the default sequence (Gurobi, CPLEX, SCIP, LP_solve)
+solver=[name]      to overrule the default sequence (Gurobi, MOSEK, CPLEX, SCIP, LP_solve)
 workspace=[path]   to overrule the default path for the user directory
 </pre>
 

package/console.js

@@ -198,7 +198,7 @@ class ConsoleMonitor {
   logOnToServer() {
     VM.solver_user = '';
     VM.solver_token = 'local host';
-    VM.solver_name = SOLVER.id;
+    VM.solver_id = SOLVER.id;
   }
 
   connectToServer() {
@@ -1081,7 +1081,7 @@ if(SETTINGS.model_path) {
         // NOTE: Solver preference in model overrides default solver.
         const mps = MODEL.preferred_solver;
         if(mps && SOLVER.solver_list.hasOwnProperty(mps)) {
-          VM.solver_name = mps;
+          VM.solver_id = mps;
           SOLVER.id = mps;
           console.log(`Using solver ${SOLVER.name} (model preference)`);
         }

package/package.json

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

package/server.js

@@ -124,7 +124,7 @@ function checkNodeModule(name) {
 }
 
 // Currently, these external solvers are supported:
-const SUPPORTED_SOLVERS = ['gurobi', 'cplex', 'scip', 'lp_solve'];
+const SUPPORTED_SOLVERS = ['gurobi', 'mosek', 'cplex', 'scip', 'lp_solve'];
 
 // Load class MILPSolver
 const MILPSolver = require('./static/scripts/linny-r-milp.js');
@@ -1555,7 +1555,7 @@ Possible options are:
   port=[number]      will listen at the specified port number
                      (default is 5050; number must be unique for each server)
   solver=[name]      will select solver [name], or warn if not found
-                     (name choices: Gurobi, CPLEX, SCIP or LP_solve)
+                     (name choices: Gurobi, MOSEK, CPLEX, SCIP or LP_solve)
   verbose            will output solver messages to the console
   workspace=[path]   will create workspace in [path] instead of (Linny-R)/user
 `;

package/static/index.html

@@ -1347,6 +1347,7 @@ NOTE: Unit symbols are case-sensitive, so BTU ≠ Btu">
           <div id="constraint-no-slack" class="box clear"></div>
           <div id="constraint-no-slack-lbl">No slack</div>
         </div>
+        <div id="constraint-convex"></div>
         <div id="constraint-soc">
           <label>Attributed share of cost:</label>
           <select id="constraint-soc-direct">

package/static/linny-r.css

@@ -1985,6 +1985,7 @@ div.menu-item:hover {
 #constraint-from-name,
 #constraint-to-name {
   display: inline-block;
+  vertical-align: middle;
   max-width: 190px;
   white-space: nowrap;
   overflow: hidden;
@@ -2025,7 +2026,15 @@ div.menu-item:hover {
   position: absolute;
   left: -2px;
   bottom: -1px;
-  width: 100px;
+  width: 75px;
+}
+
+#constraint-convex {
+  position: absolute;
+  left: 75px;
+  bottom: -2px;
+  color: #00c030;
+  font-size: 20px;
 }
 
 #constraint-no-slack-lbl {

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

@@ -1412,4 +1412,4 @@ if(NODE) module.exports = {
   ChartManager: ChartManager,
   SensitivityAnalysis: SensitivityAnalysis,
   ExperimentManager: ExperimentManager
-}
+};

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

@@ -66,6 +66,7 @@ class ConstraintEditor {
     this.pos_y_div = document.getElementById('constraint-pos-y');
     this.point_div = document.getElementById('constraint-point');
     this.equation_div = document.getElementById('constraint-equation');
+    this.convex_div = document.getElementById('constraint-convex');
     this.add_point_btn = document.getElementById('add-point-btn');
     this.add_point_btn.addEventListener('click',
         () => CONSTRAINT_EDITOR.addPointToLine());
@@ -395,7 +396,7 @@ class ConstraintEditor {
   
   checkLines() {
     // Checks whether cursor is on a bound line and updates the constraint
-    // editor status accordingly
+    // editor status accordingly.
     this.on_line = null;
     this.on_point = -1;
     this.seg_points = null;
@@ -446,7 +447,10 @@ class ConstraintEditor {
   }
   
   updateEquation() {
-    var segeq = '';
+    // Show the equation for the line segment under the cursor, and
+    // indicate whether the bound line is concave or convex.
+    var segeq = '',
+        convex = '';
     if(this.on_line && this.seg_points) {
       const
           p1 = this.on_line.points[this.seg_points[0]],
@@ -466,7 +470,16 @@ class ConstraintEditor {
             (y0 < 0 ? ' - ' : ' + ') + Math.abs(y0).toPrecision(3));
       }
     }
+    if(this.on_line) {
+      const c = this.on_line.needsNoSOS;
+      if(c > 0) {
+        convex = '\u2934'; // Curved arrow up
+      } else if(c < 0) {
+        convex = '\u2935'; // Curved arrow down
+      }
+    }
     this.equation_div.innerHTML = segeq;
+    this.convex_div.innerHTML = convex;
   }
   
   positionPoint() {

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

@@ -895,13 +895,16 @@ class GUIController extends Controller {
     // If not a valid Linny-R model, ensure that the current model is clean.
     if(!loaded) MODEL = new LinnyRModel();
     // If model specifies a preferred solver, immediately try to switch.
-    if(MODEL.preferred_solver !== VM.solver_name) {
+    if(MODEL.preferred_solver !== VM.solver_id) {
       UI.changeSolver(MODEL.preferred_solver);
     }
     this.updateScaleUnitList();
     this.drawDiagram(MODEL);
     // Cursor may have been set to `waiting` when decrypting.
     this.normalCursor();
+    // Reset the Virtual Machine.
+    VM.reset();
+    this.updateIssuePanel();
     this.setMessage('');
     this.updateButtons();
     // Undoable operations no longer apply!
@@ -992,7 +995,7 @@ class GUIController extends Controller {
     for(let i = 0; i < VM.solver_list.length; i++) {
       const s = VM.solver_list[i];
       html.push(['<option value="', s,
-          (s === VM.solver_name ? '"selected="selected' : ''),
+          (s === VM.solver_id ? '"selected="selected' : ''),
           '">', VM.solver_names[s], '</option>'].join(''));
     }
     md.element('solver').innerHTML = html.join('');
@@ -1028,7 +1031,7 @@ class GUIController extends Controller {
         })
       .then((data) => {
           if(UI.postResponseOK(data, true)) {
-            VM.solver_name = sid;
+            VM.selectSolver(sid);
             UI.modals.server.hide();
           }
         })

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

@@ -234,7 +234,7 @@ class EquationManager {
       this.new_modal.hide();
       this.selected_modifier = m;
       this.updateDialog();
-      // Open expression editor if expression is still undefined
+      // Open expression editor if expression is still undefined.
       if(!m.expression.text) this.editEquation();
     }
   }
@@ -243,13 +243,13 @@ class EquationManager {
     const m = this.selected_modifier;
     if(m) {
       this.edited_expression = m.expression;
-      const md = UI.modals.expression;
-      md.element('property').innerHTML = this.selected_modifier.selector;
-      md.element('text').value = m.expression.text;
-      document.getElementById('variable-obj').value = 0;
+      X_EDIT.edited_input_id = '';
+      X_EDIT.property.innerHTML = this.selected_modifier.selector;
+      X_EDIT.text.value = m.expression.text;
+      X_EDIT.obj.value = 0;
       X_EDIT.updateVariableBar();
       X_EDIT.clearStatusBar();
-      md.show('text');
+      UI.modals.expression.show('text');
     }
   }
   

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

@@ -38,16 +38,16 @@ class ExpressionEditor {
     this.dataset_dot_option = '. (this dataset)';
     this.edited_input_id = '';
     this.edited_expression = null;
-    // Dialog DOM elements
+    // Dialog DOM elements.
     this.property = document.getElementById('expression-property');
     this.text = document.getElementById('expression-text');
     this.status = document.getElementById('expression-status');
     this.info = document.getElementById('expression-info');
-    // The DOM elements for the "insert variable" bar
+    // The DOM elements for the "insert variable" bar.
     this.obj = document.getElementById('variable-obj');
     this.name = document.getElementById('variable-name');
     this.attr = document.getElementById('variable-attr');
-    // The quick guide to Linny-R expressions
+    // The quick guide to Linny-R expressions.
     this.info.innerHTML = `
 <h3>Linny-R expressions</h3>
 <p><em>NOTE: Move cursor over a</em> <code>symbol</code>
@@ -229,6 +229,9 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
     // CLear other properties that relate to the edited expression.
     this.edited_input_id = '';
     this.edited_expression = null;
+    // Clear edited expression attributes of other dialogs.
+    DATASET_MANAGER.edited_expression = null;
+    EQUATION_MANAGER.edited_expression = null;
   }
   
   parseExpression() {

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

@@ -294,7 +294,7 @@ class Finder {
         for(let i = 0; i < n; i++) {
           const e = this.entities[i];
           // Exclude "no actor" and top cluster.
-          if(e.name !== '(no_actor)' && e.name !== '(top_cluster)' &&
+          if(e.name && e.name !== '(no_actor)' && e.name !== '(top_cluster)' &&
               // Also exclude actor cash flow data products because
               // many of their properties should not be changed.
               !e.name.startsWith('$')) {

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

@@ -325,12 +325,12 @@ class GUIMonitor {
             UI.alert(jsr.error);
           } else if(jsr.server) {
             VM.solver_token = jsr.token;
-            VM.solver_name = jsr.solver;
+            VM.selectSolver(jsr.solver);
             // Remote solver may indicate user-specific solver time limit.
             let utl = '';
             if(jsr.time_limit) {
               VM.max_solver_time = jsr.time_limit;
-              utl = ` -- ${VM.solver_name} solver: ` +
+              utl = ` -- ${VM.solver_names[VM.solver_id]} solver: ` +
                   `max. ${VM.max_solver_time} seconds per block`;
               // If user has a set time limit, no restrictions on tableau size.
               VM.max_tableau_size = 0;
@@ -354,7 +354,7 @@ class GUIMonitor {
       VM.solver_token = 'local host';
       fetch('solver/', postData({
             action: 'logon',
-            solver: MODEL.preferred_solver || VM.solver_name}))
+            solver: MODEL.preferred_solver || VM.solver_id}))
         .then((response) => {
             if(!response.ok) {
               UI.alert(`ERROR ${response.status}: ${response.statusText}`);
@@ -367,10 +367,10 @@ class GUIMonitor {
                   jsr = JSON.parse(data),
                   sname = VM.solver_names[jsr.solver] || 'unknown',
                   svr = `Solver on ${jsr.server} is ${sname}`;
-              if(jsr.solver !== VM.solver_name) UI.notify(svr);
+              if(jsr.solver !== VM.solver_id) UI.notify(svr);
               VM.server = jsr.server;
               VM.working_directory = jsr.path;
-              VM.solver_name = jsr.solver;
+              VM.selectSolver(jsr.solver);
               VM.solver_list = jsr.solver_list;
               document.getElementById('host-logo').title  = svr;
               VM.connected = true;