linny-r 1.3.1 → 1.3.3

package/console.js

@@ -86,6 +86,9 @@ console.log('Platform:', PLATFORM, '(' + os.type() + ')');
 console.log('Module directory:', MODULE_DIRECTORY);
 console.log('Working directory:', WORKING_DIRECTORY);
 
+// Currently, these external solvers are supported:
+const SUPPORTED_SOLVERS = ['gurobi', 'cplex', 'scip', 'lp_solve'];
+
 const
     // Load the MILP solver (dependent on Node.js: `fs`, `os` and `path`)
     MILPSolver = require('./static/scripts/linny-r-milp.js'),
@@ -123,7 +126,7 @@ Possible options are:
                         [name]-stats.txt in (workspace)/reports
   run                   will run the loaded model
   solver=[name]         will select solver [name], or warn if not found
-                        (name choices: Gurobi or LP_solve)
+                        (name choices: Gurobi, CPLEX, SCIP or LP_solve)
   user=[identifier]     user ID will be used to log onto remote servers
   verbose               will output solver messages to the console
   workspace=[path]      will create workspace in [path] instead of (main)/user
@@ -817,7 +820,7 @@ function commandLineSettings() {
       const av = lca.split('=');
       if(av.length === 1) av.push('');
       if(av[0] === 'solver') {
-        if(av[1] !== 'gurobi' && av[1] !== 'lp_solve') {
+        if(SUPPORTED_SOLVERS.indexOf(av[1]) < 0) {
           console.log(`WARNING: Unknown solver "${av[1]}"`);
         } else {
           settings.preferred_solver = av[1];
@@ -920,6 +923,7 @@ function commandLineSettings() {
   // Check whether MILP solver(s) and Inkscape have been installed
   const path_list = process.env.PATH.split(path.delimiter);
   let gurobi_path = '',
+      scip_path = '',
       match,
       max_v = -1;
   for(let i = 0; i < path_list.length; i++) {
@@ -928,6 +932,8 @@ function commandLineSettings() {
       gurobi_path = path_list[i];
       max_v = parseInt(match[1]);
     }
+    match = path_list[i].match(/[\/\\]scip[^\/\\]+[\/\\]bin/i);
+    if(match) scip_path = path_list[i];
     match = path_list[i].match(/inkscape/i);
     if(match) settings.inkscape = path_list[i];
   }
@@ -958,11 +964,44 @@ function commandLineSettings() {
           'WARNING: Failed to access the Gurobi command line application');
     }
   }
+  // Check if cplex(.exe) exists in its directory
+  let sp = path.join(cplex_path, 'cplex' + (PLATFORM.startsWith('win') ? '.exe' : ''));
+  const need_cplex = !settings.solver || settings.preferred_solver === 'cplex';
+  try {
+    fs.accessSync(sp, fs.constants.X_OK);
+    console.log('Path to CPLEX:', sp);
+    if(need_cplex) {
+      settings.solver = 'cplex';
+      settings.solver_path = sp;
+    }
+  } catch(err) {
+    // Only report error if CPLEX is needed
+    if(need_cplex) {
+      console.log(err.message);
+      console.log('WARNING: CPLEX application not found in', sp);
+    }
+  }
+  // Check if scip(.exe) exists in its directory
+  sp = path.join(scip_path, 'scip' + (PLATFORM.startsWith('win') ? '.exe' : ''));
+  const need_scip = !settings.solver || settings.preferred_solver === 'scip';
+  try {
+    fs.accessSync(sp, fs.constants.X_OK);
+    console.log('Path to SCIP:', sp);
+    if(need_scip) {
+      settings.solver = 'scip';
+      settings.solver_path = sp;
+    }
+  } catch(err) {
+    // Only report error if SCIP is needed
+    if(need_scip) {
+      console.log(err.message);
+      console.log('WARNING: SCIP application not found in', sp);
+    }
+  }
   // Check if lp_solve(.exe) exists in main directory
-  const
-      sp = path.join(WORKING_DIRECTORY,
-          'lp_solve' + (PLATFORM.startsWith('win') ? '.exe' : '')),
-      need_lps = !settings.solver || settings.preferred_solver === 'lp_solve';
+  sp = path.join(WORKING_DIRECTORY,
+      'lp_solve' + (PLATFORM.startsWith('win') ? '.exe' : ''));
+  const need_lps = !settings.solver || settings.preferred_solver === 'lp_solve';
   try {
     fs.accessSync(sp, fs.constants.X_OK);
     console.log('Path to LP_solve:', sp);

package/package.json

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

package/server.js

@@ -122,6 +122,8 @@ function checkNodeModule(name) {
   }
 }
 
+// Currently, these external solvers are supported:
+const SUPPORTED_SOLVERS = ['gurobi', 'cplex', 'scip', 'lp_solve'];
 
 // Load class MILPSolver
 const MILPSolver = require('./static/scripts/linny-r-milp.js');
@@ -1422,7 +1424,7 @@ function commandLineSettings() {
           settings.port = n;
         }
       } else if(av[0] === 'solver') {
-        if(av[1] !== 'gurobi' && av[1] !== 'lp_solve') {
+        if(SUPPORTED_SOLVERS.indexOf(av[1]) < 0) {
           console.log(`WARNING: Unknown solver "${av[1]}"`);
         } else {
           settings.preferred_solver = av[1];
@@ -1455,6 +1457,8 @@ function commandLineSettings() {
   // Check whether MILP solver(s) and Inkscape have been installed
   const path_list = process.env.PATH.split(path.delimiter);
   let gurobi_path = '',
+      scip_path = '',
+      cplex_path = '',
       match,
       max_v = -1;
   for(let i = 0; i < path_list.length; i++) {
@@ -1463,6 +1467,10 @@ function commandLineSettings() {
       gurobi_path = path_list[i];
       max_v = parseInt(match[1]);
     }
+    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];
   }
@@ -1493,11 +1501,44 @@ function commandLineSettings() {
           'WARNING: Failed to access the Gurobi command line application');
     }
   }
+  // Check if cplex(.exe) exists in its directory
+  let sp = path.join(cplex_path, 'cplex' + (PLATFORM.startsWith('win') ? '.exe' : ''));
+  const need_cplex = !settings.solver || settings.preferred_solver === 'cplex';
+  try {
+    fs.accessSync(sp, fs.constants.X_OK);
+    console.log('Path to CPLEX:', sp);
+    if(need_cplex) {
+      settings.solver = 'cplex';
+      settings.solver_path = sp;
+    }
+  } catch(err) {
+    // Only report error if CPLEX is needed
+    if(need_cplex) {
+      console.log(err.message);
+      console.log('WARNING: CPLEX application not found in', sp);
+    }
+  }
+  // Check if scip(.exe) exists in its directory
+  sp = path.join(scip_path, 'scip' + (PLATFORM.startsWith('win') ? '.exe' : ''));
+  const need_scip = !settings.solver || settings.preferred_solver === 'scip';
+  try {
+    fs.accessSync(sp, fs.constants.X_OK);
+    console.log('Path to SCIP:', sp);
+    if(need_scip) {
+      settings.solver = 'scip';
+      settings.solver_path = sp;
+    }
+  } catch(err) {
+    // Only report error if SCIP is needed
+    if(need_scip) {
+      console.log(err.message);
+      console.log('WARNING: SCIP application not found in', sp);
+    }
+  }
   // Check if lp_solve(.exe) exists in working directory
-  const
-      sp = path.join(WORKING_DIRECTORY,
-          'lp_solve' + (PLATFORM.startsWith('win') ? '.exe' : '')),
-      need_lps = !settings.solver || settings.preferred_solver === 'lp_solve';
+  sp = path.join(WORKING_DIRECTORY,
+          'lp_solve' + (PLATFORM.startsWith('win') ? '.exe' : '')); 
+  const need_lps = !settings.solver || settings.preferred_solver === 'lp_solve';
   try {
     fs.accessSync(sp, fs.constants.X_OK);
     console.log('Path to LP_solve:', sp);
@@ -1574,7 +1615,7 @@ function createWorkspace() {
       data: path.join(SETTINGS.user_dir, 'data'),
       diagrams: path.join(SETTINGS.user_dir, 'diagrams'),
       modules: path.join(SETTINGS.user_dir, 'modules'),
-      solver_output: path.join(SETTINGS.user_dir, 'solver'),
+      solver_output: path.join(SETTINGS.user_dir, 'solver')
     };
   // Create these sub-directories if not aready there
   try {

package/static/index.html

@@ -2804,7 +2804,65 @@ where X can be one or several of these letters: ABCDELPQ">
       </div>
     </div>
   </div>
-  
+
+  <!-- the PASTE dialog prompts for a prefix and parameter bindings -->
+  <div id="paste-modal" class="modal">
+    <div id="paste-dlg" class="inp-dlg">
+      <div class="dlg-title">
+        Name conflict resolution strategy
+        <img class="cancel-btn" src="images/cancel.png">
+        <img class="ok-btn" src="images/ok.png">
+      </div>
+      <div id="paste-ftp" class="paste-option">
+        <div id="paste-ftp-box" class="box checked"></div>
+        <div class="paste-tactic">
+          Change <span id="paste-from-prefix"></span>&hellip;
+          to <span id="paste-to-prefix"></span>&hellip;
+        </div>
+      </div>
+      <div id="paste-fta" class="paste-option">
+        <div id="paste-fta-box" class="box checked"></div>
+        <div class="paste-tactic">
+          Change actor <span id="paste-from-actor"></span>
+          to <span id="paste-to-actor"></span>
+        </div>
+      </div>
+      <div class="paste-option">
+        <div id="paste-a-box" class="box checked"></div>
+        <div class="paste-tactic">
+          <label>If no actor, add:</label>
+          <input id="paste-actor" type="text"
+                 placeholder="(no actor)" autocomplete="off">
+        </div>
+      </div>
+      <div class="paste-option">
+        <div id="paste-p-box" class="box checked"></div>
+        <div class="paste-tactic">
+          <label>Add prefix:</label>
+          <input id="paste-prefix" type="text"
+                 placeholder="(none)" autocomplete="off">
+        </div>
+      </div>
+      <div class="paste-option">
+        <div id="paste-inc-box" class="box checked"></div>
+        <div class="paste-tactic">
+          Auto-increment tail number
+        </div>
+      </div>
+      <div class="paste-option">
+        <div id="paste-near-box" class="box checked"></div>
+        <div class="paste-tactic">
+          Link to nearest eligible node
+        </div>
+      </div>
+      <div style="font-weight: bold; margin:4px 2px 2px 2px">
+        Mapping of nodes to link from/to:
+      </div>
+      <div id="paste-scroll-area">
+      </div>
+    </div>
+  </div>  
+
   <!--- rotating Linny-R logo icon -->
   <div id="rotating-icon">
     <div>

package/static/linny-r.css

@@ -4053,6 +4053,7 @@ span.sd-clear {
   height: 111px;
 }
 
+#paste-dlg,
 #include-dlg {
   width: 320px;
   height: min-content;
@@ -4078,6 +4079,7 @@ span.sd-clear {
   margin-left: 9px;
 }
 
+#paste-scroll-area,
 #include-scroll-area {
   margin: 2px;
   height: min-content;
@@ -4088,6 +4090,60 @@ span.sd-clear {
   overflow-y: auto;
 }
 
+div.paste-tactic {
+  display: inline-block;
+  vertical-align: top;
+  padding-top: 3px;
+}
+
+div.paste-select::before {
+  content: ' \1F872';
+  margin-right: 3px;
+}
+
+div.paste-select {
+  display: inline-block;
+  font-size: 12px;
+  max-width: calc(100% - 25px);
+  margin: 2px;
+}
+
+#paste-prefix,
+#paste-actor {
+  width: 150px;
+  font-size: 12px;
+  height: 17px !important;
+  margin-left: 1px;
+}
+
+#paste-from-prefix,
+#paste-to-prefix,
+#paste-from-actor,
+#paste-to-actor {
+  max-width: 220px;
+  overflow: clip;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+#paste-from-prefix {
+  color: #6060c0;
+}
+
+#paste-to-prefix {
+  color: #0000c0;
+}
+
+#paste-from-actor {
+  font-style: italic;
+  color: #8050a0;
+}
+
+#paste-to-actor {
+  font-style: italic;
+  color: #600080;
+}
+
 tr.i-param {
   font-style: italic;
   border: 1px solid Silver;

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

@@ -136,7 +136,7 @@ class Controller {
       ACTOR_PROPS: ['weight', 'comments'],
       CLUSTER_PROPS: ['comments', 'collapsed', 'ignore'],
       PROCESS_PROPS: ['comments', 'lower_bound', 'upper_bound', 'initial_level',
-        'pace', 'equal_bounds', 'level_to_zero', 'integer_level', 'collapsed'],
+        'pace_expression', 'equal_bounds', 'level_to_zero', 'integer_level', 'collapsed'],
       PRODUCT_PROPS: ['comments', 'lower_bound', 'upper_bound', 'initial_level',
         'scale_unit', 'equal_bounds', 'price', 'is_source', 'is_sink', 'is_buffer',
         'is_data', 'integer_level', 'no_slack'],
@@ -316,6 +316,21 @@ class Controller {
     return pan;
   }
   
+  sharedPrefix(n1, n2) {
+    const
+        pan1 = this.prefixesAndName(n1),
+        pan2 = this.prefixesAndName(n2),
+        l = Math.min(pan1.length - 1, pan2.length - 1),
+        shared = [];
+    let i = 0;
+    while(i < l && ciCompare(pan1[i], pan2[i]) === 0) {
+      // NOTE: if identical except for case, prefer "Abc" over "aBc" 
+      shared.push(pan1[i] < pan2[i] ? pan1[i] : pan2[i]);
+      i++;
+    }
+    return shared.join(this.PREFIXER);
+  }
+  
   nameToID(name) {
     // Returns a name in lower case with link arrow replaced by three
     // underscores, constraint link arrow by four underscores, and spaces