linny-r 1.5.3 → 1.5.4

package/package.json

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

package/server.js

@@ -160,25 +160,46 @@ const SERVER = http.createServer((req, res) => {
     }
   });
 
-// Start listening at the specified port number
-console.log('Listening at: http://127.0.0.1:' + SETTINGS.port);
-SERVER.listen(SETTINGS.port);
-
-// Finally, launch the GUI if this command line argument is set
-if(SETTINGS.launch) {
-  console.log('Launching Linny-R in the default browser'); 
-  const cmd = (PLATFORM.startsWith('win') ? 'start' : 'open');
-  child_process.exec(cmd + ' http://127.0.0.1:' + SETTINGS.port,
-      (error, stdout, stderr) => {
-          if(error) {
-            console.log('NOTICE: Failed to launch GUI in browser');
-            console.log(error);
-            console.log(stdout);
-            console.log(stderr);
-          }
-        });
+// Prepare for error on start-up.
+SERVER.on('error', (err) => {
+    if(err.code === 'EADDRINUSE') {
+      success = false;
+      console.log('ERROR: Port', SETTINGS.port, 'is already in use.');    
+      console.log('Some Linny-R server may be in another CLI box -- Please check.');
+    } else {
+      throw err;
+    }
+  });
+
+// Start listening at the specified port number.
+const options = {
+    port: SETTINGS.port,
+    exclusive: true
+  };
+SERVER.listen(options, launchGUI);
+
+
+function launchGUI(err) {
+  if(SERVER.listening) {
+    console.log('Listening at: http://127.0.0.1:' + SETTINGS.port);
+  }
+  // Launch the GUI if this command line argument is set.
+  if(SETTINGS.launch) {
+    console.log('Launching Linny-R in the default browser'); 
+    const cmd = (PLATFORM.startsWith('win') ? 'start' : 'open');
+    child_process.exec(cmd + ' http://127.0.0.1:' + SETTINGS.port,
+        (error, stdout, stderr) => {
+            if(error) {
+              console.log('NOTICE: Failed to launch GUI in browser');
+              console.log(error);
+              console.log(stdout);
+              console.log(stderr);
+            }
+          });
+  }
 }
 
+
 // Server action logging functionality
 // ===================================
 // Only actions are logged to the console as with date and time;

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

@@ -1155,7 +1155,8 @@ class ExperimentManager {
   selectedRuns(chart) {
     // Return list of run numbers selected in the Experiment Manager.
     const selx = this.selected_experiment;
-    if(CHART_MANAGER.runs_chart && selx && selx.charts.indexOf(chart) >= 0) {
+    if(CHART_MANAGER.runs_chart && selx &&
+       (selx.charts.indexOf(chart) >= 0 || CHART_MANAGER.runs_stat)) {
       return selx.chart_combinations;
     }
     return [];

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

@@ -865,7 +865,7 @@ class GUIChartManager extends ChartManager {
   }
 
   drawTable() {
-    // Shows the statistics on the chart variables
+    // Shows the statistics on the chart variables.
     const html = [];
     let vbl = [];
     if(this.chart_index >= 0) vbl = MODEL.charts[this.chart_index].variables;
@@ -1002,8 +1002,8 @@ class GUIChartManager extends ChartManager {
   }
 
   drawChart() {
-    // Displays the selected chart unless an experiment is running, or already
-    // busy with an earlier drawChart call
+    // Displays the selected chart unless an experiment is running, or
+    // already busy with an earlier drawChart call.
     if(MODEL.running_experiment) {
       UI.notify(UI.NOTICE.NO_CHARTS);
     } else if(this.chart_index >= 0 && !this.drawing_chart) {