linny-r 1.6.8 → 1.7.1

package/console.js

@@ -37,26 +37,26 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-// Set global flag to indicate that this is a Node.js application
-// (this will make the "module" files linny-r-xxx.js export their properties)
+// Set global flag to indicate that this is a Node.js application.
+// This will make the "module" files linny-r-xxx.js export their properties.
 global.NODE = true;
 
 const
     WORKING_DIRECTORY = process.cwd(),
     path = require('path'),
     MODULE_DIRECTORY = path.join(WORKING_DIRECTORY, 'node_modules', 'linny-r'),
-    // Load the required Node.js modules
+    // Load the required Node.js modules.
     child_process = require('child_process'),
     fs = require('fs'),
     os = require('os'),
     readline = require('readline'),
-    // Get the platform name (win32, macOS, linux) of the user's computer
+    // Get the platform name (win32, macOS, linux) of the user's computer.
     PLATFORM = os.platform(),
-    // Get version of the installed Linny-R package 
+    // Get version of the installed Linny-R package.
     VERSION_INFO = getVersionInfo();
     
 function getVersionInfo() {
-  // Reads version info from `package.json`
+  // Read version info from `package.json`.
   const info = {
       current: 0,
       current_time: 0,
@@ -72,10 +72,10 @@ function getVersionInfo() {
     console.log('This indicates that Linny-R is not installed properly.');
     process.exit();    
   }
-  // NOTE: unlike the Linny-R server, the console does not routinely
+  // NOTE: Unlike the Linny-R server, the console does not routinely
   // check whether version is up-to-date is optional because this is
   // a time-consuming action that would reduce multi-run performance.
-  // See command line options (much further down)
+  // See command line options (much further down).
   console.log('\nLinny-R Console version', info.current);
   return info;
 }
@@ -99,16 +99,16 @@ const
     model = require('./static/scripts/linny-r-model.js'),
     ctrl = require('./static/scripts/linny-r-ctrl.js');
     
-// NOTE: the variables, functions and classes defined in these scripts
-// must still be "imported" into the global scope of this Node.js script
+// NOTE: The variables, functions and classes defined in these scripts
+// must still be "imported" into the global scope of this Node.js script.
 for(let k in config) if(config.hasOwnProperty(k)) global[k] = config[k];
 for(let k in utils) if(utils.hasOwnProperty(k)) global[k] = utils[k];
 for(let k in vm) if(vm.hasOwnProperty(k)) global[k] = vm[k];
 for(let k in model) if(model.hasOwnProperty(k)) global[k] = model[k];
 for(let k in ctrl) if(ctrl.hasOwnProperty(k)) global[k] = ctrl[k];
 
-// Default settings are used unless these are overruled by arguments on the
-// command line
+// Default settings are used unless these are overruled by arguments on
+// the command .
 const usage = `
 Usage:  node console [options]
 
@@ -132,7 +132,6 @@ Possible options are:
   workspace=[path]      will create workspace in [path] instead of (main)/user
   xrun=[title#list]     will perform experiment runs in given range
                         (list is comma-separated sequence of run numbers)
-                        (FUTURE OPTION)
 `;
 
 const SETTINGS = commandLineSettings();
@@ -141,8 +140,8 @@ const SETTINGS = commandLineSettings();
 const WORKSPACE = createWorkspace();
     
 // Only then require the Node.js modules that are not "built-in"
-// NOTE: the function serves to catch the error in case the module has not
-// been installed with `npm`
+// NOTE: the function serves to catch the error in case the module has
+// not been installed with `npm`.
 const { DOMParser } = checkNodeModule('@xmldom/xmldom');
 
 function checkNodeModule(name) {
@@ -156,10 +155,10 @@ function checkNodeModule(name) {
 }
 
 // Add the XML parser to the global scope so it can be referenced by the
-// XML-related functions defined in `linny-r-utils.js`
+// XML-related functions defined in `linny-r-utils.js`.
 global.XML_PARSER = new DOMParser();
 
-// Set the current version number 
+// Set the current version number.
 global.LINNY_R_VERSION = VERSION_INFO.current;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -173,32 +172,37 @@ class ConsoleMonitor {
   constructor() {
     this.console = true;
     this.visible = false;
-    // The "show log" flag indicates whether log messages should be output to
-    // the console (will be ignored by the GraphicalMonitor)
+    // The "show log" flag indicates whether log messages should be output
+    // to the console (will be ignored by the GUIMonitor).
     this.show_log = false;
     this.block_number = 0;
   }
   
   logMessage(block, msg) {
-    // Outputs a solver message to the console if logging is activated
+    // Output a solver message to the console if logging is activated.
+    let new_block = false;
+    if(block > this.block_number) {
+      this.block_number = block;
+      new_block = true;
+    }
     if(this.show_log) {
-      if(block > this.block_number) {
-        // Mark advance to nex block with a blank line
-        console.log('\nBlock #', block);
-        this.block_number = block;
-      }
+      // Mark advance to nex block with a blank line.
+      if(new_block) console.log('\nBlock #', block);
       console.log(msg);
     }
+    // Always log solver message to receiver report.
+    if(new_block) RECEIVER.log('Block #' + block, true);
+    RECEIVER.log(msg, true);
   }
 
   logOnToServer() {
     VM.solver_user = '';
     VM.solver_token = 'local host';
-    VM.solver_name = SOLVER.name;
+    VM.solver_name = SOLVER.id;
   }
 
   connectToServer() {
-    // Console always uses local server => no logon prompt
+    // Console always uses local server => no logon prompt.
     this.logOnToServer();
     return true;
   }
@@ -218,17 +222,21 @@ class ConsoleMonitor {
             token: VM.solver_token,
             block: VM.block_count,
             round: VM.round_sequence[VM.current_round],
+            columns: VM.columnsInBlock,
             data: VM.lines,
-            timeout: top
+            solver: MODEL.preferred_solver,
+            timeout: top,
+            inttol: MODEL.integer_tolerance,
+            mipgap: MODEL.MIP_gap
           }));
       VM.processServerResponse(data);
       const msg =
           `Solving block #${VM.blockWithRound} took ${VM.elapsedTime} seconds.`;
       VM.logMessage(VM.block_count, msg);
       console.log(msg);
-      // solve next block (if any)
-      // NOTE: use setTimeout so that this calling function returns
-      // and hence frees its local variables
+      // Solve next block (if any).
+      // NOTE: Use setTimeout so that this calling function returns
+      // and hence frees its local variables.
       setTimeout(() => VM.solveBlocks(), 1);
     } catch(err) {
       console.log(err);
@@ -260,7 +268,7 @@ class ConsoleRepositoryBrowser {
     this.repositories = [];
     this.repository_index = -1; 
     this.module_index = -1;
-    // Get the repository list from the modules
+    // Get the repository list from the modules.
     this.getRepositories();
     this.reset();
   }
@@ -270,19 +278,19 @@ class ConsoleRepositoryBrowser {
   }
 
   get isLocalHost() {
-    // Returns TRUE if first repository on the list is 'local host'
+    // Return TRUE if first repository on the list is 'local host'.
     return this.repositories.length > 0 &&
       this.repositories[0].name === 'local host';
   }
 
   getRepositories() {
-    // Gets the list of repository names from the server
+    // Gets the list of repository names from the server.
     this.repositories.length = 0;
     // @@TO DO!!
   }
   
   repositoryByName(n) {
-    // Returns the repository having name `n` if already known, otherwise NULL
+    // Return the repository having name `n` if already known, otherwise NULL.
     for(let i = 0; i < this.repositories.length; i++) {
       if(this.repositories[i].name === n) {
         return this.repositories[i];
@@ -293,15 +301,15 @@ class ConsoleRepositoryBrowser {
   
   asFileName(s) {
     // NOTE: asFileName is implemented as function (see below) to permit
-    // its use prior to instantiation of the RepositoryBrowser
+    // its use prior to instantiation of the RepositoryBrowser.
     return stringToFileName(s);
   }
   
 }
 
 function stringToFileName(s) {
-  // Returns string `s` with whitespace converted to a single dash, and
-  // special characters converted to underscores
+  // Return string `s` with whitespace converted to a single dash, and
+  // special characters converted to underscores.
   return s.normalize('NFKD').trim()
       .replace(/[\s\-]+/g, '-')
       .replace(/[^A-Za-z0-9_\-]/g, '_')
@@ -315,17 +323,17 @@ class ConsoleFileManager {
 
   anyOSpath(p) {
     // Helper function that converts any path notation to platform notation
-    // based on the predominant separator
+    // based on the predominant separator.
     const
        s_parts = p.split('/'),
        bs_parts = p.split('\\'),
        parts = (s_parts.length > bs_parts.length ? s_parts : bs_parts);
-    // On macOS machines, paths start with a slash, so first substring is empty
+    // On macOS machines, paths start with a slash, so first substring is empty.
     if(parts[0].endsWith(':') && path.sep === '\\') {
-      // On Windows machines, add a backslash after the disk (if specified)
+      // On Windows machines, add a backslash after the disk (if specified).
       parts[0] += path.sep;
     }
-    // Reassemble path for the OS of this machine
+    // Reassemble path for the OS of this machine.
     return path.join(...parts);
   }
   
@@ -334,18 +342,18 @@ class ConsoleFileManager {
     if(url === '') return;
     // NOTE: add this dataset to the "loading" list...
     addDistinct(dataset, MODEL.loading_datasets);
-    // ... and allow for 3 more seconds (6 times 500 ms) to complete
+    // ... and allow for 3 more seconds (6 times 500 ms) to complete.
     MODEL.max_time_to_load += 6;
-    // Passed parameter is the URL or full path
+    // Passed parameter is the URL or full path.
     console.log('Load data from', url);
     if(!url) {
       console.log('ERROR: No URL or path');
       return;
     }
     if(url.toLowerCase().startsWith('http')) {
-      // URL => validate it, and then try to download its content as text
+      // URL => validate it, and then try to download its content as text.
       try {
-        new URL(url); // Will throw an error if URL is not valid
+        new URL(url); // Will throw an error if URL is not .
         getTextFromURL(url,
             (data) => FILE_MANAGER.setData(dataset, data),
             (error) => {
@@ -361,7 +369,7 @@ class ConsoleFileManager {
       let fp = this.anyOSpath(url);
       if(!(fp.startsWith('/') || fp.startsWith('\\') || fp.indexOf(':\\') > 0)) {
         // Relative path => add path to specified data path or to the
-        // default location user/data
+        // default location user/data.
         fp = path.join(SETTINGS.data_path || WORKSPACE.data, fp);
         console.log('Full path: ', fp);
       }
@@ -379,44 +387,44 @@ class ConsoleFileManager {
   setData(dataset, data) {
     if(data !== '' && UI.postResponseOK(data)) {
       // Server must return either semicolon-separated or
-      // newline-separated string of numbers
+      // newline-separated string of numbers.
       if(data.indexOf(';') < 0) {
-        // If no semicolon found, replace newlines by semicolons
+        // If no semicolon found, replace newlines by semicolons.
         data = data.trim().split('\n').join(';');
       }
-      // Remove all white space
+      // Remove all white space.
       data = data.replace(/\s+/g, '');
       dataset.unpackDataString(data);
-      // NOTE: remove dataset from the "loading" list
+      // NOTE: Remove dataset from the "loading" list.
       const i = MODEL.loading_datasets.indexOf(dataset);
       if(i >= 0) MODEL.loading_datasets.splice(i, 1);
     }
   }
 
   decryptIfNeeded(data, callback) {
-    // Checks whether XML is encrypted; if not, processes data "as is",
-    // otherwise decrypt using password specified in command line
+    // Check whether XML is encrypted; if not, processes data "as is",
+    // otherwise decrypt using password specified in command line.
     if(data.indexOf('model latch="') < 0) {
       setTimeout(callback, 0, data);
       return;
     }
     const xml = XML_PARSER.parseFromString(data, 'text/xml');
     const de = xml.documentElement;
-    // Linny-R model must contain a model node
+    // Linny-R model must contain a model node.
     if(de.nodeName !== 'model') throw 'XML document has no model element';
     const encr_msg = {
           encryption: nodeContentByTag(de, 'content'),
           latch: nodeParameterValue(de, 'latch')
         };
     console.log('Decrypting...');
-    // NOTE: function `tryToDecrypt` is defined in linny-r-utils.js
+    // NOTE: Function `tryToDecrypt` is defined in linny-r-utils.js.
     setTimeout((msg, pwd, ok, err) => tryToDecrypt(msg, pwd, ok, err), 5,
         encr_msg, SETTINGS.password,
-        // The on_ok function
+        // The on_ok function.
         (data) => {
             if(data) callback(data);
           },
-        // The on_error function
+        // The on_error function.
         (err) => {
             console.log(err);
             console.log('Failed to load encrypted model');
@@ -424,8 +432,7 @@ class ConsoleFileManager {
   }
   
   loadModel(fp, callback) {
-    // Get the XML of the file specified via the command line
-    // NOTE: asynchronous method with callback because decryption is
+    // Get the XML of the file specified via the command line.
     fs.readFile(fp, 'utf8', (err, data) => {
         if(err) {
           console.log(err);
@@ -438,7 +445,7 @@ class ConsoleFileManager {
   }
 
   writeStringToFile(s, fp) {
-    // Write string `s` to path `fp`
+    // Write string `s` to path `fp`.
     try {
       fs.writeFileSync(fp, s);
       console.log(pluralS(s.length, 'character') + ' written to file ' + fp);
@@ -450,18 +457,19 @@ class ConsoleFileManager {
 
 } // END of class ConsoleFileManager
 
-// CLASS ConsoleReceiver defines a listener/interpreter for channel commands
+// CLASS ConsoleReceiver defines a listener/interpreter for channel commands.
 class ConsoleReceiver {
   constructor() {
-    // NOTE: each receiver instance listens to a "channel", being the directory
-    // on the local host specified by the modeler
+    // NOTE: Each receiver instance listens to a "channel", being the
+    // directory on the local host specified by the modeler.
     this.channel = '';
-    // The file name is the name of the first Linny-R model file or command file
-    // that was found in the channel directory
+    // The file name is the name of the first Linny-R model file or
+    // command file that was found in the channel directory.
     this.file_name = '';
-    // The name of the experiment to be run can be specified in a command file
+    // The name of the experiment to be run can be specified in a
+    // command file.
     this.experiment = '';
-    // The call-back script is the path to file with a shell command
+    // The call-back script is the path to file with a shell command.
     this.call_back_script = '';
     this.active = false;
     this.solving = false;
@@ -471,16 +479,16 @@ class ConsoleReceiver {
   }
   
   setError(msg) {
-    // Record and display error message, and immediately stop listening
+    // Record and display error message, and immediately stop listening.
     this.error = msg;
     UI.warn(this.error);
     this.deactivate();
   }
   
-  log(msg) {
-    // Logs a UI message so it will appear in the log file
-    if(this.active) {
-      if(!msg.startsWith('[')) {
+  log(msg, running=false) {
+    // Log a UI message so it will appear in the log file.
+    if(this.active || running) {
+      if(!(msg.startsWith('[') || running)) {
         const
             d = new Date(),
             now = d.getHours() + ':' +
@@ -493,17 +501,17 @@ class ConsoleReceiver {
   }
   
   get logReport() {
-    // Returns log lines as a single string, and clears the log
+    // Return log lines as a single string, and clear the log.
     const report = this.log_lines.join('\n');
     this.log_lines.length = 0;
     return report;
   }
 
   activate() {
-    // Sets channel path and (optional) call-back script
+    // Set channel path and (optional) call-back script.
     this.channel = SETTINGS.channel;
     this.call_back_script = SETTINGS.callback;
-    // Clear experiment, error message and log
+    // Clear experiment, error message and log.
     this.experiment = '';
     this.error = '';
     this.log_lines.length = 0;
@@ -513,7 +521,8 @@ class ConsoleReceiver {
   }
 
   listen() {
-    // If active, checks with local server whether there is a new command
+    // If active, check whether there is a new command in the channel
+    // directory.
     if(!this.active) return;
     const jsr = rcvrListen(this.channel);
     if(jsr.error) {
@@ -522,10 +531,10 @@ class ConsoleReceiver {
       console.log('Receiver deactivated by script');
       this.deactivate();
     } else if(jsr.file === '') {
-      // Nothing to do => check again after the set time interval
+      // Nothing to do => check again after the set time interval.
       setTimeout(() => RECEIVER.listen(), this.interval);
     } else if(jsr.file && jsr.model) {
-      // NOTE: model will NOT be encrypted, so it can be parsed
+      // NOTE: Model will NOT be encrypted, so it can be parsed.
       this.file_name = jsr.file;
       let msg = '';
         if(!MODEL.parseXML(jsr.model)) {
@@ -540,13 +549,13 @@ class ConsoleReceiver {
       }
       if(msg) {
         this.setError(msg);
-        rcvrReport();
-        // Keep listening, so check again after the time interval
+        rcvrReport(this.channel, this.file_name);
+        // Keep listening, so check again after the time interval.
         setTimeout(() => RECEIVER.listen(), this.interval);
       } else {
         this.log('Executing: ' + this.file_name);
         // NOTE: Virtual Machine will trigger the receiver's reporting
-        // action each time the model has been solved
+        // action each time the model has been solved.
         if(this.experiment) {
           this.log('Starting experiment: ' + this.experiment);
           EXPERIMENT_MANAGER.startExperiment();
@@ -558,27 +567,39 @@ class ConsoleReceiver {
   }
 
   report() {
-    // Saves the run results in the channel, or signals an error
-    let run = '';
-    // NOTE: Always set `solving` to FALSE
+    // Save the run results in the channel, or signal an error.
+    let run = '',
+        rpath = this.channel,
+        file = this.file_name;
+    // NOTE: Always set `solving` to FALSE.
     this.solving = false;
-    if(this.experiment){
+    // NOTE: When reporting while the receiver is not active, report the
+    // results of the running experiment.
+    if(this.experiment || !this.active) {
       if(MODEL.running_experiment) {
         run = MODEL.running_experiment.active_combination_index;
-        this.log(`Reporting: ${this.file_name} (run #${run})`);
+        this.log(`Reporting: ${file} (run #${run})`);
       }
     }
+    // NOTE: If receiver is not active, path and file must be set.
+    if(!this.active) {
+      rpath = 'user/reports';
+      // Zero-pad the run number.
+      file = REPOSITORY_BROWSER.asFileName(MODEL.name || 'model') +
+          (run === '' ? '' : '-' + run.toString().padStart(3, '0')) +
+          `-${compactClockTime()}`;
+    }
     if(MODEL.solved && !VM.halted) {
-      // Normal execution termination => report results
+      // Normal execution termination => report results.
       const data = MODEL.outputData;
-      rcvrReport(run, data[0], data[1]);
-      // If execution completed, perform the call-back action
-      // NOTE: for experiments, call-back is performed upon completion by
-      // the Experiment Manager
+      rcvrReport(rpath, file, run, data[0], data[1]);
+      // If execution completed, perform the call-back action.
+      // NOTE: For experiments, call-back is performed upon completion by
+      // the Experiment Manager.
       if(!this.experiment) this.callBack();
     } else {
       if(!VM.halted && !this.error) {
-        // No apparent cause => log this irregularity
+        // No apparent cause => log this irregularity.
         this.setError('ERROR: Unknown solver problem');
         rcvrAbort();
       }
@@ -586,53 +607,26 @@ class ConsoleReceiver {
   }
 
   callBack() {
-    // Deletes the file in the channel directory (to prevent executing it again)
-    // and activates the call-back script on the local server
-    fetch('receiver/', postData({
-          path: this.channel,
-          file: this.file_name,
-          action: 'call-back',
-          script: this.call_back_script
-        }))
-      .then((response) => {
-          if(!response.ok) {
-            UI.alert(`ERROR ${response.status}: ${response.statusText}`);
-          }
-          return response.text();
-        })
-      .then((data) => {
-          // Call-back completed => resume listening unless running experiment
-          if(RECEIVER.experiment) {
-            // For experiments, only display server response if warning or error
-            UI.postResponseOK(data);
-          } else {
-            // Always show server response for single runs
-            if(UI.postResponseOK(data, true)) {
-              // NOTE: resume listening only if no error
-              setTimeout(() => RECEIVER.listen(), RECEIVER.interval);
-            } else {
-              RECEIVER.deactivate();
-            }
-          }
-        })
-      .catch(() => UI.warn(UI.WARNING.NO_CONNECTION, err));
+    // Run the call-back script (if specified) only when the receiver is
+    // active (so not when its reporting function is called by the VM).
+    if(this.active) rcvrCallBack(this.call_back_script);
   }
 
 } // END of class ConsoleReceiver
 
-// Receiver helper functions
-// NOTE: these functions are adapted versions of those having the same
+// Receiver helper functions.
+// NOTE: These functions are adapted versions of those having the same
 // name in file `server.js`; the main difference is that those functions
-// respond to HTTP requests, whereas now they return objects
+// respond to HTTP requests, whereas now they return objects.
 
 function rcvrListen(rpath) {
-  // "Listens" at the channel, i.e., looks for work to do
+  // "Listen" at the channel, i.e., look for work to do.
   let mdl = '',
       cmd = '';
   try {
-    // Look for a model file and/or a command file in the channel directory
+    // Look for a model file and/or a command file in the channel directory.
     const flist = fs.readdirSync(rpath);
-    // NOTE: `flist` contains file names relative to the channel path
+    // NOTE: `flist` contains file names relative to the channel path.
     for(let i = 0; i < flist.length; i++) {
       const f = path.parse(flist[i]);
       if(f.ext === '.lnr' && !mdl) mdl = flist[i];
@@ -642,7 +636,7 @@ function rcvrListen(rpath) {
     console.log(err);
     return {error: `Failed to get file list from ${rpath}`};
   }
-  // Model files take precedence over command files
+  // Model files take precedence over command files.
   if(mdl) {
     try {
       const data = fs.readFileSync(path.join(rpath, mdl), 'utf8');
@@ -659,7 +653,7 @@ function rcvrListen(rpath) {
       console.log(err);
       return {error: `Failed to read command file ${cmd}`};
     }
-    // Special command to deactivate the receiver
+    // Special command to deactivate the receiver.
     if(cmd === 'STOP LISTENING') {
       return {stop: 1};
     } else {
@@ -669,24 +663,24 @@ function rcvrListen(rpath) {
           r = '',
           x = '';
       const m_r = cmd.split('@');
-      // Repository `r` is local host unless specified
+      // Repository `r` is local host unless specified.
       if(m_r.length === 2) {
         r = m_r[1];
       } else if(m_r.length === 1) {
         r = 'local host';
       } else {
-        // Multiple occurrences of @
+        // Multiple occurrences of @ are not allowed.
         return {error: `Invalid command "${cmd}"`};
       }
       m = m_r[0];
-      // Module `m` can be prefixed by an experiment title
+      // Module `m` can be prefixed by an experiment title.
       const x_m = m.split('|');
       if(x_m.length === 2) {
         x = x_m[0];
         m = x_m[1];
       }
       // Call the repository helper function `repoLoad` with its callback
-      // function to get the model XML
+      // function to get the model XML.
       return {
           file: path.parse(cmd).name,
           model: repoLoad(r.trim(), m.trim()),
@@ -694,14 +688,15 @@ function rcvrListen(rpath) {
         };
     }
   } else {
-    // Empty fields will be interpreted as "nothing to do"
+    // Empty fields will be interpreted as "nothing to do".
     return {file: '', model: '', experiment: ''};
   }
 }
 
 function rcvrAbort() {
-  const log_path = path.join(this.channel, this.file_name + '-log.txt');
-  fs.writeFile(log_path, this.logReport, (err) => {
+  // Log that receiver actions have been aborted.
+  const log_path = path.join(RECEIVER.channel, RECEIVER.file_name + '-log.txt');
+  fs.writeFile(log_path, RECEIVER.logReport, (err) => {
       if(err) {
         console.log(err);
         console.log('ERROR: Failed to write event log to file', log_path);
@@ -711,9 +706,10 @@ function rcvrAbort() {
     });
 }
 
-function rcvrReport(run='', data='no data', stats='no statistics') {
+function rcvrReport(rpath, file, run='', data='no data', stats='no statistics') {
+  // Write series data, statistics and log to files.
   try {
-    let fp = path.join(this.channel, this.file_name + run + '-data.txt');
+    let fp = path.join(rpath, file + run + '-data.txt');
     fs.writeFileSync(fp, data);
   } catch(err) {
     console.log(err);
@@ -721,7 +717,7 @@ function rcvrReport(run='', data='no data', stats='no statistics') {
     return;
   }
   try {
-    fp = path.join(this.channel, this.file_name + run + '-stats.txt');
+    fp = path.join(rpath, file + run + '-stats.txt');
     fs.writeFileSync(fp, stats);
   } catch(err) {
     console.log(err);
@@ -729,23 +725,25 @@ function rcvrReport(run='', data='no data', stats='no statistics') {
     return;
   }
   try {
-    fp = path.join(this.channel, this.file_name + run + '-log.txt');
-    fs.writeFileSync(fp, this.logReport);
+    fp = path.join(rpath, file + run + '-log.txt');
+    fs.writeFileSync(fp, RECEIVER.logReport);
   } catch(err) {
     console.log(err);
     console.log('ERROR: Failed to write event log to file',  fp);
   }
-  console.log('Data and statistics reported for', this.file_name);
+  console.log('Data and statistics reported for', file);
 }
 
 function rcvrCallBack(script) {
+  // Delete the file in the channel directory (to prevent executing it
+  // again) and activate the call-back script on the local server.
   let file_type = '',
-      cpath = path.join(this.channel, this.file_name + '.lnr');
+      cpath = path.join(RECEIVER.channel, RECEIVER.file_name + '.lnr');
   try {
     fs.accessSync(cpath);
     file_type = 'model';
   } catch(err) {
-    cpath = path.join(this.channel, this.file_name + '.lnrc');
+    cpath = path.join(RECEIVER.channel, RECEIVER.file_name + '.lnrc');
     try {
       fs.accessSync(cpath);
       file_type = 'command';
@@ -792,7 +790,7 @@ function rcvrCallBack(script) {
 //
 
 function commandLineSettings() {
-  // Sets default settings, and then checks the command line arguments
+  // Set default settings, and then check the command line arguments.
   const settings = {
       cli_name: (PLATFORM.startsWith('win') ? 'Command Prompt' : 'Terminal'),
       check: false,
@@ -800,6 +798,8 @@ function commandLineSettings() {
       preferred_solver: '',
       report: '',
       run: false,
+      x_title: '',
+      x_list: false,
       solver: '',
       solver_path: '',
       user_dir: path.join(WORKING_DIRECTORY, 'user'),
@@ -886,24 +886,29 @@ function commandLineSettings() {
         // Check is repository exists, etc.
         // @@@TO DO!
       } else if(av[0] === 'xrun') {
-        // NOTE: use original argument to preserve upper/lower case
-        const x = process.argv[i].split('=')[1].split('#');
-        settings.x_title = x[0];
-        settings.x_runs = [];
-        x.splice(0, 1);
-        // In case of multiple #, interpret them as commas
-        const r = x.join(',').split(',');
-        for(let i = 0; i < r.length; i++) {
-          if(/^\d+$/.test(r[i])) {
-            settings.x_runs.push(parseInt(r[i]));
-          } else {
-            console.log(`WARNING: Invalid run number "${r[i]}"`);
+        if(!av[1].trim()) {
+          // NOTE: `x_title` = TRUE indicates: list available experiments.
+          settings.x_title = true;
+        } else {
+          // NOTE: use original argument to preserve upper/lower case
+          const x = process.argv[i].split('=')[1].split('#');
+          settings.x_title = x[0].trim();
+          if(!settings.x_title) settings.x_title = true;
+          settings.x_runs = [];
+          x.splice(0, 1);
+          // In case of multiple #, interpret them as commas.
+          const r = (x.length > 0 ? x.join(',').split(',') : []);
+          for(let i = 0; i < r.length; i++) {
+            if(/^\d+$/.test(r[i])) {
+              settings.x_runs.push(parseInt(r[i]));
+            } else {
+              console.log(`WARNING: Invalid run number "${r[i]}"`);
+            }
+          }
+          // If only invalid numbers, do not run the experiment at all.
+          if(r.length > 0 && settings.x_runs.length === 0) {
+            settings.x_runs = false;
           }
-        }
-        // If only invalid numbers, do not run the experiment at all
-        if(r.length > 0 && settings.x_runs === 0) {
-          console.log(`Experiment "${settings.x_title}" will not be run`);
-          settings.x_title = '';
         }
       } else {
         // Terminate script
@@ -913,126 +918,13 @@ function commandLineSettings() {
       }
     }
   }
-  // If help is asked for, or command is invalid, show usage and then quit
+  // If help is asked for, or command is invalid, show usage and then quit.
   if(show_usage) {
     console.log(usage);
     process.exit();
   }
-  // Perform version check only if asked for
+  // Perform version check only if asked for.
   if(settings.check) checkForUpdates();
-  // 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++) {
-    match = path_list[i].match(/gurobi(\d+)/i);
-    if(match && parseInt(match[1]) > max_v) {
-      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);
-    if(match) settings.inkscape = path_list[i];
-  }
-  if(!gurobi_path && !PLATFORM.startsWith('win')) {
-    console.log('Looking for Gurobi in /usr/local/bin');
-    try {
-      // On macOS and Unix, Gurobi is in the user's local binaries
-      const gp = '/usr/local/bin';
-      fs.accessSync(gp + '/gurobi_cl');
-      gurobi_path = gp;
-    } catch(err) {
-      // No real error, so no action needed
-    }
-  }
-  if(gurobi_path) {
-    console.log('Path to Gurobi:', gurobi_path);
-    // Check if command line version is executable
-    const sp = path.join(gurobi_path,
-        'gurobi_cl' + (PLATFORM.startsWith('win') ? '.exe' : ''));
-    try {
-      fs.accessSync(sp, fs.constants.X_OK);
-      if(settings.solver !== 'gurobi') 
-      settings.solver = 'gurobi';
-      settings.solver_path = sp;
-    } catch(err) {
-      console.log(err.message);
-      console.log(
-          '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
-  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);
-    if(need_lps) {
-      settings.solver = 'lp_solve';
-      settings.solver_path = sp;
-    }
-  } catch(err) {
-    // Only report error if LP_solve is needed
-    if(need_lps) {
-      console.log(err.message);
-      console.log('WARNING: LP_solve application not found in', sp);
-    }
-  }
   return settings;
 }
 
@@ -1081,6 +973,8 @@ function createWorkspace() {
   }
   // The file containing name, URL and access token for remote repositories
   ws.repositories = path.join(SETTINGS.user_dir, 'repositories.cfg');
+  // For completeness, add path to Linny-R directory.
+  ws.working_directory = WORKING_DIRECTORY;
   // Return the updated workspace object
   return ws;
 }
@@ -1115,7 +1009,7 @@ function checkForUpdates() {
 }
 
 // Initialize the solver
-const SOLVER = new MILPSolver(SETTINGS, WORKSPACE);
+const SOLVER = new MILPSolver(SETTINGS.preferred_solver, WORKSPACE);
 /*
 // Initialize the dialog for interaction with the user
 const PROMPTER = readline.createInterface(
@@ -1156,54 +1050,105 @@ global.RECEIVER = new ConsoleReceiver();
 global.IO_CONTEXT = null;
 global.MODEL = new LinnyRModel();
 
-// Connect the virtual machine (may prompt for password)
+// Connect the virtual machine (may prompt for password).
 MONITOR.connectToServer();
 
-// Load the model if specified
+// Load the model if specified.
 if(SETTINGS.model_path) {
   FILE_MANAGER.loadModel(SETTINGS.model_path, (model) => {
-      // Command `run` takes precedence over `xrun`
+      // Command `run` takes precedence over `xrun`.
       if(SETTINGS.run) {
         MONITOR.show_log = SETTINGS.verbose;
+        // Callback hook "tells" VM where to return after solving.
         VM.callback = () => {
             const od = model.outputData;
-            // Output data is two-string list [time series, statistics]
+            // Output data is two-string list [time series, statistics].
             if(SETTINGS.report) {
-              // Output time series
+              // Output time series.
               FILE_MANAGER.writeStringToFile(od[0],
                   SETTINGS.report + '-series.txt');
-              // Output statistics
+              // Output statistics.
               FILE_MANAGER.writeStringToFile(od[1],
                   SETTINGS.report + '-stats.txt');
-            } else {
-              // Output strings to console
+            } else if(!MODEL.report_results) {
+              // Output strings to console.
               console.log(od[0]);
               console.log(od[1]);
             }
+            // Clear callback hook (to be neat).
             VM.callback = null;
         };
+        // NOTE: Solver preference in model overrides default solver.
+        const mps = MODEL.preferred_solver;
+        if(mps && SOLVER.solver_list.hasOwnProperty(mps)) {
+          VM.solver_name = mps;
+          SOLVER.id = mps;
+          console.log(`Using solver ${SOLVER.name} (model preference)`);
+        }
         VM.solveModel();
       } else if(SETTINGS.x_title) {
-        const xi = MODEL.indexOfExperiment(SETTINGS.x_title);
-        if(xi < 0) {
-          console.log(`WARNING: Unknown experiment "${SETTINGS.x_title}"`);
+        if(SETTINGS.x_title === true) {
+          // List titles of experiments in model.
+          if(MODEL.experiments.length === 0) {
+            console.log('NOTE: Model defines no experiments');
+          } else {
+            console.log('No experiment specified. Options are:');
+            for(let i = 0; i < MODEL.experiments.length; i++) {
+              console.log(`${i+1}. ${MODEL.experiments[i].title}`);
+            }
+          }
         } else {
-          EXPERIMENT_MANAGER.selectExperiment(SETTINGS.x_title);
-          EXPERIMENT_MANAGER.callback = () => {
-              const od = model.outputData;
-              console.log(od[0]);
-              console.log(od[1]);
-              VM.callback = null;
-          };
-          if(SETTINGS.x_runs.length === 0) {
-            // Perform complete experiment
-            EXPERIMENT_MANAGER.startExperiment();
+          // Check whether experiment exists.
+          let xi = MODEL.indexOfExperiment(SETTINGS.x_title);
+          // NOTE: Experiments can also be specified by their index number.
+          if(xi < 0) {
+            xi = safeStrToInt(SETTINGS.x_title, 0) - 1;
+            if(xi >= MODEL.experiments.length) xi = -1;
+            if(xi >= 0) SETTINGS.x_title = MODEL.experiments[xi].title;
+          }
+          if(xi < 0) {
+            console.log(`WARNING: Unknown experiment "${SETTINGS.x_title}"`);
           } else {
-            // Announce, and then perform, only the selected runs
-            console.log('Experiment:', SETTINGS.x_title,
-                'Runs:', SETTINGS.x_runs);
-            for(let i = 0; i < SETTINGS.x_runs.length; i++) {
-              EXPERIMENT_MANAGER.startExperiment(SETTINGS.x_runs[i]);
+            console.log('Experiment:', SETTINGS.x_title);
+            EXPERIMENT_MANAGER.selectExperiment(SETTINGS.x_title);
+            const x = EXPERIMENT_MANAGER.selected_experiment;
+            if(!x) {
+              console.log('ERROR: Experiment not found');
+              return;
+            }
+            // NOTE: Only set callback when model does not auto-report runs.
+            if(!MODEL.report_results) EXPERIMENT_MANAGER.callback = () => {
+                const od = model.outputData;
+                console.log(od[0]);
+                console.log(od[1]);
+                VM.callback = null;
+              };
+            if(SETTINGS.x_runs.length === 0) {
+              // Perform complete experiment.
+              EXPERIMENT_MANAGER.startExperiment();
+            } else {
+              // Announce, and then perform, only the selected runs.
+              console.log('Runs:', SETTINGS.x_runs);
+              for(let i = SETTINGS.x_runs.length - 1; i >= 0; i--) {
+                const rc = x.combinations[SETTINGS.x_runs[i]];
+                if(!rc) {
+                  console.log(
+                      'WARNING: For this experiment, run number range is ' +
+                      `[0 - ${x.combinations.length - 1}]`);
+                  return;
+                }
+              }
+              SETTINGS.run_index = 0;
+              EXPERIMENT_MANAGER.callback = () => {
+                  SETTINGS.run_index++;
+                  if(SETTINGS.run_index < SETTINGS.x_runs.length) {
+                    EXPERIMENT_MANAGER.startExperiment(
+                        SETTINGS.x_runs[SETTINGS.run_index]);
+                  } else {
+                    VM.callback = null;
+                  }
+                };
+              EXPERIMENT_MANAGER.startExperiment(SETTINGS.x_runs[0]);
             }
           }
         }