linny-r 1.7.4 → 1.8.1

package/README.md

@@ -66,7 +66,7 @@ and then type at the command line prompt:
 
 ``npm install --prefix . linny-r``
 
-> **Important**
+> [!IMPORTANT]
 > The spacing around the dot is essential. Type the command in lower case.
 
 After installation has completed, `Linny-R` should have this directory tree structure:
@@ -98,7 +98,7 @@ on a Windows machine the batch script `linny-r.bat`. By default, this script fil
 two commands: first change to the Linny-R directory and then tell Node.js to launch the
 start the Linny-R server.
 
-> **Note**
+> [!NOTE]
 > When configuring Linny-R for a network environment where individual users
 > each have their personal work space (e.g., a virtual drive U:), you must edit this script file,
 > adding the argument `workspace=path/to/workspace` to the `node` command.
@@ -129,7 +129,7 @@ version 1.4.0, open the CLI, change to your `Linny-R` directory, and then type:
 
 ``npm install linny-r@1.4.0``
 
-> **Note**
+> [!NOTE]
 > This will overwrite the contents of the `node_modules` directory, but
 > it will not affect the files in your user space.
 
@@ -139,7 +139,7 @@ directory and type:
 
 ``npm install --prefix . linny-r@1.4.0``
 
-> **Note**
+> [!NOTE]
 > To run a specific version in your browser, you must start the server from
 > the directory where you installed this version.
 > Should you wish to run two different versions concurrently, you must use
@@ -152,7 +152,7 @@ Gurobi, MOSEK and CPLEX are _considerably_ more powerful than the open source so
 but they require a license.
 Academic licenses can be obtained by students and staff of eligible institutions.
 
-> **Important**
+> [!IMPORTANT]
 > When installing a solver, it is advisable to accept the default file
 > locations that are proposed by the installer.
 > After installation, do **not** move files to some other directory,
@@ -262,7 +262,7 @@ while in the CLI you should see a long series of server log messages like:
 ... etc.
 </pre>
 
-> **Important**
+> [!IMPORTANT]
 > Do **not** close the CLI. If you do, the Linny-R GUI may still be
 > visible in your browser, but you will be warned that it cannot connect
 > to the server (at 127.0.0.1:5050). This means that you have to restart
@@ -348,7 +348,7 @@ The sub-directories of this directory `user` are used by Linny-R to store files.
 * `solver` will contain the files that are exchanged with the Mixed Integer Linear Programming (MILP) solver
   (the names of the files that will appear in this directory may vary, depending on the MILP-solver you use)
 
-> **Note**
+> [!NOTE]
 > By default, the `user` directory is created in your `Linny-R` directory.
 > You can overrule this by starting the server with the `workspace=[path]` option.
 > This will create a new, empty workspace (the directories listed above) in the specified path.
@@ -381,7 +381,7 @@ Linny-R will automatically detect whether Inkscape is installed by searching
 for it in the environment variable PATH on your computer. On a macOS computer,
 Linny-R will look for Inkscape in `/Applications/Inkscape.app/Contents/MacOS`.
 
-> **Note**
+> [!NOTE]
 > The installation wizard for Inkscape (version 1.3) may **not**
 > add the application to the PATH variable. Please check whether you need to
 > do this yourself.
@@ -396,7 +396,7 @@ If you open a CLI box, change to your `Linny-R` directory, and then type:
 
 you will see the command line options that allow you to run models in various ways.
 
-> **Note**
+> [!NOTE]
 > The console-only version is still in development, and does not provide all functions yet.
 
 ## Troubleshooting problems
@@ -405,7 +405,7 @@ If during any of the steps above you encounter problems, please try to diagnose
 You can find a lot of useful information on the Linny-R user documentation website:
 <a href="https://linny-r.info" target="_blank">https://linny-r.info</a>.
 
-> **Important**
+> [!IMPORTANT]
 > To diagnose a problem, always look in the CLI box where Node.js is running, 
 > as informative server-side error messages will appear there.
 

package/package.json

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

package/static/index.html

@@ -375,7 +375,7 @@ and move the cursor over the status bar">
     <img id="redo-btn" class="btn disab" src="images/redo.png"
          title="Redo (Ctrl-Y)">
     <img id="solve-btn" class="btn enab" src="images/solve.png"
-         title="Run simulation (Ctrl-R)">
+         title="Run simulation (Ctrl-R) &ndash; Alt-click to diagnose infeasible/unbounded problem (Alt-R)">
     <img id="stop-btn" class="btn enab off" src="images/stop.png"
          title="Stop solving (Ctrl-Q)">
     <img id="reset-btn" class="btn enab off" src="images/reset.png"
@@ -576,11 +576,9 @@ and move the cursor over the status bar">
       <table style="width:100%; white-space: nowrap">
         <tr>
           <td style="padding:0px">
-            <div id="settings-decimal-comma" class="box clear"></div>
-          </td>
-          <td style="padding-bottom:4px">
-            Use decimal <u>comma</u> when copying data to clipboard
+            <div id="settings-block-arrows" class="box clear"></div>
           </td>
+          <td style="padding-bottom:4px">Show hidden flows as block arrows</td>
         </tr>
         <tr>
           <td style="padding:0px">
@@ -632,25 +630,34 @@ and move the cursor over the status bar">
                  title="Set solver preferences">
           </td>
         </tr>
+        <tr title="When checked, finite process bounds and slack variables are always added">
+          <td style="padding:0px">
+            <div id="settings-diagnose" class="box clear"></div>
+          </td>
+          <td style="padding-bottom:4px">Diagnose infeasible/unbounded problems</td>
+          </td>
+        </tr>
         <tr>
           <td style="padding:0px">
             <div id="settings-cost-prices" class="box clear"></div>
           </td>
           <td style="padding-bottom:4px">Infer and display cost prices</td>
         </tr>
-        <tr title="Reports will be saved in user/reports/, and removed after 24 h">
+        <tr>
           <td style="padding:0px">
-            <div id="settings-report-results" class="box clear"></div>
+            <div id="settings-decimal-comma" class="box clear"></div>
           </td>
           <td style="padding-bottom:4px">
-            Report results after each run
+            Use decimal <u>comma</u> when copying data to clipboard
           </td>
         </tr>
-        <tr>
+        <tr title="Reports will be saved in user/reports/, and removed after 24 h">
           <td style="padding:0px">
-            <div id="settings-block-arrows" class="box clear"></div>
+            <div id="settings-report-results" class="box clear"></div>
+          </td>
+          <td style="padding-bottom:4px">
+            Report results after each run
           </td>
-          <td style="padding-bottom:4px">Show hidden flows as block arrows</td>
         </tr>
         <tr>
           <td style="padding:0px">
@@ -723,23 +730,23 @@ NOTE: Unit symbols are case-sensitive, so BTU &ne; Btu">
       </div>
       <table style="width: 100%">
         <tr title="This solver will be used if it is installed">
-          <td>
+          <td colspan="2">
             <label>Preferred solver:</label>
             <select id="solver-preference">
             </select>
           </td>
         </tr>
         <tr title="Tolerance may range from 1e-9 to 0.1">
-          <td>
+          <td colspan="2">
             <label>Integer feasibility tolerance:</label>
-            <input id="solver-int-feasibility" style="width: 55px"
+            <input id="solver-int-feasibility" style="width: 65px"
                    placeholder="5e-7" type="text" autocomplete="off">
           </td>
         </tr>
         <tr title="Relative gap may range from 0 to 0.5">
-          <td>
+          <td colspan="2">
             <label>Relative MIP gap:</label>
-            <input id="solver-mip-gap" style="width: 55px"
+            <input id="solver-mip-gap" style="width: 65px"
                    placeholder="1e-4" type="text" autocomplete="off">
           </td>
         </tr>

package/static/linny-r.css

@@ -313,6 +313,15 @@ img.sbtn.senab:hover {
   filter: brightness(150%);
 }
 
+img.sgray {
+  width: 16px;
+  height: 16px;
+  margin: -1px;
+  vertical-align: middle;
+  filter: grayscale(100%);
+}
+
+
 /* Bounds button indicates whether LB = UB */
 div.bbtn {
   background-size: contain;
@@ -1002,7 +1011,7 @@ input.pws-5 {
 }
 
 #solver-dlg {
-  width: 212px;
+  width: 250px;
   height: min-content;
 }
 
@@ -2727,6 +2736,7 @@ td.equation-expression {
   top: 134px;
   left: 2px;
   width: calc(100% - 5px);
+  white-space: nowrap;
 }
 
 #series-clip {

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

@@ -572,6 +572,7 @@ class Controller {
     VM.reset();
     // Redraw model in the browser (GUI only).
     MODEL.clearSelection();
+    this.clearStatusLine();
     this.drawDiagram(MODEL);
   }
   
@@ -605,6 +606,7 @@ class Controller {
   setProgressNeedle() {}
   updateTimeStep() {}
   updateIssuePanel() {}
+  clearStatusLine() {}
   updateDraggableDialogs() {}
   logHeapSize() {}