linny-r 1.3.3 → 1.3.4

package/console.js

@@ -932,6 +932,23 @@ function commandLineSettings() {
       gurobi_path = path_list[i];
       max_v = parseInt(match[1]);
     }
+    match = path_list[i].match(/[\/\\]cplex[\/\\]bin/i);
+    if(match) {
+      cplex_path = path_list[i];
+    } else {
+      // NOTE: CPLEX may create its own environment variable for its paths
+      match = path_list[i].match(/%(.*cplex.*)%/i);
+      if(match) {
+        const cpl = process.env[match[1]].split(path.delimiter);
+        for(let i = 0; i < cpl.length; i++) {
+          match = cpl[i].match(/[\/\\]cplex[\/\\]bin/i);
+          if(match) {
+            cplex_path = cpl[i];
+            break;
+          }
+        }
+      }
+    }
     match = path_list[i].match(/[\/\\]scip[^\/\\]+[\/\\]bin/i);
     if(match) scip_path = path_list[i];
     match = path_list[i].match(/inkscape/i);

package/package.json

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

package/server.js

@@ -1467,10 +1467,25 @@ function commandLineSettings() {
       gurobi_path = path_list[i];
       max_v = parseInt(match[1]);
     }
+    match = path_list[i].match(/[\/\\]cplex[\/\\]bin/i);
+    if(match) {
+      cplex_path = path_list[i];
+    } else {
+      // NOTE: CPLEX may create its own environment variable for its paths
+      match = path_list[i].match(/%(.*cplex.*)%/i);
+      if(match) {
+        const cpl = process.env[match[1]].split(path.delimiter);
+        for(let i = 0; i < cpl.length; i++) {
+          match = cpl[i].match(/[\/\\]cplex[\/\\]bin/i);
+          if(match) {
+            cplex_path = cpl[i];
+            break;
+          }
+        }
+      }
+    }
     match = path_list[i].match(/[\/\\]scip[^\/\\]+[\/\\]bin/i);
     if(match) scip_path = path_list[i];
-    match = path_list[i].match(/[\/\\]cplex[\/\\]bin/i);
-    if(match) cplex_path = path_list[i];
     match = path_list[i].match(/inkscape/i);
     if(match) settings.inkscape = path_list[i];
   }

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

@@ -5273,9 +5273,30 @@ class GUIController extends Controller {
     md.element('actor').value = mapping.actor || '';
     md.element('prefix').value = mapping.prefix || '';
     const
-        ft = Object.keys(mapping.from_to).sort(ciCompare),
+        tc = (mapping.top_clusters ?
+            Object.keys(mapping.top_clusters).sort(ciCompare) : []),
+        ft = (mapping.from_to ?
+            Object.keys(mapping.from_to).sort(ciCompare) : []),
         sl = [];
+    if(tc.length) {
+      sl.push('<div style="font-weight: bold; margin:4px 2px 2px 2px">',
+        'Names for top-level clusters:</div>');
+      // Add text inputs for selected cluster nodes
+      for(let i = 0; i < tc.length; i++) {
+        const
+            ti = mapping.top_clusters[tc[i]],
+            state = (ti === tc[i] ? 'color: #e09000; ' :
+                this.validName(ti) ? 'color: #0000c0; ' :
+                'font-style: italic; color: red; ');
+        sl.push('<div class="paste-option"><span>', tc[i], '</span> ',
+            '<div class="paste-select"><input id="paste-selc-', i,
+            '" type="text" style="', state, 'font-size: 12px" value="',
+            ti, '"></div></div>');
+      }
+    }
     if(ft.length) {
+      sl.push('<div style="font-weight: bold; margin:4px 2px 2px 2px">',
+        'Mapping of nodes to link from/to:</div>');
       // Add selectors for unresolved FROM/TO nodes
       for(let i = 0; i < ft.length; i++) {
         const ti = mapping.from_to[ft[i]];
@@ -5286,8 +5307,8 @@ class GUIController extends Controller {
               '</option></select></div></div>');
         }
       }
-      md.element('scroll-area').innerHTML = sl.join('');
     }
+    md.element('scroll-area').innerHTML = sl.join('');
     // Open dialog, which will call pasteSelection(...) on OK
     this.paste_modal.show();
   }
@@ -5297,10 +5318,18 @@ class GUIController extends Controller {
     // proceeds to paste
     const
         md = this.paste_modal,
-        mapping = Object.assign(md.mapping, {});
+        mapping = Object.assign(md.mapping, {}),
+        tc = (mapping.top_clusters ?
+            Object.keys(mapping.top_clusters).sort(ciCompare) : []),
+        ft = (mapping.from_to ?
+            Object.keys(mapping.from_to).sort(ciCompare) : []);
     mapping.actor = md.element('actor').value;
     mapping.prefix = md.element('prefix').value.trim();
     mapping.increment = true;
+    for(let i = 0; i < tc.length; i++) {
+      const cn = md.element('selc-' + i).value.trim();
+      if(this.validName(cn)) mapping.top_clusters[tc[i]] = cn;
+    }
     this.pasteSelection(mapping);
   }
   
@@ -5325,6 +5354,7 @@ console.log('HERE xml', xml);
         entities_node = childNodeByTag(xml, 'entities'),
         from_tos_node = childNodeByTag(xml, 'from-tos'),
         extras_node = childNodeByTag(xml, 'extras'),
+        selc_node = childNodeByTag(xml, 'selected-clusters'),
         selection_node = childNodeByTag(xml, 'selection'),
         actor_names = [],
         new_entities = [],
@@ -5335,7 +5365,7 @@ console.log('HERE xml', xml);
     
     function fullName(node) {
       // Returns full entity name inferred from XML node data
-      if(node.nodeName === 'from-to') {
+      if(node.nodeName === 'from-to' || node.nodeName === 'selc') {
         const
             n = xmlDecoded(nodeParameterValue(node, 'name')),
             an = xmlDecoded(nodeParameterValue(node, 'actor-name'));
@@ -5525,6 +5555,17 @@ console.log('HERE xml', xml);
     if(parseInt(mts) === MODEL.time_created.getTime() &&
         ca === fca && mapping.from_prefix === mapping.to_prefix &&
         !(mapping.prefix || mapping.actor || mapping.increment)) {
+      // Prompt for names of selected cluster nodes
+      if(selc_node.childNodes.length && !mapping.prefix) {
+        mapping.top_clusters = {};
+        for(let i = 0; i < selc_node.childNodes.length; i++) {
+          const
+              c = selc_node.childNodes[i],
+              fn = fullName(c),
+              mn = mappedName(fn);
+          mapping.top_clusters[fn] = mn;
+        }
+      }
       this.promptForMapping(mapping);
       return;
     }
@@ -6525,11 +6566,12 @@ class GUIMonitor {
           })
         .then((data) => {
             try {
-              const jsr = JSON.parse(data);
-              if(jsr.solver !== VM.solver_name) {
-                UI.notify(`Solver on ${jsr.server} is ${jsr.solver}`);              
-              }
+              const
+                  jsr = JSON.parse(data),
+                  svr = `Solver on ${jsr.server} is ${jsr.solver}`;
+              if(jsr.solver !== VM.solver_name) UI.notify(svr);              
               VM.solver_name = jsr.solver;
+              document.getElementById('host-logo').title  = svr;
             } catch(err) {
               console.log(err, data);
               UI.alert('ERROR: Unexpected data from server: ' +

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

@@ -1609,16 +1609,20 @@ class LinnyRModel {
         extras = [],
         from_tos = [],
         xml = [],
-        ft_xml = [],
         extra_xml = [],
+        ft_xml = [],
+        selc_xml = [],
         selected_xml = [];
     for(let i = 0; i < this.selection.length; i++) {
       const obj = this.selection[i];
       entities[obj.type].push(obj);
-      selected_xml.push('<sel>' + xmlEncoded(obj.displayName) + '</sel>');
+      if(obj instanceof Cluster) selc_xml.push(
+          '<selc name="', xmlEncoded(obj.name),
+          '" actor-name="', xmlEncoded(obj.actor.name), '"></selc>');
+      selected_xml.push(`<sel>${xmlEncoded(obj.displayName)}</sel>`);
     }
-    // Expand clusters by adding all its model entities to their respective
-    // lists
+    // Expand (sub)clusters by adding all their model entities to their
+    // respective lists
     for(let i = 0; i < entities.Cluster.length; i++) {
       const c = entities.Cluster[i];
       c.clearAllProcesses();
@@ -1714,7 +1718,8 @@ class LinnyRModel {
         '"><entities>', xml.join(''),
         '</entities><from-tos>', ft_xml.join(''),
         '</from-tos><extras>', extra_xml.join(''),
-        '</extras><selection>', selected_xml.join(''),
+        '</extras><selected-clusters>', selc_xml.join(''),
+        '</selected-clusters><selection>', selected_xml.join(''),
         '</selection></copy>'].join('');
   }
   
@@ -3236,6 +3241,7 @@ class LinnyRModel {
       for(let i = 0; i < constraints.length; i++) {
         const
             c = constraints[i],
+            // NOTE: constraints in list have levels greater than near-zero
             fl = c.from_node.actualLevel(t),
             tl = c.to_node.actualLevel(t);
         let tcp;
@@ -3306,10 +3312,10 @@ class LinnyRModel {
                 if(af > VM.NEAR_ZERO) {
                   // Prevent division by zero
                   // NOTE: level can be zero even if actual flow > 0!
-                  const al = p.actualLevel(dt);
+                  const al = p.nonZeroLevel(dt);
                   // NOTE: scale to level only when level > 1, or fixed
                   // costs for start-up or first commit will be amplified 
-                  if(al > VM.ON_OFF_THRESHOLD) cp -= pr * af / Math.max(al, 1);
+                  if(al > VM.NEAR_ZERO) cp -= pr * af / Math.max(al, 1);
                 }
               }
             }
@@ -3428,8 +3434,8 @@ class LinnyRModel {
         p.cost_price[t] = cp;
         // For stocks, the CP includes stock price on t-1
         if(p.is_buffer) {
-          const prevl = p.actualLevel(t-1);
-          if(prevl > 0) {
+          const prevl = p.nonZeroLevel(t-1);
+          if(prevl > VM.NEAR_ZERO) {
             cp = (cnp +  prevl * p.stockPrice(t-1)) / (qnp + prevl);
           }
           p.stock_price[t] = cp;
@@ -3486,7 +3492,7 @@ class LinnyRModel {
         // Then (also) look for links having AF = 0 ...
         for(let i = links.length-1; i >= 0; i--) {
           const af = links[i].actualFlow(t);
-          if(Math.abs(af) < VM.SIG_DIF_FROM_ZERO) {
+          if(Math.abs(af) < VM.NEAR_ZERO) {
             // ... and set their UCP to 0
             links[i].unit_cost_price = 0;
             links.splice(i, 1);
@@ -3522,7 +3528,7 @@ class LinnyRModel {
       let hcp = VM.MINUS_INFINITY;
       for(let i = 0; i < p.inputs.length; i++) {
         const l = p.inputs[i];
-        if(l.from_node instanceof Process && l.actualFlow(t) > 0) {
+        if(l.from_node instanceof Process && l.actualFlow(t) > VM.NEAR_ZERO) {
           const ld = l.actualDelay(t);
           // NOTE: only consider the allocated share of cost
           let cp = l.from_node.costPrice(t - ld) * l.share_of_cost;

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

@@ -3255,19 +3255,22 @@ class VirtualMachine {
         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
-          let ub = ubx.result(0);
+          let ub = ubx.result(0),
+              hub = ub;
           if(ub > VM.MEGA_UPPER_BOUND) {
-            ub = p.highestUpperBound([]);
+            hub = p.highestUpperBound([]);
             // If UB still very high, warn modeler on infoline and in monitor
-            if(ub > VM.MEGA_UPPER_BOUND) {
-              const msg = 'High upper bound (' + this.sig4Dig(ub) +
+            if(hub > VM.MEGA_UPPER_BOUND) {
+              const msg = 'High upper bound (' + this.sig4Dig(hub) +
                   ') for <strong>' + p.displayName + '</strong>' +
                   ' will compromise computation of its binary variables';
               UI.warn(msg);
               this.logMessage(this.block_count,
                   'WARNING: ' + msg.replace(/<\/?strong>/g, '"'));
             }
-          } else {
+          }
+          if(hub !== ub) {
+            ub = hub;
             this.logMessage(this.block_count,
                 `Inferred upper bound for ${p.displayName}: ${this.sig4Dig(ub)}`);
           }
@@ -3771,7 +3774,7 @@ class VirtualMachine {
           for(let k = 0; k < l; k++) {
             const
                 vi = svl[k],
-                slack = x[vi + j],
+                slack = parseFloat(x[vi + j]),
                 absl = Math.abs(slack);
             if(absl > VM.NEAR_ZERO) {
               const v = this.variables[vi - 1];