linny-r 1.8.1 → 1.9.0

package/package.json

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

package/static/index.html

@@ -876,7 +876,7 @@ NOTE: Unit symbols are case-sensitive, so BTU ≠ Btu">
             <a href="https://creativecommons.org/licenses/by-sa/4.0"
                target="_blank">
             Creative Commons Attribution-ShareAlike (CC BY-SA) license</a>.
-            <img src="../images/by-sa.svg" style="height:21px; margin-top:3px"> 
+            <img src="images/by-sa.svg" style="height:21px; margin-top:3px"> 
           </td>
         </tr>
       </table>
@@ -908,7 +908,7 @@ NOTE: Unit symbols are case-sensitive, so BTU &ne; Btu">
             <a href="https://creativecommons.org/licenses/by-sa/4.0"
                target="_blank">
             Creative Commons Attribution-ShareAlike (CC BY-SA) license</a>.
-            <img src="../images/by-sa.svg" style="height:21px; margin-top:3px"> 
+            <img src="images/by-sa.svg" style="height:21px; margin-top:3px"> 
           </td>
         </tr>
       </table>
@@ -1848,6 +1848,8 @@ NOTE: * and ? will be interpreted as wildcards"
            title="Edit selected equation">
       <img id="eq-delete-btn" class="btn disab" src="images/delete.png"
            title="Delete selected equation">
+      <img id="eq-view-btn" class="btn enab" src="images/zoom-in.png"
+           title="Switch to multi-line expression display">
     </div>
     <img id="equation-outcome" class="not-selected" src="images/outcome.png"
          title="Click to consider/ignore selected equation as experiment outcome">
@@ -2266,6 +2268,8 @@ NOTE: * and ? will be interpreted as wildcards"
              title="Rename selected experiment">
         <img id="xp-view-btn" class="btn disab" src="images/table.png"
              title="View selected experiment">
+        <img id="xp-order-btn" class="btn enab" src="images/sel-order.png"
+             title="Specify ordering of selectors">
         <img id="xp-reset-btn" class="btn enab off" src="images/reset.png"
              title="Clear results for selected experiment">
         <img id="xp-delete-btn" class="btn disab" src="images/delete.png"
@@ -2429,6 +2433,24 @@ NOTE: * and ? will be interpreted as wildcards"
     </div>
   </div>
 
+  <!-- the SELECTOR ORDER dialog permits specifying how selectors should
+       be sorted. The selectors may contain a leading or trailing * as
+       wildcard, and can be separated by spacrs, comma's or semicolons.
+   -->
+  <div id="sel-order-modal" class="modal">
+    <div id="sel-order-dlg" class="inp-dlg">
+      <div class="dlg-title">
+        Ordering of selectors
+        <img class="ok-btn" src="images/ok.png">
+        <img class="cancel-btn" src="images/cancel.png">
+      </div>
+      <textarea id="sel-order-lines" autocomplete="off"
+         placeholder="Selectors must be separated by spaces or new lines."
+         autocorrect="off" autocapitalize="off" spellcheck="false">
+      </textarea>
+    </div>
+  </div>
+
   <!-- the PARAMETER dialog prompts for a dataset or chart name -->
   <div id="xp-parameter-modal" class="modal">
     <div id="xp-parameter-dlg" class="inp-dlg">

package/static/linny-r.css

@@ -2506,12 +2506,26 @@ td.equation-expression {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  font-family: monospace;
+  font-size: 12px;
 }
 
 td.equation-expression {
   min-width: 60%;
 }
 
+td.equation-expression-multi {
+  border-left: solid 1px Silver;
+  white-space: normal;
+  overflow-x: hidden;
+  overflow-y: auto;
+  text-overflow: ellipsis;
+  font-family: monospace;
+  font-size: 11px;
+  line-height: 13px;
+  max-height: 65px;
+}
+
 #dataset-blackbox {
   position: absolute;
   bottom: 6px;
@@ -4006,6 +4020,17 @@ div.no-colors {
   width: calc(100% - 6px);
 }
 
+#sel-order-dlg {
+  width: 220px;
+  height: min-content;
+}
+
+#sel-order-lines {
+  margin: 2px;
+  width: calc(100% - 4px);
+  height: 220px;
+}
+
 #xp-parameter-dlg {
   width: 270px;
   height: 45px;  

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

@@ -11,7 +11,7 @@ warning or information messages are displayed.
 */
 
 /*
-Copyright (c) 2017-2022 Delft University of Technology
+Copyright (c) 2017-2024 Delft University of Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -1025,7 +1025,12 @@ class GUIController extends Controller {
           ' as preferred solver');
       return;
     }
-    const pd = postData({action: 'change', solver: sid});
+    const pd = postData({
+        action: 'change',
+        solver: sid,
+        user: VM.solver_user,
+        token: VM.solver_token
+      });
     fetch('solver/', pd)
       .then((response) => {
           if(!response.ok) {

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

@@ -54,6 +54,9 @@ class EquationManager {
         'click', () => EQUATION_MANAGER.editEquation());
     document.getElementById('eq-delete-btn').addEventListener(
         'click', () => EQUATION_MANAGER.deleteEquation());
+    this.view_btn = document.getElementById('eq-view-btn');
+    this.view_btn.addEventListener(
+        'click', () => EQUATION_MANAGER.toggleMultiLineDisplay());
     this.outcome_btn = document.getElementById('equation-outcome');
     this.outcome_btn.addEventListener(
         'click', () => EQUATION_MANAGER.toggleOutcome());
@@ -78,6 +81,7 @@ class EquationManager {
         'click', () => EQUATION_MANAGER.clone_modal.hide());
 
     // Initialize the dialog properties
+    this.multi_line = false;
     this.reset();
   }
 
@@ -130,6 +134,19 @@ class EquationManager {
     }
   }
   
+  toggleMultiLineDisplay() {
+    // Toggle between single-line view and multi-line expressions.
+    this.multi_line = !this.multi_line;
+    if(this.multi_line) {
+      this.view_btn.src = 'images/zoom-out.png';
+      this.view_btn.title = 'Switch to single-line expression display';
+    } else {
+      this.view_btn.src = 'images/zoom-in.png';
+      this.view_btn.title = 'Switch to multi-line expression display';
+    }
+    this.updateDialog();
+  }
+  
   updateDialog() {
     // Updates equation list, highlighting selected equation (if any)
     const
@@ -148,10 +165,11 @@ class EquationManager {
           m = ed.modifiers[UI.nameToID(msl[i])],
           wild = (m.selector.indexOf('??') >= 0),
           method = m.selector.startsWith(':'),
+          multi = (this.multi_line ? '-multi' : ''),
           issue = (m.expression.compile_issue ? ' compile-issue' :
               (m.expression.compute_issue ? ' compute-issue' : '')),
           clk = '" onclick="EQUATION_MANAGER.selectModifier(event, \'' +
-              m.selector + '\'',
+              escapedSingleQuotes(m.selector) + '\'',
           mover = (method ? ' onmouseover="EQUATION_MANAGER.showInfo(\'' +
               m.identifier + '\', event.shiftKey);"' : '');
       if(m === sm) smid += i;
@@ -165,7 +183,7 @@ class EquationManager {
           (wild ? ' wildcard' : ''), clk, ', false);"', mover, '>',
           (m.outcome_equation ? '<span class="outcome"></span>' : ''),
           (wild ? wildcardFormat(m.selector) : m.selector),
-          '</td><td class="equation-expression', issue,
+          '</td><td class="equation-expression', multi, issue,
           (issue ? '"title="' +
               safeDoubleQuotes(m.expression.compile_issue ||
                   m.expression.compute_issue) : ''),

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

@@ -46,6 +46,9 @@ class GUIExperimentManager extends ExperimentManager {
     this.view_btn = document.getElementById('xp-view-btn');
     this.view_btn.addEventListener(
         'click', () => EXPERIMENT_MANAGER.viewerMode());
+    this.sel_order_btn = document.getElementById('xp-order-btn');
+    this.sel_order_btn.addEventListener(
+        'click', () => EXPERIMENT_MANAGER.showSelectorOrder());
     this.reset_btn = document.getElementById('xp-reset-btn');
     this.reset_btn.addEventListener(
         'click', () => EXPERIMENT_MANAGER.clearRunResults());
@@ -154,6 +157,13 @@ class GUIExperimentManager extends ExperimentManager {
     this.rename_modal.cancel.addEventListener(
         'click', () => EXPERIMENT_MANAGER.rename_modal.hide());
     
+    this.sel_order_modal = new ModalDialog('sel-order');
+    this.sel_order_modal.ok.addEventListener(
+        'click', () => EXPERIMENT_MANAGER.modifySelectorOrder());
+    this.sel_order_modal.cancel.addEventListener(
+        'click', () => EXPERIMENT_MANAGER.sel_order_modal.hide());
+    this.sel_order_lines = this.sel_order_modal.element('lines');
+
     this.parameter_modal = new ModalDialog('xp-parameter');
     this.parameter_modal.ok.addEventListener(
         'click', () => EXPERIMENT_MANAGER.addParameter());
@@ -473,9 +483,23 @@ class GUIExperimentManager extends ExperimentManager {
       }
     }
   }
+
+  showSelectorOrder() {
+    // Show selector order modal.
+    this.sel_order_lines.value = MODEL.selector_order_string;
+    this.sel_order_modal.show();
+  }
   
+  modifySelectorOrder() {
+    // Save text area contents as new selector order string.
+    MODEL.selector_order_string = this.sel_order_lines.value.trim();
+    MODEL.selector_order_list = MODEL.selector_order_string.trim().split(/\s+/);
+    this.sel_order_modal.hide();
+    UI.updateControllerDialogs('DX');
+  }
+
   designMode() {
-    // Switch to default view
+    // Switch to default view.
     this.viewer.style.display = 'none';
     this.design.style.display = 'block';
   }

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

@@ -380,7 +380,7 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
       }
       va.innerHTML = options.join('');
       // NOTE: Chart Manager variable dialog is 60px wider
-      va.style.width = (prefix ? 'calc(100% - 84px)' : 'calc(100% - 142px)');
+      va.style.width = (prefix ? 'calc(100% - 86px)' : 'calc(100% - 142px)');
       return;
     }
     // Add "empty" as first and initial option, as it denotes "use default"

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

@@ -333,7 +333,12 @@ class GUIFileManager {
           return response.text();
         })
       .then((data) => {
-          UI.postResponseOK(data);
+          if(!UI.postResponseOK(data) && data.indexOf('not implemented') >= 0) {
+            // Switch off auto-save when server does not implement it.
+            AUTO_SAVE.interval = 0;
+            AUTO_SAVE.not_implemented = true;
+            console.log('Auto-save disabled');
+          }
           bcl.remove('stay-activ');
         })
       .catch((err) => {

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

@@ -40,7 +40,7 @@ class Finder {
     this.dialog = UI.draggableDialog('finder');
     UI.resizableDialog('finder', 'FINDER');
     this.close_btn = document.getElementById('finder-close-btn');
-    // Make toolbar buttons responsive
+    // Make toolbar buttons responsive.
     this.close_btn.addEventListener('click', (e) => UI.toggleDialog(e));
     this.filter_input = document.getElementById('finder-filter-text');
     this.filter_input.addEventListener('input', () => FINDER.changeFilter());
@@ -78,6 +78,7 @@ class Finder {
     this.filtered_types.length = 0;
     this.selected_entity = null;
     this.filter_input.value = '';
+    this.filter_string = '';
     this.filter_pattern = null;
     this.entity_types = VM.entity_letters;
     this.find_links = true;
@@ -105,7 +106,7 @@ class Finder {
   }
   
   enterKey() {
-    // Open "edit properties" dialog for the selected entity
+    // Open "edit properties" dialog for the selected entity.
     const srl = this.entity_table.getElementsByClassName('sel-set');
     if(srl.length > 0) {
       const r = this.entity_table.rows[srl[0].rowIndex];
@@ -118,7 +119,7 @@ class Finder {
   }
   
   upDownKey(dir) {
-    // Select row above or below the selected one (if possible)
+    // Select row above or below the selected one (if possible).
     const srl = this.entity_table.getElementsByClassName('sel-set');
     if(srl.length > 0) {
       const r = this.entity_table.rows[srl[0].rowIndex + dir];
@@ -139,7 +140,7 @@ class Finder {
     let imgs = '';
     this.entities.length = 0;
     this.filtered_types.length = 0;
-    // No list unless a pattern OR a specified SUB-set of entity types
+    // No list unless a pattern OR a specified SUB-set of entity types.
     if(fp || et && et !== VM.entity_letters) {
       if(et.indexOf('A') >= 0) {
         imgs += '<img src="images/actor.png">';
@@ -151,7 +152,7 @@ class Finder {
           }
         }
       }
-      // NOTE: do not list black-boxed entities
+      // NOTE: Do not list black-boxed entities.
       if(et.indexOf('P') >= 0) {
         imgs += '<img src="images/process.png">';
         for(let k in MODEL.processes) if(MODEL.processes.hasOwnProperty(k)) {
@@ -191,7 +192,7 @@ class Finder {
           const ds = MODEL.datasets[k];
           if(!k.startsWith(UI.BLACK_BOX) && (!fp || patternMatch(
               ds.displayName, this.filter_pattern))) {
-            // NOTE: do not list the equations dataset
+            // NOTE: Do not list the equations dataset.
             if(ds !== MODEL.equations_dataset) {
               enl.push(k);
               this.entities.push(MODEL.datasets[k]);
@@ -217,11 +218,11 @@ class Finder {
       if(et.indexOf('L') >= 0) {
         imgs += '<img src="images/link.png">';
         for(let k in MODEL.links) if(MODEL.links.hasOwnProperty(k)) {
-          // NOTE: "black-boxed" link identifiers are not prefixed => other test
+          // NOTE: "black-boxed" link identifiers are not prefixed => other test.
           const
               l = MODEL.links[k],
               ldn = l.displayName,
-              // A links is "black-boxed" when BOTH nodes are "black-boxed"
+              // A link is "black-boxed" when BOTH nodes are "black-boxed".
               bb = ldn.split(UI.BLACK_BOX).length > 2;
           if(!bb && (!fp || patternMatch(ldn, this.filter_pattern))) {
             enl.push(k);
@@ -233,7 +234,7 @@ class Finder {
       if(et.indexOf('B') >= 0) {
         imgs += '<img src="images/constraint.png">';
         for(let k in MODEL.constraints) {
-          // NOTE: likewise, constraint identifiers can be prefixed by %
+          // NOTE: Likewise, constraint identifiers can be prefixed by %.
           if(MODEL.constraints.hasOwnProperty(k)) {
             if(!k.startsWith(UI.BLACK_BOX) && (!fp || patternMatch(
                 MODEL.constraints[k].displayName, this.filter_pattern))) {
@@ -244,6 +245,35 @@ class Finder {
           }
         }
       }
+      // Also allow search for scale unit names.
+      if(et.indexOf('U') >= 0) {
+        imgs += '<img src="images/scale.png">';
+        for(let k in MODEL.products) if(MODEL.products.hasOwnProperty(k)) {
+          if(fp && !k.startsWith(UI.BLACK_BOX) && patternMatch(
+              MODEL.products[k].scale_unit, this.filter_pattern)) {
+            enl.push(k);
+            this.entities.push(MODEL.products[k]);
+            addDistinct('Q', this.filtered_types);
+          }
+        }
+      }
+      // Also allow search for link multiplier symbols.
+      if(et.indexOf('M') >= 0) {
+        if(imgs.indexOf('/link.') < 0) imgs += '<img src="images/link.png">';
+        for(let k in MODEL.links) if(MODEL.links.hasOwnProperty(k)) {
+          // NOTE: "black-boxed" link identifiers are not prefixed => other test.
+          const
+              l = MODEL.links[k],
+              m = VM.LM_LETTERS.charAt(l.multiplier),
+              // A link is "black-boxed" when BOTH nodes are "black-boxed".
+              bb = l.displayName.split(UI.BLACK_BOX).length > 2;
+          if(fp && !bb && this.filter_string.indexOf(m) >= 0) {
+            enl.push(k);
+            this.entities.push(l);
+            addDistinct('L', this.filtered_types);
+          }
+        }
+      }
       enl.sort((a, b) => UI.compareFullNames(a, b, true));
     }
     document.getElementById('finder-entity-imgs').innerHTML = imgs;
@@ -259,7 +289,7 @@ class Finder {
           e.type.toLowerCase(), '.png">', e.displayName,
           '</td></tr>'].join(''));
     }
-    // NOTE: reset `selected_entity` if not in the new list
+    // NOTE: Reset `selected_entity` if not in the new list.
     if(seid === 'etr') this.selected_entity = null;
     this.entity_table.innerHTML = el.join('');
     UI.scrollIntoView(document.getElementById(seid));
@@ -316,18 +346,18 @@ class Finder {
     let hdr = '(no entity selected)';
     if(se) {
       hdr = `<em>${se.type}:</em> <strong>${se.displayName}</strong>`;
-      // Make occurrence list
+      // Make occurrence list.
       if(se instanceof Process || se instanceof Cluster) {
-        // Processes and clusters "occur" in their parent cluster
+        // Processes and clusters "occur" in their parent cluster.
         if(se.cluster) occ.push(se.cluster.identifier);
       } else if(se instanceof Product) {
-        // Products "occur" in clusters where they have a position
+        // Products "occur" in clusters where they have a position.
         const cl = se.productPositionClusters;
         for(let i = 0; i < cl.length; i++) {
           occ.push(cl[i].identifier);
         }
       } else if(se instanceof Actor) {
-        // Actors "occur" in clusters where they "own" processes or clusters
+        // Actors "occur" in clusters where they "own" processes or clusters.
         for(let k in MODEL.processes) if(MODEL.processes.hasOwnProperty(k)) {
           const p = MODEL.processes[k];
           if(p.actor === se) occ.push(p.identifier);
@@ -337,13 +367,13 @@ class Finder {
           if(c.actor === se) occ.push(c.identifier);
         }
       } else if(se instanceof Link || se instanceof Constraint) {
-        // Links and constraints "occur" in their "best" parent cluster
+        // Links and constraints "occur" in their "best" parent cluster.
         const c = MODEL.inferParentCluster(se);
         if(c) occ.push(c.identifier);
       }
-      // NOTE: no "occurrence" of datasets or equations
+      // NOTE: No "occurrence" of datasets or equations.
       // @@TO DO: identify MODULES (?)
-      // All entities can also occur as chart variables
+      // All entities can also occur as chart variables.
       for(let j = 0; j < MODEL.charts.length; j++) {
         const c = MODEL.charts[j];
         for(let k = 0; k < c.variables.length; k++) {
@@ -355,12 +385,12 @@ class Finder {
           }
         }
       }
-      // Now also look for occurrences of entity references in expressions
+      // Now also look for occurrences of entity references in expressions.
       const
           raw = escapeRegex(se.displayName),
           re = new RegExp(
               '\\[\\s*!?' + raw.replace(/\s+/g, '\\s+') + '\\s*[\\|\\@\\]]');
-      // Check actor weight expressions
+      // Check actor weight expressions.
       for(let k in MODEL.actors) if(MODEL.actors.hasOwnProperty(k)) {
         const a = MODEL.actors[k];
         if(re.test(a.weight.text)) {
@@ -368,7 +398,7 @@ class Finder {
           xol.push(a.identifier);
         }
       }
-      // Check all process attribute expressions
+      // Check all process attribute expressions.
       for(let k in MODEL.processes) if(MODEL.processes.hasOwnProperty(k)) {
         const p = MODEL.processes[k];
         if(re.test(p.lower_bound.text)) {
@@ -384,7 +414,7 @@ class Finder {
           xol.push(p.identifier);
         }
       }
-      // Check all product attribute expressions
+      // Check all product attribute expressions.
       for(let k in MODEL.products) if(MODEL.products.hasOwnProperty(k)) {
         const p = MODEL.products[k];
         if(re.test(p.lower_bound.text)) {
@@ -404,7 +434,7 @@ class Finder {
           xol.push(p.identifier);
         }
       }
-      // Check all notes in clusters for their color expressions and field
+      // Check all notes in clusters for their color expressions and field.
       for(let k in MODEL.clusters) if(MODEL.clusters.hasOwnProperty(k)) {
         const c = MODEL.clusters[k];
         for(let i = 0; i < c.notes.length; i++) {
@@ -416,7 +446,7 @@ class Finder {
           }
         }
       }
-      // Check all link rate expressions
+      // Check all link rate expressions.
       for(let k in MODEL.links) if(MODEL.links.hasOwnProperty(k)) {
         const l = MODEL.links[k];
         if(re.test(l.relative_rate.text)) {
@@ -428,7 +458,7 @@ class Finder {
           xol.push(l.identifier);
         }
       }
-      // Check all dataset modifier expressions
+      // Check all dataset modifier expressions.
       for(let k in MODEL.datasets) if(MODEL.datasets.hasOwnProperty(k)) {
         const ds = MODEL.datasets[k];
         for(let m in ds.modifiers) if(ds.modifiers.hasOwnProperty(m)) {
@@ -451,22 +481,22 @@ class Finder {
           '</td></tr>'].join(''));
     }
     this.item_table.innerHTML = el.join('');
-    // Clear the table row list
+    // Clear the table row list.
     el.length = 0;
-    // Now fill it with entity+attribute having a matching expression
+    // Now fill it with entity+attribute having a matching expression.
     for(let i = 0; i < xal.length; i++) {
       const
           id = xol[i],
           e = MODEL.objectByID(id),
           attr = (e instanceof Note ? '' : xal[i]);
       let img = e.type.toLowerCase(),
-          // NOTE: a small left-pointing triangle denotes that the right-hand
-          // part has the left hand part as its attribute
+          // NOTE: A small left-pointing triangle denotes that the right-hand
+          // part has the left hand part as its attribute.
           cs = '',
           td = attr + '</td><td>&#x25C2;</td><td style="width:95%">' +
               e.displayName;
-      // NOTE: equations may have LONG names while the equations dataset name
-      // is irrelevant, hence use 3 columns (no triangle)
+      // NOTE: Equations may have LONG names while the equations dataset
+      // name is irrelevant, hence use 3 columns (no triangle).
       if(e === MODEL.equations_dataset) {
         img = 'equation';
         cs = ' colspan="3"';
@@ -484,7 +514,7 @@ class Finder {
   }
   
   drag(ev) {
-    // Start dragging the selected entity
+    // Start dragging the selected entity.
     let t = ev.target;
     while(t && t.nodeName !== 'TD') t = t.parentNode;
     ev.dataTransfer.setData('text', MODEL.objectByName(t.innerText).identifier);
@@ -493,30 +523,31 @@ class Finder {
   
   changeFilter() {
     // Filter expression can start with 1+ entity letters plus `?` to
-    // look only for the entity types denoted by these letters
+    // look only for the entity types denoted by these letters.
     let ft = this.filter_input.value,
         et = VM.entity_letters;
-    if(/^(\*|[ABCDELPQ]+)\?/i.test(ft)) {
+    if(/^(\*|U|M|[ABCDELPQ]+)\?/i.test(ft)) {
       ft = ft.split('?');
-      // NOTE: *? denotes "all entity types except constraints"
+      // NOTE: *? denotes "all entity types except constraints".
       et = (ft[0] === '*' ? 'ACDELPQ' : ft[0].toUpperCase());
       ft = ft.slice(1).join('=');
     }
+    this.filter_string = ft;
     this.filter_pattern = patternList(ft);
     this.entity_types = et;
     this.updateDialog();
   }
   
   showInfo(id, shift) {
-    // Displays documentation for the entity identified by `id`
+    // Display documentation for the entity identified by `id`.
     const e = MODEL.objectByID(id);
     if(e) DOCUMENTATION_MANAGER.update(e, shift);
   }
   
   selectEntity(id, alt=false) {
-    // Looks up entity, selects it in the left pane, and updates the
-    // right pane; opens the "edit properties" modal dialog on double-click
-    // and Alt-click if the entity is editable
+    // Look up entity, select it in the left pane, and update the right
+    // pane. Open the "edit properties" modal dialog on double-click
+    // and Alt-click if the entity is editable.
     const obj = MODEL.objectByID(id);
     this.selected_entity = obj;
     this.updateDialog();
@@ -551,7 +582,7 @@ class Finder {
   }
   
   reveal(id) {
-    // Shows selected occurrence
+    // Show selected occurrence.
     const
         se = this.selected_entity,
         obj = (se ? MODEL.objectByID(id) : null);
@@ -559,7 +590,7 @@ class Finder {
     // If cluster, make it focal...
     if(obj instanceof Cluster) {
       UI.makeFocalCluster(obj);
-      // ... and select the entity unless it is an actor or dataset
+      // ... and select the entity unless it is an actor or dataset.
       if(!(se instanceof Actor || se instanceof Dataset)) {
         MODEL.select(se);
         if(se instanceof Link || se instanceof Constraint) {
@@ -572,7 +603,7 @@ class Finder {
     } else if(obj instanceof Process || obj instanceof Note) {
       // If occurrence is a process or a note, then make its cluster focal...
       UI.makeFocalCluster(obj.cluster);
-      // ... and select it
+      // ... and select it.
       MODEL.select(obj);
       UI.scrollIntoView(obj.shape.element.childNodes[0]);
     } else if(obj instanceof Product) {
@@ -586,7 +617,7 @@ class Finder {
         if(a) UI.scrollIntoView(a.shape.element.childNodes[0]);
       }
     } else if(obj instanceof Chart) {
-      // If occurrence is a chart, select and show it in the chart manager
+      // If occurrence is a chart, select and show it in the chart manager.
       CHART_MANAGER.chart_index = MODEL.charts.indexOf(obj);
       if(CHART_MANAGER.chart_index >= 0) {
         if(UI.hidden('chart-dlg')) {
@@ -595,7 +626,7 @@ class Finder {
       }
       CHART_MANAGER.updateDialog();
     }
-    // NOTE: return the object to save a second lookup by revealExpression
+    // NOTE: Return the object to save a second lookup by revealExpression.
     return obj;
   }
   

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

@@ -41,6 +41,7 @@ class ModelAutoSaver {
     this.timeout_id = 0;
     this.interval = 10; // auto-save every 10 minutes
     this.period = 24; // delete models older than 24 hours
+    this.not_implemented = false;
     this.model_list = [];
     // Overwite defaults if settings still in local storage of browser.
     this.getSettings();
@@ -65,6 +66,7 @@ class ModelAutoSaver {
   
   getSettings() {
     // Reads custom auto-save settings from local storage.
+    if(this.not_implemented) return;
     try {
       const item = window.localStorage.getItem('Linny-R-autosave');
       if(item) {
@@ -86,6 +88,7 @@ class ModelAutoSaver {
   
   setSettings() {
     // Writes custom auto-save settings to local storage.
+    if(this.not_implemented) return;
     try {
       window.localStorage.setItem('Linny-R-autosave',
           this.interval + '|' + this.period);
@@ -199,7 +202,7 @@ class ModelAutoSaver {
     // Close the restore auto-save model dialog.
     document.getElementById('confirm-remove-models').style.display = 'none';
     // NOTE: Cancel button or ESC will pass `cancel` as FALSE => do not save.
-    if(!save) {
+    if(!save || this.not_implemented) {
       document.getElementById('restore-modal').style.display = 'none';
       return;
     }

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

@@ -326,6 +326,7 @@ class GUIMonitor {
           } else if(jsr.server) {
             VM.solver_token = jsr.token;
             VM.selectSolver(jsr.solver);
+            VM.solver_list = jsr.solver_list;
             // Remote solver may indicate user-specific solver time limit.
             let utl = '';
             if(jsr.time_limit) {

package/static/scripts/linny-r-gui-repository-browser.js

@@ -368,7 +368,7 @@ class GUIRepositoryBrowser extends RepositoryBrowser {
   }
   
   addRepository(name) {
-    // Adds repository if name is unique and valid
+    // Adds repository if name is unique and valid.
     let r = null,
         can_store = false;
     if(name.endsWith('+')) {
@@ -389,8 +389,8 @@ class GUIRepositoryBrowser extends RepositoryBrowser {
   }
   
   removeRepository() {
-    // Removes selected repository from list
-    // NOTE: do not remove the first item (local host)
+    // Removes selected repository from list.
+    // NOTE: Do not remove the first item (local host).
     if(this.repository_index < 1) return;
     fetch('repo/', postData({
           action: 'remove',
@@ -415,7 +415,8 @@ class GUIRepositoryBrowser extends RepositoryBrowser {
   }
   
   promptForRepository() {
-    // Opens "Add repository" dialog
+    // Open "Add repository" dialog (only on local host).
+    if(!this.isLocalHost) return;
     this.add_modal.element('name').value = '';
     this.add_modal.element('url').value = '';
     this.add_modal.element('token').value = '';
@@ -423,7 +424,7 @@ class GUIRepositoryBrowser extends RepositoryBrowser {
   }
 
   registerRepository() {
-    // Checks whether URL defines a Linny-R repository, and if so, adds it
+    // Check whether URL defines a Linny-R repository, and if so, add it.
     fetch('repo/', postData({
           action: 'add',
           repo: this.add_modal.element('name').value,

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

@@ -341,7 +341,7 @@ module.exports = class MILPSolver {
           'write problem', s.solver_model,
           'set limit time %T%',
           'set numerics feastol %I%',
-          // NOTE: MIP gap setting for SCIP is unclear, hence ignored.
+          'set limit gap %M%',
           'optimize',
           'write solution', s.solution,
           'quit'
@@ -392,6 +392,7 @@ module.exports = class MILPSolver {
       s.args = [
           '-timeout %T%',
           '-v4',
+          '-ac 5e-6',
           '-e %I%',
           '-gr %M%',
           '-epsel 1e-7',
@@ -838,14 +839,13 @@ module.exports = class MILPSolver {
         }
       }
       if(solved) {
-        // Look for line with first variable.
-        let i = 0;
-        while(i < output.length && !output[i].startsWith('X')) i++;
+        // Line 0 holds solution status, line 1 the objective value,
+        // and lines 2+ the variables.
+        result.obj = parseFloat(output[1].split(':')[1]);
         // Fill dictionary with variable name: value entries .
-        while(i < output.length) {
+        for(let i = 2; i < output.length; i++) {
           const v = output[i].split(/\s+/);
           x_dict[v[0]] = parseFloat(v[1]);
-          i++;
         }
         // Fill the solution vector, adding 0 for missing columns.
         getValuesFromDict();
@@ -873,6 +873,8 @@ module.exports = class MILPSolver {
       }
       result.messages = msgs;
       if(solved) {
+        // Get value of objective function
+        result.obj = parseFloat(output[i].split(':')[1]);
         // Look for line with first variable.
         while(i < output.length && !output[i].startsWith('X')) i++;
         // Fill dictionary with variable name: value entries.

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

@@ -70,6 +70,8 @@ class LinnyRModel {
     this.charts = [];
     this.experiments = [];
     this.dimensions = [];
+    this.selector_order_string = '';
+    this.selector_order_list = [];
     this.next_process_number = 0;
     this.next_product_number = 0;
     this.focal_cluster = null;
@@ -104,7 +106,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;
+    this.always_diagnose = true;
 
     // Sensitivity-related properties
     this.base_case_selectors = '';
@@ -2905,6 +2907,10 @@ class LinnyRModel {
         }
       }
     }
+    // Infer selector order list by splitting text on any white space.
+    this.selector_order_string = xmlDecoded(nodeContentByTag(node,
+        'selector-order'));
+    this.selector_order_list = this.selector_order_string.trim().split(/\s+/);
     // Infer dimensions of experimental design space
     this.inferDimensions();
     // NOTE: when including a model, IGNORE sensitivity analysis, experiments
@@ -3074,8 +3080,11 @@ class LinnyRModel {
       if(this.datasets.hasOwnProperty(obj)) xml += this.datasets[obj].asXML;
     }
     xml += '</datasets><charts>';
-      for(let i = 0; i < this.charts.length; i++) xml += this.charts[i].asXML;
-      xml += '</charts>';
+    for(let i = 0; i < this.charts.length; i++) {
+      xml += this.charts[i].asXML;
+    }
+    xml += '</charts><selector-order>' +
+        xmlEncoded(this.selector_order_string) + '</selector-order>';
     // NOTE: when "black-boxing", SA and experiments are not stored 
     if(!this.black_box) {
       xml += '<base-case-selectors>' +
@@ -7943,54 +7952,59 @@ class Product extends Node {
   }
 
   get isSinkNode() {
-    // Returns TRUE if this product behaves as a sink
+    // Return TRUE if this product behaves as a sink.
     return (this.is_sink || this.allOutputsAreData) &&
       !(this.upper_bound.defined ||
-        // NOTE: UB may be set by equalling it to LB
+        // NOTE: UB may be set by equalling it to LB.
         (this.equal_bounds && this.lower_bound.defined));
   }
   
   highestUpperBound(visited) {
-    // Infers the upper bound for this product from its own UB, or from its
-    // ingoing links (type, rate, and UB of their from nodes)
-    // NOTE: this is used while compiling the VM instructions that compute the
-    // ON/OFF binary variable for this product
-    // NOTE: this method performs a graph traversal. If this product is part
-    // of a cycle in the graph, its highest UB co-depends on its own, which
-    // is not constrained, so return +INF
-    // NOTE: no need to check for sink nodes, as even on those nodes a max. UB
-    // might be inferred from their max. inflows
+    // Infer the upper bound for this product from its own UB, or from
+    // its ingoing links (type, rate, and UB of their from nodes).
+    // This is used while compiling the VM instructions that compute the
+    // ON/OFF binary variable for this product.
+    // This method performs a graph traversal. If this product is part
+    // of a cycle in the graph, its highest UB co-depends on its own UB,
+    // which is not constrained, so then return +INF.
+    // No need to check for sink nodes, as even on those nodes a max. UB
+    // might be inferred from their max. inflows.
     if(visited.indexOf(this) >= 0) return VM.PLUS_INFINITY;
     let ub = (this.equal_bounds ? this.lower_bound : this.upper_bound);
-    // If an expression, return +INF to signal "no lower UB can be inferred"
+    // If dynamic expression, return +INF to signal "no lower UB can be inferred".
     if(ub.defined && !ub.isStatic) return VM.PLUS_INFINITY;
-    // If static, use its value as initial highest value
-    const max_ub = ub.result(0);
-    // See if the sum of its max. inflows will be lower than this value
+    // If static, use its value as initial highest value.
+    const max_ub = (ub.defined ? ub.result(0) : VM.PLUS_INFINITY);
+    // See if the sum of its max. inflows will be lower than this value.
     let sum = 0;
-    // Preclude infinite recursion
+    // Preclude infinite recursion.
     visited.push(this);
     for(let i = 0; i < this.inputs.length; i++) {
       const
           l = this.inputs[i],
           r = l.relative_rate,
           fn = l.from_node;
-      // Dynamic rate => inflows cannot constrain the UB any further
+      // Dynamic rate => inflows cannot constrain the UB any further.
       if(!r.isStatic) return max_ub;
+      let rate = r.result(0);
       if([VM.LM_STARTUP, VM.LM_POSITIVE, VM.LM_ZERO, VM.LM_FIRST_COMMIT,
             VM.LM_SHUTDOWN].indexOf(l.multiplier) >= 0) {
-        // For binary multipliers, the rate is the highest possible flow
-        // NOTE: do not add negative flows, as actual flow may be 0
-        sum += Math.max(0, r.result(0));
+        // For binary multipliers, the rate is the highest possible flow.
+        // NOTE: Do not add negative flows, as actual flow may be 0.
+        sum += Math.max(0, rate);
       } else {
-        // For other multipliers, max flow = rate * UB of the FROM node
-        // (for products, this will recurse; processes return their UB)
+        // For other multipliers, max flow = rate * UB of the FROM node.
+        // For products, this will recurse; processes return their UB.
         let fnub = fn.highestUpperBound(visited);
         // If +INF, no lower UB can be inferred => return initial maximum
         if(fnub >= VM.PLUS_INFINITY) return max_ub;
-        // Otherwise, add rate * UB to the max. total inflow
-        // NOTE: do not add negative flows, as actual flow may be 0
-        sum += Math.max(0, r.result(0) * fnub);
+        // Otherwise, add rate * UB to the max. total inflow.
+        // NOTE: For SUM multipliers, also consider the delay.
+        if(l.multiplier === VM.LM_SUM) {
+          rate *= Math.max(1, l.flow_delay.result(0));
+        }
+        // NOTE: Do not add negative flows, as actual flow may be 0.
+        sum += Math.max(0, rate * fnub);
       }
     }
     // Return the sum of max. inflows as the lowest max. UB, or the initial

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

@@ -492,7 +492,7 @@ function matchingNumber(m, s) {
   // (where asterisks match 0 or more characters, and question marks 1
   // character) and the matching parts jointly denote an integer.
   // NOTE: A "+" must be escaped, "*" and "?" must become groups.
-  let raw = s.replaceAll('+', '\+')
+  let raw = s.replaceAll('+', '\\+')
           .replace(/\*/g, '(.*)').replace(/\?/g, '(.)'),
       match = m.match(new RegExp(`^${raw}$`)),
       n = '';
@@ -534,9 +534,21 @@ function compareSelectors(s1, s2) {
   // Dataset selectors comparison is case-insensitive, and puts wildcards
   // last, where * comes later than ?, and leading colons come AFTER
   // regular selector names.
-  // NOTE: Without wildcards, strings that are identical except for the
-  // digits they *end* on are sorted on this "end number" (so abc12 > abc2).
-  // NOTE: This also applies to percentages ("end number"+ %).
+  // NOTES:
+  // (1) Without wildcards, strings that are identical except for
+  //     the digits they *end* on are sorted on this "end number"
+  //     (so abc12 > abc2).
+  // (2) This also applies to percentages ("end number"+ %).
+  // (3) As of version 1.9.0, the order of selectors can be (partially)
+  //     specified by the modeler.
+  if(MODEL) {
+    const
+        i1 = MODEL.selector_order_list.indexOf(s1),
+        i2 = MODEL.selector_order_list.indexOf(s2);
+    // BOTH selectors must be in the list, or regular sorting order is
+    // applied.
+    if(i1 >= 0 && i2 >= 0) return i1 - i2;
+  }
   if(s1 === s2) return 0;
   if(s1 === '*') return 1;
   if(s2 === '*') return -1;
@@ -580,22 +592,36 @@ function compareSelectors(s1, s2) {
   // by as many spaces (ASCII 32) and add a '!' (ASCII 33). This will then
   // "sorts things out".
   let n = s_1.length,
-      i = n - 1;
+      i = n - 1,
+      plusmin = false;
   while(i >= 0 && s_1[i] === '-') i--;
-  // If trailing minuses, replace by as many spaces and add an exclamation point
+  // If trailing minuses, replace by as many spaces and add an exclamation
+  // point.
   if(i < n - 1) {
-    s_1 = s_1.substring(0, i);
+    s_1 = s_1.substring(0, i + 1);
+    // NOTE: Consider X- as lower than just X.
+    if(s_1 === s_2) return -1;
     while(s_1.length < n) s_1 += ' ';
     s_1 += '!';
+    plusmin = true;
   }
-  // Do the same for the second "normalized" selector
+  // Do the same for the second "normalized" selector.
   n = s_2.length;
   i = n - 1;
   while(i >= 0 && s_2[i] === '-') i--;
   if(i < n - 1) {
-    s_2 = s_2.substring(0, i);
+    s_2 = s_2.substring(0, i + 1);
+    // NOTE: Consider X as higher than X-.
+    if(s_2 === s_1) return 1;
     while(s_2.length < n) s_2 += ' ';
     s_2 += '!';
+    plusmin = true;
+  }
+  if(plusmin) {
+    // As X0 typically denotes "base case", replace a trailing zero by
+    // ")" to ensure that X- < X0 < X+.
+    s_1.replace(/([^0])0$/, '$1)');
+    s_2.replace(/([^0])0$/, '$1)');
   }
   // Now compare the two "normalized" selectors
   if(s_1 < s_2) return -1;

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

@@ -317,6 +317,7 @@ class Expression {
     if((typeof number !== 'number' ||
         (this.isStatic && !this.isWildcardExpression)) &&
         !this.isMethod) return this.vector;
+//console.log('HERE choosing wcnr', number, this);
     // Method expressions are not "numbered" but differentiate by the
     // entity to which they are applied. Their "vector number" is then
     // inferred by looking up this entity in a method object list.
@@ -331,7 +332,9 @@ class Expression {
     }
     // Use the vector for the wildcard number (create it if necessary).
     if(!this.wildcard_vectors.hasOwnProperty(number)) {
+//console.log('HERE adding wc vector', number, this);
       this.wildcard_vectors[number] = [];
+//console.log('HERE adding wc vector', number, this.wildcard_vectors);
       if(this.isStatic) {
         this.wildcard_vectors[number][0] = VM.NOT_COMPUTED;
       } else {
@@ -2136,8 +2139,8 @@ class VirtualMachine {
     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;
+    // (relatively) low value 9.999999999e+9 is used.
+    this.DIAGNOSIS_UPPER_BOUND = 9.999999999e+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;
@@ -2149,7 +2152,8 @@ class VirtualMachine {
     // their target without displaying them in red or blue to signal
     // shortage or surplus.
     this.SIG_DIF_LIMIT = 0.001;
-    this.SIG_DIF_FROM_ZERO = 1e-6;
+    // Numbers near zero are displayed as +0 or -0.
+    this.SIG_DIF_FROM_ZERO = 5e-5;
     // ON/OFF threshold is used to differentiate between level = 0 and
     // still "ON" (will be displayed as +0).
     this.ON_OFF_THRESHOLD = 1.5e-4;
@@ -2194,6 +2198,7 @@ class VirtualMachine {
     this.LM_NEEDING_ON_OFF = [5, 6, 7, 8, 9, 10];
     this.LM_SYMBOLS = ['', '\u21C9', '\u0394', '\u03A3', '\u03BC', '\u25B2',
         '+', '0', '\u2934', '\u2732', '\u25BC', '\u2A39'];
+    this.LM_LETTERS = ' TDSMU+0RFDP';
     
     // VM max. expression stack size.
     this.MAX_STACK = 200;
@@ -2537,7 +2542,7 @@ class VirtualMachine {
     if(sv[0]) return sv[1];
     const a = Math.abs(n);
     // Signal small differences from true 0 by leading + or - sign.
-    if(n !== 0 && a < 0.0005) return n > 0 ? '+0' : '-0';
+    if(n !== 0 && a <= this.ON_OFF_THRESHOLD) return n > 0 ? '+0' : '-0';
     if(a >= 999999.5) return n.toPrecision(2);
     if(Math.abs(a-Math.round(a)) < 0.05) return Math.round(n);
     if(a < 1) return Math.round(n*100) / 100;
@@ -2556,7 +2561,7 @@ class VirtualMachine {
     if(sv[0]) return sv[1];
     const a = Math.abs(n);
     // Signal small differences from true 0 by a leading + or - sign.
-    if(n !== 0 && a < 0.0005) return n > 0 ? '+0' : '-0';
+    if(n !== 0 && a <= this.ON_OFF_THRESHOLD) return n > 0 ? '+0' : '-0';
     if(a >= 9999995) return n.toPrecision(4);
     if(Math.abs(a-Math.round(a)) < 0.0005) return Math.round(n);
     if(a < 1) return Math.round(n*10000) / 10000;
@@ -2922,19 +2927,20 @@ class VirtualMachine {
       for(let i = 2; i <= n; i++) {
         this.variables.push(['W' + i, obj]);
       }
-      // NOTE: Some solvers do not support SOS. To ensure that only 2
-      // adjacent w[i]-variables are non-zero (they range from 0 to 1),
-      // as many binary variables b[i] must be defined, and additional
-      // constraints must be added (see function VMI_add_boundline).
-      // NOTE: These additional variables and constraints are not needed
-      // when a bound line defines a convex feasible area.
-      const sos_with_bin = this.noSupportForSOS && !obj.needsNoSOS;
-      this.sos_var_indices.push([index, n, sos_with_bin]);
-      if(sos_with_bin) {
-        for(let i = 1; i <= n; i++) {
-          const bi = this.variables.push(['b' + i, obj]);
-          this.bin_var_indices[bi] = true;
-        }        
+      // NOTE: SOS constraints are not needed when a bound line defines
+      // a convex feasible area.
+      if(!obj.needsNoSOS) {
+        this.sos_var_indices.push([index, n]);
+        // NOTE: Some solvers do not support SOS. To ensure that only 2
+        // adjacent w[i]-variables are non-zero (they range from 0 to 1),
+        // as many binary variables b[i] must be defined, and additional
+        // constraints must be added (see VMI_add_bound_line_constraint).
+        if(this.noSupportForSOS) {
+          for(let i = 1; i <= n; i++) {
+            const bi = this.variables.push(['b' + i, obj]);
+            this.bin_var_indices[bi] = true;
+          }        
+        }
       }
     }
     return index;
@@ -4044,7 +4050,7 @@ class VirtualMachine {
        these variables can take on higher values. The modeler must ensure
        that there is a cost associated with the actual flow, not a revenue.
     */
-    // NOTE: as of 20 June 2021, binary attributes of products are also computed
+    // NOTE: As of 20 June 2021, binary attributes of products are also computed.
     const pp_nodes = [];
     for(i = 0; i < process_keys.length; i++) {
       k = process_keys[i];
@@ -4093,8 +4099,8 @@ class VirtualMachine {
           [VMI_add_const_to_coefficient, [p.level_var_index, 1]]
         );
         if(ubx.isStatic) {
-          // If UB is very high (typically: undefined, so +INF), try to infer
-          // a lower value for UB to use for the ON/OFF binary
+          // If UB is very high (typically: undefined, so +INF), try to
+          // infer a lower value for UB to use for the ON/OFF binary.
           let ub = ubx.result(0),
               hub = ub;
           if(ub > VM.MEGA_UPPER_BOUND) {
@@ -4642,7 +4648,7 @@ class VirtualMachine {
               if(v[1] instanceof BoundLine) {
                 v[1].constraint.slack_info[b] = v[0];
               }
-              if(b <= this.nr_of_time_steps && absl > VM.SIG_DIF_FROM_ZERO) {
+              if(b <= this.nr_of_time_steps && absl > VM.ON_OFF_THRESHOLD) {
                 this.logMessage(block, `${this.WARNING}(t=${b}${round}) ` +
                     `${v[1].displayName} ${v[0]} slack = ${this.sig4Dig(slack)}`);
                 if(v[1] instanceof Product) {
@@ -4652,9 +4658,9 @@ class VirtualMachine {
                   }
                 }
               } else if(CONFIGURATION.slight_slack_notices) {
-                this.logMessage(block, '-- Notice: (t=' + b + round + ') ' +
+                this.logMessage(block, '---- Notice: (t=' + b + round + ') ' +
                    v[1].displayName + ' ' + v[0] + ' slack = ' +
-                   slack.toPrecision(2));
+                   slack.toPrecision(1));
               }
             }
           }
@@ -5410,7 +5416,7 @@ class VirtualMachine {
     this.numeric_issue = '';
     // First add the objective (always MAXimize).
     if(cplex) {
-      this.lines = 'Maximize\n';
+      this.lines = `\\${this.solver_id}\nMaximize\n`;
     } else {
       this.lines = '/* Objective function */\nmax:\n';
     }
@@ -5461,6 +5467,12 @@ class VirtualMachine {
         }
       }
       c = this.right_hand_side[r];
+      // NOTE: When previous block was infeasible or unbounded (no solution),
+      // expressions for RHS may not evaluate as a number.
+      if(Number.isNaN(c)) {
+        this.setNumericIssue(c, r, 'constraint RHS');
+        c = 0;
+      }
       this.lines += line + ' ' +
           this.constraint_symbols[this.constraint_types[r]] + ' ' + c + EOL;
       line = '';
@@ -5507,8 +5519,14 @@ class VirtualMachine {
           }
         } else {
           // Bounds can be specified on a single line: lb <= X001 <= ub.
-          if(lb !== null && lb !== 0) line = lb + ' <= ' + line;
-          if(ub !== null) line += ' <= ' + ub;
+          // NOTE: LP_solve has Infinity value 1e+25. Use this literal
+          // because VM.PLUS_INFINITY may be set to *diagnostic* value.
+          if(lb !== null && lb !== 0 && lb > -1e+25) {
+            line = lb + ' <= ' + line;
+          }
+          if(ub !== null && ub < 1e+25) line += ' <= ' + ub;
+          // NOTE: Do not add line if both bounds are infinite.
+          if(line.indexOf('<=') < 0) line = '';
         }
       }
       if(line) this.lines += line + EOL;
@@ -5568,19 +5586,17 @@ class VirtualMachine {
       // NOTE: Add SOS section only if the solver supports SOS.
       if(this.sos_var_indices.length > 0 && !this.noSupportForSOS) {
         this.lines += 'SOS\n';
-        let sos = 0;
         const v_set = [];
         for(let j = 0; j < abl; j++) {
           for(let i = 0; i < this.sos_var_indices.length; i++) {
+            const svi = this.sos_var_indices[i];
             v_set.length = 0;
-            let vi = this.sos_var_indices[i][0] + j * this.cols;
-            const n = this.sos_var_indices[i][1];
-            for(let j = 1; j <= n; j++)  {
+            let vi = svi[0] + j * this.cols;
+            for(let j = 1; j <= svi[1]; j++)  {
               v_set.push(`${vbl(vi)}:${j}`);
               vi++;
             }
-            this.lines += ` s${sos}: S2:: ${v_set.join(' ')}\n`;
-            sos++;
+            this.lines += ` s${i}: S2:: ${v_set.join(' ')}\n`;
           }
         }
       }
@@ -5605,18 +5621,16 @@ class VirtualMachine {
       // LP_solve supports SOS, so add the SOS section if needed.
       if(this.sos_var_indices.length > 0) {
         this.lines += 'sos\n';
-        let sos = 1;
         for(let j = 0; j < abl; j++) {
           for(let i = 0; i < this.sos_var_indices.length; i++) {
+            const svi = this.sos_var_indices[i];
             v_set.length = 0;
-            let vi = this.sos_var_indices[i][0] + j * this.cols;
-            const n = this.sos_var_indices[i][1];
-            for(let j = 1; j <= n; j++)  {
+            let vi = svi[0] + j * this.cols;
+            for(let j = 1; j <= svi[1]; j++)  {
               v_set.push(vbl(vi));
               vi++;
             }
             this.lines += `SOS${sos}: ${v_set.join(',')} <= 2;\n`;
-            sos++;
           }
         }
       }
@@ -5825,19 +5839,18 @@ class VirtualMachine {
     if(this.sos_var_indices.length > 0) {
       this.lines += 'SOS\n';
       const abl = this.actualBlockLength(this.block_count);
-      let sos = 1;
       for(let j = 0; j < abl; j++) {
         for(let i = 0; i < this.sos_var_indices.length; i++) {
-          this.lines += ' S2 sos' + sos + '\n';
-          let vi = this.sos_var_indices[i][0] + j * this.cols;
-          const n = this.sos_var_indices[i][1];
-          for(let j = 1; j <= n; j++) {
-            const s = '    X' + vi.toString().padStart(this.decimals, '0') +
+          const svi = this.sos_var_indices[i];
+          this.lines += ` S2 sos${i + 1}\n`;
+          let vi = svi[0] + j * this.cols;
+          for(let j = 1; j <= svi[1]; j++) {
+            const s = '    X' +
+                vi.toString().padStart(this.decimals, '0') +
                 '          ';
             this.lines += s.substring(0, 15) + j + '\n';
             vi++;
           }
-          sos++;
         }
       }
     }
@@ -6145,7 +6158,7 @@ Solver status = ${json.status}`);
     }
     // 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.
+    // "clicke *here* to diagnose" link on the infoline.
     this.diagnose = diagnose || MODEL.always_diagnose;
     if(this.diagnose) {
       this.PLUS_INFINITY = this.DIAGNOSIS_UPPER_BOUND;
@@ -8329,10 +8342,11 @@ function VMI_set_const_rhs(c) {
 }
 
 function VMI_set_var_rhs(x) {
+  VM.rhs = x.result(VM.t);
   if(DEBUGGING) {
-    console.log('set_var_rhs: ' + x.variableName + ' (t = ' + VM.t + ')');
+    console.log(`set_var_rhs: ${x.variableName} (t = ${VM.t}) = ` +
+        VM.sig4Dig(VM.rhs));
   }
-  VM.rhs = x.result(VM.t);
 }
 
 function VMI_add_const_to_rhs(c) {