linny-r 1.2.0 → 1.3.0

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

@@ -12,7 +12,7 @@ executed by the VM, construct the Simplex tableau that can be sent to the
 MILP solver.
 */
 /*
-Copyright (c) 2017-2022 Delft University of Technology
+Copyright (c) 2017-2023 Delft University of Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -834,7 +834,7 @@ class ExpressionParser {
         return [stat, list, anchor1, offset1, anchor2, offset2];
       }
       this.error = `No entities that match pattern "${patstr}"` +
-          (attr ? ' and have attribute ' + attr : '');
+          (attr ? ' and have attribute ' + attr : ' when no attribute is specified');
       return false;
     }
     
@@ -1428,6 +1428,8 @@ class VirtualMachine {
     this.lines = '';
     // String specifying a numeric issue (empty if none)
     this.numeric_issue = '';
+    // Warnings are stored in a list to permit browsing through them
+    this.issue_list = [];
     // The call stack tracks evaluation of "nested" expression variables
     this.call_stack = [];
     this.block_count = 0;
@@ -1553,6 +1555,9 @@ class VirtualMachine {
       this.ERROR, this.CYCLIC, this.DIV_ZERO, this.BAD_CALC, this.ARRAY_INDEX,
       this.BAD_REF, this.UNDERFLOW, this.OVERFLOW, this.INVALID, this.PARAMS,
       this.UNKNOWN_ERROR, this.UNDEFINED, this.NOT_COMPUTED, this.COMPUTING];
+    
+    // Prefix for warning messages that are logged in the monitor
+    this.WARNING = '-- Warning: ';
 
     // Solver constants indicating constraint type
     // NOTE: these correspond to the codes used by LP_solve; when generating
@@ -1695,6 +1700,10 @@ class VirtualMachine {
     // Initialize error counters (error count will be reset to 0 for each block)
     this.error_count = 0;
     this.block_issues = 0;
+    // Clear issue list with warnings and hide issue panel
+    this.issue_list.length = 0;
+    this.issue_index = -1;
+    UI.updateIssuePanel();
     // NOTE: special tracking of potential solver license errors
     this.license_expired = 0;
     // Reset solver result arrays
@@ -2085,6 +2094,10 @@ class VirtualMachine {
       this.messages[block - 1] = '';
     }
     this.messages[block - 1] += msg + '\n';
+    if(msg.startsWith(this.WARNING)) {
+      this.error_count++;
+      this.issue_list.push(msg);
+    }
     // Show message on console or in Monitor dialog
     MONITOR.logMessage(block, msg);
   }
@@ -2125,7 +2138,7 @@ class VirtualMachine {
       MONITOR.updateContent('msg');
     }
   }
-
+  
   startTimer() {
     // Record time of this reset
     this.reset_time = new Date().getTime();
@@ -3627,14 +3640,12 @@ class VirtualMachine {
         a.cash_flow[b] = a.cash_in[b] - a.cash_out[b];
         // Count occurrences of a negative cash flow (threshold -0.5 cent)
         if(a.cash_in[b] < -0.005) {
-          this.logMessage(block, `-- Warning: (t=${b}${round}) ` +
+          this.logMessage(block, `${this.WARNING}(t=${b}${round}) ` +
               a.displayName + ' cash IN = ' + a.cash_in[b].toPrecision(2));
-          this.error_count++;
         }
         if(a.cash_out[b] < -0.005) {
-          this.logMessage(block, `-- Warning: (t=${b}${round}) ` +
+          this.logMessage(block, `${this.WARNING}(t=${b}${round}) ` +
               a.displayName + ' cash IN = ' + a.cash_out[b].toPrecision(2));
-          this.error_count++;
         }
         // Advance column offset in tableau by the # cols per time step
         j += this.cols;
@@ -3754,7 +3765,7 @@ class VirtualMachine {
                 v[1].constraint.slack_info[b] = v[0];
               }
               if(absl > VM.SIG_DIF_FROM_ZERO) {
-                this.logMessage(block, `-- Warning: (t=${b}${round}) ` +
+                this.logMessage(block, `${this.WARNING}(t=${b}${round}) ` +
                     `${v[1].displayName} ${v[0]} slack = ${this.sig4Dig(slack)}`);
                 if(v[1] instanceof Product) {
                   const ppc = v[1].productPositionClusters;
@@ -3762,7 +3773,6 @@ class VirtualMachine {
                     ppc[ci].usesSlack(b, v[1], v[0]);
                   }
                 }
-                this.error_count++;
               } else if(CONFIGURATION.slight_slack_notices) {
                 this.logMessage(block, '-- Notice: (t=' + b + round + ') ' +
                    v[1].displayName + ' ' + v[0] + ' slack = ' +
@@ -3932,9 +3942,8 @@ class VirtualMachine {
       b = bb;
       for(let i = 0; i < this.chunk_length; i++) {
         if(!MODEL.calculateCostPrices(b)) {
-          this.logMessage(block, '-- Warning: (t=' + b +
-              ') Invalid cost prices due to negative flow(s)');
-          this.error_count++;
+          this.logMessage(block, `${this.WARNING}(t=${b}) ` +
+              'Invalid cost prices due to negative flow(s)');
         }
         // move to the next time step of the block
         b++;
@@ -4729,9 +4738,11 @@ Solver status = ${json.status}`);
       // If experiment is active, signal the manager
       if(MODEL.running_experiment) EXPERIMENT_MANAGER.processRun();
       // Warn modeler if any issues occurred
-      if(this.block_issues) UI.warn('Issues occurred in ' +
-          pluralS(this.block_issues, 'block') +
-          ' -- check messages in monitor');
+      if(this.block_issues) {
+        UI.warn('Issues occurred in ' + pluralS(this.block_issues, 'block') +
+          ' -- details can be viewed in the monitor and by using \u25C1 \u25B7');
+        UI.updateIssuePanel();
+      }
       if(this.license_expired > 0) {
         // Special message to draw attention to this critical error
         UI.alert('SOLVER LICENSE EXPIRED: Please check!');
@@ -5189,15 +5200,15 @@ function relativeTimeStep(t, anchor, offset, dtm, x) {
   }
   if(anchor === 'c') {
     // Relative to start of current optimization block
-    return VM.block_start + offset;
+    return Math.trunc(t / MODEL.block_length) * MODEL.block_length + offset;
   }
   if(anchor === 'p') {
     // Relative to start of previous optimization block
-    return VM.block_start - MODEL.block_length + offset;
+    return (Math.trunc(t / MODEL.block_length) - 1) * MODEL.block_length + offset;
   }
   if(anchor === 'n') {
     // Relative to start of next optimization block
-    return VM.block_start + MODEL.block_length + offset;
+    return (Math.trunc(t / MODEL.block_length) + 1) * MODEL.block_length + offset;
   }
   if(anchor === 'l') {
     // Last: offset relative to the last index in the vector