linny-r 1.7.4 → 1.8.0

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.0",
   "description": "Executable graphical language with WYSIWYG editor for MILP models",
   "main": "server.js",
   "scripts": {

package/static/index.html

@@ -723,26 +723,33 @@ NOTE: Unit symbols are case-sensitive, so BTU ≠ 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>
+        <tr title="When checked, finite process bounds and slack variables are always added">
+          <td style="padding:0px">
+            <div id="solver-diagnose" class="box clear"></div>
+          </td>
+          <td style="padding-bottom:4px">Diagnose infeasible/unbounded problems</td>
+          </td>
+        </tr>
       </table>
     </div>
   </div>

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-gui-controller.js

@@ -501,6 +501,9 @@ class GUIController extends Controller {
     
     // Visible draggable dialogs are sorted by their z-index.
     this.dr_dialog_order = [];
+    
+    // Record of message that was overridden by more important message.
+    this.old_info_line = null;
   }
   
   get color() {
@@ -617,7 +620,8 @@ class GUIController extends Controller {
             UI.updateButtons();
           }
         });
-    this.buttons.solve.addEventListener('click', () => VM.solveModel());
+    this.buttons.solve.addEventListener('click',
+        (event) => VM.solveModel(event.altKey));
     this.buttons.stop.addEventListener('click', () => VM.halt());
     this.buttons.reset.addEventListener('click', () => UI.resetModel());
 
@@ -2665,12 +2669,13 @@ class GUIController extends Controller {
     
   setMessage(msg, type=null) {
     // Displays message on infoline unless no type (= plain text) and some
-    // info, warning or error message is already displayed
+    // info, warning or error message is already displayed.
     super.setMessage(msg, type);
     const types = ['notification', 'warning', 'error'];
     let d = new Date(),
         t = d.getTime(),
-        dt = t - this.time_last_message,
+        dt = t - this.time_last_message, // Time since display
+        rt = this.message_display_time - dt, // Time remaining
         mti = types.indexOf(type),
         lmti = types.indexOf(this.last_message_type);
     if(type) {
@@ -2683,18 +2688,36 @@ class GUIController extends Controller {
       // When receiver is active, add message to its log.
       if(RECEIVER.active) RECEIVER.log(`[${now}] ${msg}`);
     }
-    // Display text only if previous message has "timed out" or was less
-    // urgent than this one.
-    if(lmti < 0 || mti > lmti || dt >= this.message_display_time) {
+    if(mti === 1 && lmti === 2 && rt > 0) {
+      // Queue warnings if an error message is still being displayed.
+          setTimeout(() => {
+          UI.info_line.innerHTML = msg;
+          UI.info_line.classList.remove(...types);
+          UI.info_line.classList.add(type);
+          UI.updateIssuePanel();
+        }, rt);      
+    } else if(lmti < 0 || mti > lmti || rt <= 0) {
+      // Display text only if previous message has "timed out" or was less
+      // urgent than this one.
+      const override = mti === 2 && lmti === 1 && rt > 0;
       this.time_last_message = t;
       this.last_message_type = type;
       if(type) SOUNDS[type].play().catch(() => {
           console.log('NOTICE: Sounds will only play after first user action');
         });
-      const il = document.getElementById('info-line');
-      il.classList.remove(...types);
-      il.classList.add(type);
-      il.innerHTML = msg;
+      if(override && !this.old_info_line) {
+        // Set time-out to restore overridden warning.
+        this.old_info_line = {msg: this.info_line.innerHTML, status: types[lmti]};
+        setTimeout(() => {
+            UI.info_line.innerHTML = UI.old_info_line.msg;
+            UI.info_line.classList.add(UI.old_info_line.status);
+            UI.old_info_line = null;
+            UI.updateIssuePanel();
+          }, this.message_display_time);
+      }
+      UI.info_line.classList.remove(...types);
+      UI.info_line.classList.add(type);
+      UI.info_line.innerHTML = msg;
     }
   }
   
@@ -3630,6 +3653,7 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     md.element('preference').innerHTML = html.join('');
     md.element('int-feasibility').value = MODEL.integer_tolerance;
     md.element('mip-gap').value = MODEL.MIP_gap;
+    this.setBox('solver-diagnose', MODEL.always_diagnose);
     md.show();
   }
   
@@ -3658,6 +3682,11 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     }
     MODEL.integer_tolerance = Math.max(1e-9, Math.min(0.1, itol));
     MODEL.MIP_gap = Math.max(0, Math.min(0.5, mgap));
+    MODEL.always_diagnose = this.boxChecked('solver-diagnose');
+    if(MODEL.always_diagnose) {
+      UI.notify('To diagnose unbounded problems, values beyond 1e+10 ' +
+          'are considered as infinite (\u221E)');
+    }
     // Close the dialog.
     md.hide();
   }

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

@@ -300,9 +300,9 @@ class Paper {
       at_process_ub_arrow: '#f0b0e8',
       // NOTE: special color when level at negative lower bound
       at_process_neg_lb: '#800050',
-      // Process with unbound level = +INF is displayed in maroon-red
-      infinite_level: '#a00001',
-      infinite_level_fill: '#ff90a0',
+      // Process with unbound level: +INF marine-blue, -INF maroon-red
+      plus_infinite_level: '#1000a0',
+      minus_infinite_level: '#a00010',
       // Process state change symbols are displayed in red
       switch_on_off: '#b00000',
       // Compound arrows with non-zero actual flow are displayed in red-purple
@@ -1979,9 +1979,16 @@ class Paper {
     if(MODEL.solved && !ignored) {
       if(l === VM.PLUS_INFINITY) {
         // Infinite level => unbounded solution
-        stroke_color = this.palette.infinite_level;
-        fill_color = this.palette.infinite_level_fill;
-        lrect_color = this.palette.infinite_level;
+        stroke_color = this.palette.plus_infinite_level;
+        fill_color = this.palette.above_upper_bound;
+        lrect_color = this.palette.plus_infinite_level;
+        font_color = 'white';
+        stroke_width = 2;
+      } else if(l === VM.MINUS_INFINITY) {
+        // Infinite level => unbounded solution
+        stroke_color = this.palette.minus_infinite_level;
+        fill_color = this.palette.below_lower_bound;
+        lrect_color = this.palette.minus_infinite_level;
         font_color = 'white';
         stroke_width = 2;
       } else if(l > ub - VM.SIG_DIF_FROM_ZERO ||

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

@@ -612,15 +612,21 @@ module.exports = class MILPSolver {
               json = fs.readFileSync(s.solution, 'utf8').trim(),
               sol = JSON.parse(json);
           result.seconds = sol.SolutionInfo.Runtime;
+          let status = sol.SolutionInfo.Status;
           // NOTE: Status = 2 indicates success!
-          if(sol.SolutionInfo.Status !== 2) {
-            result.status = sol.SolutionInfo.Status;
-            result.error = s.errors[result.status];
+          if(status !== 2) {
+            let msg = s.statusMessage(status);  
+            if(msg) {
+              // If solver exited with known status code, report message.
+              result.status = status;
+              result.solution = s.usableSolution(status);
+              result.error = msg;
+            }
             if(!result.error) result.error = 'Unknown solver error';
             console.log(`Solver status: ${result.status} - ${result.error}`);
           }
           // Objective value.
-          result.obj = sol.SolutionInfo.ObjVal;
+          result.obj = sol.SolutionInfo.ObjVal || 0;
           // Values of solution vector.
           if(sol.Vars) {
             // Fill dictionary with variable name: value entries.
@@ -676,21 +682,29 @@ module.exports = class MILPSolver {
         if(result.status.indexOf('OPTIMAL') >= 0) {
           result.status = 0;
           result.error = '';
+        } else if(result.status.indexOf('DUAL_INFEASIBLE') >= 0) {
+          result.error = 'Problem is unbounded';
+          solved = false;
+        } else if(result.status.indexOf('INFEASIBLE') >= 0) {
+          result.error = 'Problem is infeasible';
+          solved = false;
         }
-        while(i < output.length && output[i].indexOf('VARIABLES') < 0) {
-          i++;
-        }
-        // Fill dictionary with variable name: value entries.
-        while(i < output.length) {
-          const m = output[i].match(/^\d+\s+X(\d+)\s+SB\s+([^\s]+)\s+/);
-          if(m !== null)  {
-            const vn = 'X' + m[1].padStart(7, '0');
-            x_dict[vn] = parseFloat(m[2]);
+        if(solved) {
+          while(i < output.length && output[i].indexOf('VARIABLES') < 0) {
+            i++;
           }
-          i++;
+          // Fill dictionary with variable name: value entries.
+          while(i < output.length) {
+            const m = output[i].match(/^\d+\s+X(\d+)\s+\w\w\s+([^\s]+)\s+/);
+            if(m !== null)  {
+              const vn = 'X' + m[1].padStart(7, '0');
+              x_dict[vn] = parseFloat(m[2]);
+            }
+            i++;
+          }
+          // Fill the solution vector, adding 0 for missing columns.
+          getValuesFromDict();
         }
-        // Fill the solution vector, adding 0 for missing columns.
-        getValuesFromDict();
       } else {
         console.log('No solution found');
       }
@@ -698,6 +712,14 @@ module.exports = class MILPSolver {
       result.seconds = 0;
       const
           no_license = (log.indexOf('No license found') >= 0),
+          // NOTE: Omit first letter U, I and P as they may be either in
+          // upper case or lower case.
+          unbounded = (log.indexOf('nbounded') >= 0),
+          infeasible = (log.indexOf('nfeasible') >= 0),
+          primal_unbounded = (log.indexOf('rimal unbounded') >= 0),
+          err = log.match(/CPLEX Error\s+(\d+):\s+(.+)\./),
+          err_nr = (err && err.length > 1 ? parseInt(err[1]) : 0),
+          err_msg = (err_nr ? err[2] : ''),
           // NOTE: Solver reports time with 1/100 secs precision.
           mst = log.match(/Solution time \=\s+(\d+\.\d+) sec/);
       if(mst && mst.length > 1) result.seconds = parseFloat(mst[1]);
@@ -712,6 +734,15 @@ module.exports = class MILPSolver {
         // Non-zero solver exit code indicates serious trouble.
         result.error = 'CPLEX solver terminated with error';
         result.status = -13;
+      } else if(err_nr) {
+        result.status = err_nr;
+        if(infeasible && !primal_unbounded) {
+          result.error = 'Problem is infeasible';
+        } else if(unbounded) {
+          result.error = 'Problem is unbounded';
+        } else {
+          result.error = err_msg;
+        }
       } else {
         try {
           output = fs.readFileSync(s.solution, 'utf8').trim();
@@ -792,7 +823,14 @@ module.exports = class MILPSolver {
               }
             }
             if(result.status) {
-              result.error = this.solver_list.scip.errors[result.status];
+              let msg = s.statusMessage(result.status);  
+              if(msg) {
+                // If solver exited with known status code, report message.
+                result.solution = s.usableSolution(result.status);
+                result.error = msg;
+              }
+              if(!result.error) result.error = 'Unknown solver error';
+              console.log(`Solver status: ${result.status} - ${result.error}`);
             }
           } else if (m.startsWith('Solving Time')) {
             result.seconds = parseFloat(m.split(':')[1]);

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

@@ -104,6 +104,7 @@ class LinnyRModel {
     this.preferred_solver = ''; // empty string denotes "use default"
     this.integer_tolerance = 5e-7; // integer feasibility tolerance
     this.MIP_gap = 1e-4; // relative MIP gap
+    this.always_diagnose = false;
 
     // Sensitivity-related properties
     this.base_case_selectors = '';
@@ -2666,6 +2667,7 @@ class LinnyRModel {
       this.infer_cost_prices = nodeParameterValue(node, 'cost-prices') === '1';
       this.report_results = nodeParameterValue(node, 'report-results') === '1';
       this.show_block_arrows = nodeParameterValue(node, 'block-arrows') === '1';
+      this.always_diagnose = nodeParameterValue(node, 'diagnose') === '1';
       this.name = xmlDecoded(nodeContentByTag(node, 'name'));
       this.author = xmlDecoded(nodeContentByTag(node, 'author'));
       this.comments = xmlDecoded(nodeContentByTag(node, 'notes'));
@@ -3014,6 +3016,7 @@ class LinnyRModel {
     if(this.infer_cost_prices) p += ' cost-prices="1"';
     if(this.report_results) p += ' report-results="1"';
     if(this.show_block_arrows) p += ' block-arrows="1"';
+    if(this.always_diagnose) p += ' diagnose="1"';
     let xml = this.xml_header + ['<model', p, '><name>',  xmlEncoded(this.name),
         '</name><author>', xmlEncoded(this.author),
         '</author><notes>', xmlEncoded(this.comments),
@@ -6302,7 +6305,9 @@ class Cluster extends NodeBox {
   }
   
   usesSlack(t, p, slack_type) {
-    // Adds slack-using product `p` to slack info for this cluster
+    // Adds slack-using product `p` to slack info for this cluster.
+    // NOTE: When diagnosing an unbounded problem, `p` can also be a
+    // process with an infinite level.
     let s;
     if(t in this.slack_info) {
       s = this.slack_info[t];
@@ -6311,6 +6316,7 @@ class Cluster extends NodeBox {
       this.slack_info[t] = s;
     }
     addDistinct(p, s[slack_type]);
+    // NOTE: Recursive call to let the slack use info "bubble up".
     if(this.cluster) this.cluster.usesSlack(t, p, slack_type);
   }
 

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

@@ -2078,6 +2078,15 @@ class VirtualMachine {
     // so far, type is always HI (highest increment); object can be
     // a process or a product.
     this.chunk_variables = [];
+    // NOTE: As of version 1.8.0, diagnosis is performed only when the
+    // modeler Alt-clicks the "run" button or clicks the link in the
+    // infoline warning that is displayed when the solver reports that a
+    // block poses a problem that is infeasible (too tight constraints)
+    // or unbounded (no upper limit on some processes). Diagnosis is
+    // implemented by adding slack and setting finite bounds on processes
+    // and then make a second attempt to solve the block.
+    this.diagnose = false;
+    this.prompt_to_diagnose = false;
     // Array for VM instructions.
     this.code = [];
     // The Simplex tableau: matrix, rhs and ct will have same length.
@@ -2112,17 +2121,23 @@ class VirtualMachine {
     // Floating-point constants used in calculations
     // Meaningful solver results are assumed to lie wihin reasonable bounds.
     // Extreme absolute values (10^25 and above) are used to signal particular
-    // outcomes. This 10^25 limit is used because the default MILP solver
-    // LP_solve considers a problem to be unbounded if decision variables
-    // reach +INF (1e+30) or -INF (-1e+30), and a solution inaccurate if
-    // extreme values get too close to +/-INF. The higher values have been
-    // chosen arbitrarily.
+    // outcomes. This 10^25 limit is used because the original MILP solver
+    // used by Linny-R (LP_solve) considers a problem to be unbounded if
+    // decision variables reach +INF (1e+30) or -INF (-1e+30), and a solution
+    // inaccurate if extreme values get too close to +/-INF. The higher
+    // values have been chosen arbitrarily.
     this.PLUS_INFINITY = 1e+25;
     this.MINUS_INFINITY = -1e+25;
     this.BEYOND_PLUS_INFINITY = 1e+35;
     this.BEYOND_MINUS_INFINITY = -1e+35;
+    // The 1e+30 value is recognized by all supported solvers as "infinity",
+    // and hence can be used to indicate that a variable has no upper bound.
     this.SOLVER_PLUS_INFINITY = 1e+30;
     this.SOLVER_MINUS_INFINITY = -1e+30;
+    // As of version 1.8.0, Linny-R imposes no +INF bounds on processes
+    // unless diagnosing an unbounded problem. For such diagnosis, the
+    // (relatively) low value 9.99999999e+9 is used.
+    this.DIAGNOSIS_UPPER_BOUND = 9.99999999e+9;
     // NOTE: Below the "near zero" limit, a number is considered zero
     // (this is to timely detect division-by-zero errors).
     this.NEAR_ZERO = 1e-10;
@@ -2345,17 +2360,6 @@ class VirtualMachine {
   selectSolver(id) {
     if(id in this.solver_names) {
       this.solver_id = id;
-/*
-      if(id === 'mosek') {
-        this.PLUS_INFINITY = 1e+6;
-        this.MINUS_INFINITY = -1e+6;
-        this.MAX_SLACK_PENALTY = 1e+6;
-      } else {
-        this.PLUS_INFINITY = 1e+25;
-        this.PLUS_INFINITY = -1e+25;
-        this.MAX_SLACK_PENALTY = 1e+24;
-      }
-*/
     } else {
       UI.alert(`Invalid solver ID "${id}"`);
     }
@@ -2996,7 +3000,7 @@ class VirtualMachine {
     //     to respect certain constraints. This may result in infeasible
     //     MILP problems. The solver will report this, but provide no
     //     clue as to which constraints may be critical.
-    if(p instanceof Product && !p.no_slack) {
+    if(p instanceof Product && this.diagnose && !p.no_slack) {
       p.stock_LE_slack_var_index = this.addVariable('LE', p);
       p.stock_GE_slack_var_index = this.addVariable('GE', p);
     }
@@ -3125,7 +3129,7 @@ class VirtualMachine {
       );
     // ... or if P is neither source nor sink.
     } else if(p.equal_bounds && notsrc && notsnk) {
-      if(!p.no_slack) {
+      if(this.diagnose && !p.no_slack) {
         // NOTE: For EQ, both slack variables should be used, having
         // respectively -1 and +1 as coefficients.
         this.code.push(
@@ -3141,7 +3145,7 @@ class VirtualMachine {
     } else {
       // Add lower bound (GE) constraint unless product is a source node.
       if(notsrc) {
-        if(!p.no_slack) {
+        if(this.diagnose && !p.no_slack) {
           // Add the GE slack index with coefficient +1 (so it can
           // INcrease the left-hand side of the equation)
           this.code.push([VMI_add_const_to_coefficient, [gesvi, 1]]);
@@ -3154,7 +3158,7 @@ class VirtualMachine {
       }
       // Add upper bound (LE) constraint unless product is a sink node
       if(notsnk) {
-        if(!p.no_slack) {
+        if(this.diagnose && !p.no_slack) {
           // Add the stock LE index with coefficient -1 (so it can
           // DEcrease the LHS).
           this.code.push([VMI_add_const_to_coefficient, [lesvi, -1]]);
@@ -3189,6 +3193,14 @@ class VirtualMachine {
       this.fixed_var_indices.push([]);
     }
     
+    // Log if run is performed in "diagnosis" mode.
+    if(this.diagnose) {
+      this.logMessage(this.block_count, 'DIAGNOSTIC RUN' +
+          (MODEL.always_diagnose ? ' (default -- see model settings)': '') +
+          '\n- slack variables on products and constraints' +
+          '\n- finite bounds on all processes');
+    }
+    
     // Just in case: re-determine which entities can be ignored.
     MODEL.inferIgnoredEntities();
     const n = Object.keys(MODEL.ignored_entities).length;
@@ -3254,7 +3266,7 @@ class VirtualMachine {
             // solver does not support special ordered sets).
             // NOTE: `addVariable` will add as many as there are points!
             bl.first_sos_var_index = this.addVariable('W1', bl);
-            if(!c.no_slack) {
+            if(this.diagnose && !c.no_slack) {
               // Define the slack variable(s) for bound line constraints.
               // NOTE: Category [2] means: highest slack penalty.
               if(bl.type !== VM.GE) {
@@ -3375,7 +3387,7 @@ class VirtualMachine {
         p = MODEL.products[k];
         // Get index of variable that is constrained by LB and UB.
         vi = p.level_var_index;
-        if(p.no_slack) {
+        if(p.no_slack || !this.diagnose) {
           // If no slack, the bound constraints can be set on the
           // variables themselves.
           lbx = p.lower_bound;
@@ -3658,7 +3670,7 @@ class VirtualMachine {
       k = product_keys[i];
       if(!MODEL.ignored_entities[k]) {
         p = MODEL.products[k];
-        if(p.level_var_index >= 0 && !p.no_slack) {
+        if(p.level_var_index >= 0 && !p.no_slack && this.diagnose) {
           hb = p.hasBounds;
           pen = (p.is_data ? 2 :
               // NOTE: Lowest penalty also for IMPLIED sources and sinks.
@@ -4605,7 +4617,8 @@ class VirtualMachine {
       // Compute the peak from the peak increase.
       p.b_peak[block] = p.b_peak[block - 1] + p.b_peak_inc[block];
     }
-    // Add warning to messages if slack has been used.
+    // Add warning to messages if slack has been used, or some process
+    // level is "infinite" while diagnosing an unbounded problem.
     // NOTE: Only check after the last round has been evaluated.
     if(round === this.lastRound) {
       let b = bb;
@@ -4646,6 +4659,27 @@ class VirtualMachine {
             }
           }
         }
+        if(this.diagnose) {
+          // Iterate over all processes, and set the "slack use" flag
+          // for their cluster so that these clusters will be highlighted.
+          for(let o in MODEL.processes) if(MODEL.processes.hasOwnProperty(o) &&
+              !MODEL.ignored_entities[o]) {
+            const
+                p = MODEL.processes[o],
+                l = p.level[b];
+            if(l >= VM.PLUS_INFINITY) {
+              this.logMessage(block,
+                  `${this.WARNING}(t=${b}${round}) ${p.displayName} has level +INF`);
+              // NOTE: +INF is signalled in blue, just like use of LE slack.
+              p.cluster.usesSlack(b, p, 'LE');
+            } else if(l <= VM.MINUS_INFINITY) {
+              this.logMessage(block,
+                  `${this.WARNING}(t=${b}${round}) ${p.displayName} has level -INF`);
+              // NOTE: -INF is signalled in red, just like use of GE slack.
+              p.cluster.usesSlack(b, p, 'GE');
+            }
+          }
+        }
         j += this.cols;
         b++;
       }
@@ -5878,6 +5912,9 @@ Solver status = ${json.status}`);
       }
       this.logMessage(bnr, errmsg);
       UI.alert(errmsg);
+      if(errmsg.indexOf('nfeasible') >= 0 || errmsg.indexOf('nbounded') >= 0) {
+        this.prompt_to_diagnose = true;
+      }
     }
     this.logMessage(bnr, msg);
     this.equations[bnr - 1] = json.model;
@@ -5936,7 +5973,12 @@ Solver status = ${json.status}`);
         RECEIVER.report();
       }
       // Warn modeler if any issues occurred.
-      if(this.block_issues) {
+      if(this.prompt_to_diagnose && !this.diagnose) {
+        UI.warn('Model is infeasible or unbounded -- ' +
+            '<strong>Alt</strong>-click on the <em>Run</em> button ' +
+            '<img id="solve-btn" class="sgray" src="images/solve.png">' +
+            ' for diagnosis');
+      } else if(this.block_issues) {
         let msg = 'Issues occurred in ' +
             pluralS(this.block_issues, 'block') +
             ' -- details can be viewed in the monitor';
@@ -6091,7 +6133,7 @@ Solver status = ${json.status}`);
     this.solveBlocks();
   }
   
-  solveModel() {
+  solveModel(diagnose=false) {
     // Start the sequence of data loading, model translation, solving
     // consecutive blocks, and finally calculating dependent variables.
     // NOTE: Do this only if the model defines a MILP problem, i.e.,
@@ -6101,6 +6143,22 @@ Solver status = ${json.status}`);
       UI.notify('Nothing to solve');
       return;
     }
+    // Diagnosis (by adding slack variables and finite bounds on processes)
+    // is activated when Alt-clicking the "run" button, or by clicking the
+    // "clicke HERE to diagnose" link on the infoline.
+    this.diagnose = diagnose || MODEL.always_diagnose;
+    if(this.diagnose) {
+      this.PLUS_INFINITY = this.DIAGNOSIS_UPPER_BOUND;
+      this.MINUS_INFINITY = -this.DIAGNOSIS_UPPER_BOUND;
+      console.log('DIAGNOSIS ON');
+    } else {
+      this.PLUS_INFINITY = 1e+25;
+      this.MINUS_INFINITY = -1e+25;
+      console.log('DIAGNOSIS OFF');
+    }
+    // The "propt to diagnose" flag is set when some block posed an
+    // infeasible or unbounded problem.
+    this.prompt_to_diagnose = false;
     const n = MODEL.loading_datasets.length;
     if(n > 0) {
       // Still within reasonable time? (3 seconds per dataset)
@@ -7784,10 +7842,11 @@ function VMI_set_bounds(args) {
       vbl = VM.variables[vi - 1][1],
       k = VM.offset + vi,
       r = VM.round_letters.indexOf(VM.round_sequence[VM.current_round]),
-      // Optional fourth parameter indicates whether the solver's
-      // infinity values should be used.
-      solver_inf = args.length > 3 && args[3],
-      inf_val = (solver_inf ? VM.SOLVER_PLUS_INFINITY : VM.PLUS_INFINITY);
+      // When diagnosing an unbounded problem, use low value for INFINITY,
+      // but the optional fourth parameter indicates whether the solver's
+      // infinity values should override the diagnosis INFINITY.
+      inf_val = (VM.diagnose && !(args.length > 3 && args[3]) ?
+          VM.DIAGNOSIS_UPPER_BOUND : VM.SOLVER_PLUS_INFINITY);
   let l,
       u,
       fixed = (vi in VM.fixed_var_indices[r - 1]);
@@ -7812,17 +7871,15 @@ function VMI_set_bounds(args) {
     u = args[2];
     if(u instanceof Expression) u = u.result(VM.t);
     u = Math.min(u, VM.PLUS_INFINITY);
-    if(solver_inf) {
-      if(l === VM.MINUS_INFINITY) l = -inf_val;
-      if(u === VM.PLUS_INFINITY) u = inf_val;
-    }
+    if(l === VM.MINUS_INFINITY) l = -inf_val;
+    if(u === VM.PLUS_INFINITY) u = inf_val;
     fixed = '';
   }
   // NOTE: To see in the console whether fixing across rounds works, insert
   // "fixed !== '' || " before DEBUGGING below.
   if(DEBUGGING) {
     console.log(['set_bounds [', k, '] ', vbl.displayName, ' t = ', VM.t,
-      ' LB = ', VM.sig4Dig(l), ', UB = ', VM.sig4Dig(u), fixed].join(''));
+      ' LB = ', VM.sig4Dig(l), ', UB = ', VM.sig4Dig(u), fixed, l, u, inf_val].join(''));
   }
   // NOTE: Since the VM vectors for lower bounds and upper bounds are
   // initialized with default values (0 for LB, +INF for UB), there is
@@ -8327,7 +8384,15 @@ function VMI_add_constraint(ct) {
       }
     }
     VM.matrix.push(row);
-    VM.right_hand_side.push(VM.rhs);
+    let rhs = VM.rhs;
+    if(rhs >= VM.PLUS_INFINITY) {
+      rhs = (VM.diagnose ? VM.DIAGNOSIS_UPPER_BOUND :
+          VM.SOLVER_PLUS_INFINITY);
+    } else if(rhs <= VM.MINUS_INFINITY) {
+      rhs = (VM.diagnose ? -VM.DIAGNOSIS_UPPER_BOUND :
+          VM.SOLVER_MINUS_INFINITY);
+    }
+    VM.right_hand_side.push(rhs);
     VM.constraint_types.push(ct);
   } else if(DEBUGGING) {
     console.log('Constraint NOT added!');
@@ -8480,7 +8545,7 @@ function VMI_add_bound_line_constraint(args) {
   for(let i = 0; i < w.length; i++) {
     VM.coefficients[w[i]] = -y[i];
   }
-  if(!bl.constraint.no_slack) {
+  if(VM.diagnose && !bl.constraint.no_slack) {
     // Add coefficients for slack variables unless omitted.
     if(bl.type != VM.LE) VM.coefficients[VM.offset + bl.GE_slack_var_index] = 1;
     if(bl.type != VM.GE) VM.coefficients[VM.offset + bl.LE_slack_var_index] = -1;