linny-r 1.6.8 → 1.7.0

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

@@ -88,7 +88,6 @@ class LinnyRModel {
     this.selected_round = 0;
     
     // Model settings
-    this.timeout_period = 30; // max. solver time in seconds
     this.block_length = 1;
     this.start_period = 1; // defines starting point in datasets
     this.end_period = 1;
@@ -99,6 +98,12 @@ class LinnyRModel {
     this.report_results = false;
     this.show_block_arrows = true;
     this.last_zoom_factor = 1;
+    
+    // Default solver settings
+    this.timeout_period = 30; // max. solver time in seconds
+    this.preferred_solver = ''; // empty string denotes "use default"
+    this.integer_tolerance = 5e-7; // integer feasibility tolerance
+    this.MIP_gap = 1e-4; // relative MIP gap
 
     // Sensitivity-related properties
     this.base_case_selectors = '';
@@ -140,17 +145,18 @@ class LinnyRModel {
   /* METHODS THAT LOOKUP ENTITIES, OR INFER PROPERTIES */
 
   get simulationTimeStep() {
-    // Returns actual model time step, rather than `t`, which is relative to the
-    // start of the simulation period
+    // Return actual model time step, rather than `t`, which is relative
+    // to the start of the simulation period.
     return this.t + this.start_period - 1;
   }
   
   get timeStepDuration() {
-    // Returns duration of 1 time step in hours
+    // Return duration of 1 time step in hours.
     return this.time_scale * VM.time_unit_values[this.time_unit];
   }
   
   get outcomes() {
+    // Return the list of outcome datasets.
     const olist = [];
     for(let k in this.datasets) if(this.datasets.hasOwnProperty(k)) {
       if(this.datasets[k].outcome) olist.push(this.datasets[k]);
@@ -2631,17 +2637,17 @@ class LinnyRModel {
   }
 
   initFromXML(node) {
-    // Initialize a model from the XML tree with `node` as root
-    // NOTE: do NOT reset and initialize basic model properties when *including*
-    // a module into the current model
-    // NOTE: obsolete XML nodes indicate: legacy Linny-R model
+    // Initialize a model from the XML tree with `node` as root.
+    // NOTE: do NOT reset and initialize basic model properties when
+    // *including* a module into the current model.
+    // NOTE: Obsolete XML nodes indicate: legacy Linny-R model.
     const legacy_model = (nodeParameterValue(node, 'view-options') +
         nodeParameterValue(node, 'autosave') +
         nodeParameterValue(node, 'look-ahead') +
         nodeParameterValue(node, 'save-series') +
         nodeParameterValue(node, 'show-lp') +
         nodeParameterValue(node, 'optional-slack')).length > 0;
-    // Flag to set when legacy time series data are added 
+    // Flag to set when legacy time series data are added.
     this.legacy_datasets = false;
     if(!IO_CONTEXT) {
       this.reset();
@@ -2668,7 +2674,12 @@ class LinnyRModel {
       this.version = xmlDecoded(nodeContentByTag(node, 'version'));
       this.timeout_period = Math.max(0,
           safeStrToInt(nodeContentByTag(node, 'timeout-period')));
-      // Legacy models have tag "optimization-period" instead of "block-length"
+      this.preferred_solver = xmlDecoded(
+          nodeContentByTag(node, 'preferred-solver')); 
+      this.integer_tolerance = safeStrToFloat(
+          nodeContentByTag(node, 'integer-tolerance'), 5e-7);
+      this.MIP_gap = safeStrToFloat(nodeContentByTag(node, 'mip-gap'), 1e-4);
+      // Legacy models have tag "optimization-period" instead of "block-length".
       const bl_str = nodeContentByTag(node, 'block-length') ||
           nodeContentByTag(node, 'optimization-period'); 
       this.block_length = Math.max(1, safeStrToInt(node, bl_str));
@@ -2693,7 +2704,7 @@ class LinnyRModel {
       if(!this.default_unit) this.default_unit = CONFIGURATION.default_scale_unit;
     } // END IF *not* including a model
 
-    // Declare some local variables that will be used a lot
+    // Declare some local variables that will be used a lot.
     let i,
         c,
         name,
@@ -3014,7 +3025,10 @@ class LinnyRModel {
         '</default-scale-unit><currency-unit>', xmlEncoded(this.currency_unit),
         '</currency-unit><grid-pixels>', this.grid_pixels,
         '</grid-pixels><timeout-period>', this.timeout_period,
-        '</timeout-period><block-length>', this.block_length,
+        '</timeout-period><preferred-solver>', xmlEncoded(this.preferred_solver), 
+        '</preferred-solver><integer-tolerance>', this.integer_tolerance,
+        '</integer-tolerance><mip-gap>', this.MIP_gap,
+        '</mip-gap><block-length>', this.block_length,
         '</block-length><start-period>', this.start_period,
         '</start-period><end-period>', this.end_period,
         '</end-period><look-ahead-period>', this.look_ahead,

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

@@ -2328,7 +2328,13 @@ class VirtualMachine {
     // Statistics that can be calculated for outcomes and experiment run results
     this.outcome_statistics =
       ['LAST', 'MAX', 'MEAN', 'MIN', 'N', 'NZ', 'SD', 'SUM', 'VAR'];
-    }
+    this.solver_names = {
+      gurobi: 'Gurobi',
+      cplex: 'CPLEX',
+      scip: 'SCIP',
+      lp_solve: 'LP_solve'
+    };
+  }
 
   reset() {
     // Reset the virtual machine so that it can execute the model again.
@@ -2945,6 +2951,7 @@ class VirtualMachine {
       return obj.la_peak_inc[c];
     }
     const prior_level = obj.actualLevel(t);
+//console.log('HERE obj prilev t', obj.displayName, prior_level, t, obj.level);
     if(type === 'OO') return prior_level > 0 ? 1 : 0;
     if(type === 'IZ') return prior_level === 0 ? 1 : 0;
     // Start-up at time t entails that t is in the list of start-up
@@ -4305,7 +4312,7 @@ class VirtualMachine {
     // Return floating point number `n`, or +INF or -INF if the absolute
     // value of `n` is relatively (!) close to the VM infinity constants
     // (since the solver may return imprecise values of such magnitude).
-    if(n > 0.5 * VM.PLUS_INFINITY && n < VM.BEYOND_PLUS_INFINITY) {
+      if(n > 0.5 * VM.PLUS_INFINITY && n < VM.BEYOND_PLUS_INFINITY) {
       return VM.PLUS_INFINITY;
     } 
     if(n < 0.5 * VM.MINUS_INFINITY && n > VM.BEYOND_MINUS_INFINITY) {
@@ -5719,7 +5726,7 @@ Solver status = ${json.status}`);
   }  
 
   submitFile() {
-    // Prepares to POST the model file (LP or MPS) to the Linny-R server.
+    // Prepare to POST the model file (LP or MPS) to the Linny-R server.
     // NOTE: The tableau is no longer needed, so free up its memory.
     this.resetTableau();
     if(this.numeric_issue) {
@@ -5772,6 +5779,13 @@ Solver status = ${json.status}`);
   solveModel() {
     // Start the sequence of data loading, model translation, solving
     // consecutive blocks, and finally calculating dependent variables.
+    // NOTE: Do this only if the model defines a MILP problem, i.e.,
+    // contains at least one process or product.
+    if(!(Object.keys(MODEL.processes).length ||
+        Object.keys(MODEL.products).length)) {
+      UI.notify('Nothing to solve');
+      return;
+    }
     const n = MODEL.loading_datasets.length;
     if(n > 0) {
       // Still within reasonable time? (3 seconds per dataset)
@@ -5780,7 +5794,7 @@ Solver status = ${json.status}`);
         UI.setMessage(`Waiting for ${pluralS(n, 'dataset')} to load`);
         // Decrease the remaining time to wait (half second units)
         MODEL.max_time_to_load--;
-        // Try again after half a second
+        // Try again after half a second.
         setTimeout(() => VM.solveModel(), 500);
         return;
       } else {