linny-r 1.7.0 → 1.7.2

package/static/scripts/linny-r-gui-paper.js

@@ -1584,10 +1584,10 @@ class Paper {
       if(luc && MODEL.infer_cost_prices &&
          af > VM.MINUS_INFINITY && af < VM.PLUS_INFINITY
         ) {
-        // Assume no cost price to be displayed
+        // Assume no cost price to be displayed.
         s = '';
         let soc = 0;
-        // NOTE: flows INTO processes always carry cost
+        // NOTE: Flows INTO processes always carry cost.
         if(luc.to_node instanceof Process) {
           soc = 1;
           prod = luc.from_node;
@@ -1607,7 +1607,7 @@ class Paper {
             // ... unless it is a flow of a by-product having a market
             // value (+ or -)
             if(cp !== 0) {
-              //Just in case, check for error codes (if so, display them)
+              // Just in case, check for error codes (if so, display them).
               if(cp < VM.MINUS_INFINITY) {
                 s = VM.sig4Dig(cp);
               } else if(cp < 0) {
@@ -1616,53 +1616,57 @@ class Paper {
             }
           }
         } else {
+          const d = luc.actualDelay(MODEL.t);
           if(af > 0) {
-            // Positive flow => use cost price of FROM node
+            // Positive flow => use cost price of FROM node.
             if(luc.from_node instanceof Process) {
               // For processes, this is their cost price per level
-              // DIVIDED BY the relative rate of the link
+              // DIVIDED BY the relative rate of the link.
               const rr = luc.relative_rate.result(MODEL.t);
               if(Math.abs(rr) < VM.NEAR_ZERO) {
                 cp = (rr < 0 && cp < 0 || rr > 0 && cp > 0 ?
                     VM.PLUS_INFINITY : VM.MINUS_INFINITY);
               } else {
-                cp = proc.costPrice(MODEL.t) / rr;
+                cp = proc.costPrice(MODEL.t - d) / rr;
               }
             } else if(prod.price.defined) {
               // For products their market price if defined...
-              cp = prod.price.result(MODEL.t);
+              cp = prod.price.result(MODEL.t - d);
             } else {
-              // ... otherwise their cost price
-              cp = prod.costPrice(MODEL.t);
+              // ... otherwise their cost price.
+              cp = prod.costPrice(MODEL.t - d);
             }
           } else {
-            // Negative flow => use cost price of TO node
+            // Negative flow => use cost price of TO node.
             if(luc.to_node instanceof Process) {
+              // NOTE: Input links have no delay.
               cp = proc.costPrice(MODEL.t);
             } else if(prod.price.defined) {
-              cp = prod.price.result(MODEL.t);
+              cp = prod.price.result(MODEL.t - d);
             } else {
-              cp = prod.costPrice(MODEL.t);
+              cp = prod.costPrice(MODEL.t - d);
             }
           }
-          // NOTE: the first condition ensures that error codes will be displayed
+          // NOTE: The first condition ensures that error codes will be
+          // displayed.
           if(cp <= VM.MINUS_INFINITY || cp >= VM.PLUS_INFINITY) {
             s = VM.sig4Dig(cp);
           } else if(Math.abs(cp) <= VM.SIG_DIF_FROM_ZERO) {
-            // DO not display CP when it is "propagated" NO_COST
+            // DO not display CP when it is "propagated" NO_COST.
             s = (cp === VM.NO_COST ? '' : '0');
           } else {
-            // NOTE: use the absolute value of the flow, as cost is not affected by direction
+            // NOTE: Use the absolute value of the flow, as cost is not
+            // affected by direction.
             s = VM.sig4Dig(Math.abs(af) * soc * cp);
           }
         }
-        // Only display cost price if it is meaningful
+        // Only display cost price if it is meaningful.
         if(s) {
           font_color = 'gray';
           bb = this.numberSize(s, 8, font_weight);
           tw = bb.width;
           th = bb.height;
-          // NOTE: offset cost price label relative to actual flow label
+          // NOTE: Offset cost price label relative to actual flow label.
           epy += th + 1;
           arrw.shape.addRect(epx, epy, tw, th, {'fill': this.palette.cost_price});
           arrw.shape.addNumber(epx, epy, s, {'fill': font_color});
@@ -1671,15 +1675,16 @@ class Paper {
     } // end IF l > 0 and actual flow is defined and non-zero
 
     if(l > 0) {
-      // NOTE: make the arrow shape nearly transparant when it connects to a
-      // product that has the "hide links" option selected
+      // NOTE: Make the arrow shape nearly transparant when it connects
+      // to a product that has the "hide links" option selected.
       if(arrw.from_node.no_links || arrw.to_node.no_links) {
         arrw.shape.element.setAttribute('opacity', 0.08);
       }
       arrw.shape.appendToDOM();
       return true;
     }
-    // If nothing is drawn, return FALSE although this does NOT imply an error
+    // If nothing is drawn, return FALSE although this does NOT imply an
+    // error.
     return false;
   }
   
@@ -2107,16 +2112,16 @@ class Paper {
         const ubs = (ub >= VM.PLUS_INFINITY && !proc.upper_bound.defined ?
             '\u221E' : VM.sig4Dig(ub));
         if(Math.abs(lb) > VM.NEAR_ZERO) {
-          // If lb <> 0 then lb...ub (with ellipsis)
+          // If lb <> 0 then lb...ub (with ellipsis).
           s += '\u2026' + ubs;
         } else {
-          // If lb = 0 show only the upper bound
+          // If lb = 0 show only the upper bound.
           s = ubs;
           lbw = 0;
         }
       }
       // Keep track of the width of the boundary text, as later it may be
-      // followed by more text
+      // followed by more text.
       const
           bb = this.numberSize(s),
           btw = bb.width + 2,
@@ -2125,18 +2130,18 @@ class Paper {
           ty = y - hh + sh/2 + 1;
       proc.shape.addNumber(tx + btw/2, ty, s,
           {fill: 'black', 'font-style': bfs});
-      // Show start/stop-related status right of the process boundaries
-      // NOTE: lb must be > 0 for start/stop to work
+      // Show start/stop-related status right of the process boundaries.
+      // NOTE: lb must be > 0 for start/stop to work.
       if(proc.level_to_zero && lbw) {
         font_color = 'black';
-        // Underline the lower bound to indicate semi-continuity
+        // Underline the lower bound to indicate semi-continuity.
         proc.shape.addPath(
             ['M', tx + lbo, ',', ty + sh/2, 'L', tx + lbo + lbw, ',', ty + sh/2],
             {'fill': 'none', stroke: font_color, 'stroke-width': 0.4});
-        // By default, no ON/OFF indicator
+        // By default, no ON/OFF indicator.
         s = '';
         if(MODEL.solved && l !== VM.UNDEFINED) {
-          // Solver has been active
+          // Solver has been active.
           const
               pl = proc.actualLevel(MODEL.t - 1),
               su = proc.start_ups.indexOf(MODEL.t),
@@ -2145,36 +2150,36 @@ class Paper {
             // Process is ON
             if(Math.abs(pl) < VM.NEAR_ZERO && su >= 0) {
               font_color = this.palette.switch_on_off;
-              // Start-up arrow or first-commit asterisk
+              // Start-up arrow or first-commit asterisk.
               s = VM.LM_SYMBOLS[su ? VM.LM_STARTUP : VM.LM_FIRST_COMMIT];
             } else if(su >= 0) {
               font_color = 'black';
-              s = '\u25B3'; // Outline triangle up to indicate anomaly
+              s = '\u25B3'; // Outline triangle up to indicate anomaly.
             }
             if(sd >= 0) {
-              // Should not occur, as for shut-down, level should be 0
+              // Should not occur, as for shut-down, level should be 0.
               font_color = 'black';
-              s += '\u25BD'; // Add outline triangle down to indicate anomaly
+              s += '\u25BD'; // Add outline triangle down to indicate anomaly.
             }
           } else {
-            // Process is OFF => check previous level
+            // Process is OFF => check previous level.
            if(Math.abs(pl) > VM.NEAR_ZERO && sd >= 0) {
-              // Process was on, and is now switched OFF
+              // Process was on, and is now switched OFF.
               font_color = this.palette.switch_on_off;
               s = VM.LM_SYMBOLS[VM.LM_SHUTDOWN];
             } else if(sd >= 0) {
               font_color = 'black';
-              s = '\u25BD'; // Outline triangle down to indicate anomaly
+              s = '\u25BD'; // Outline triangle down to indicate anomaly.
             }
             if(su >= 0) {
-              // Should not occur, as for start-up, level should be > 0
+              // Should not occur, as for start-up, level should be > 0.
               font_color = 'black';
-              s += '\u25B3'; // Add outline triangle up to indicate anomaly
+              s += '\u25B3'; // Add outline triangle up to indicate anomaly.
             }
           }
         }
         if(s) {
-          // Special symbols are 5 pixels wide and 9 high
+          // Special symbols are 5 pixels wide and 9 high.
           proc.shape.addText(x - hw + btw + 5, y - hh + 4.5, s,
               {fill: font_color});
         }

package/static/scripts/linny-r-gui-receiver.js

@@ -199,7 +199,7 @@ class GUIReceiver {
                       // Keep listening, so check again after the time interval
                       setTimeout(() => RECEIVER.listen(), RECEIVER.interval);
                     })
-                  .catch(() => UI.warn(UI.WARNING.NO_CONNECTION, err));
+                  .catch((err) => UI.warn(UI.WARNING.NO_CONNECTION, err));
               } else {
                 RECEIVER.log('Executing: ' + RECEIVER.file_name);
                 // NOTE: Virtual Machine will trigger the receiver's reporting
@@ -216,7 +216,7 @@ class GUIReceiver {
             }
           }
         })
-      .catch(() => UI.warn(UI.WARNING.NO_CONNECTION, err));
+      .catch((err) => UI.warn(UI.WARNING.NO_CONNECTION, err));
   }
 
   report() {
@@ -232,7 +232,7 @@ class GUIReceiver {
     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.
@@ -284,7 +284,7 @@ class GUIReceiver {
           // the Experiment Manager.
           if(RECEIVER.active && !RECEIVER.experiment) RECEIVER.callBack();
         })
-      .catch(() => UI.warn(UI.WARNING.NO_CONNECTION, err));
+      .catch((err) => UI.warn(UI.WARNING.NO_CONNECTION, err));
   }
 
   callBack() {
@@ -317,7 +317,7 @@ class GUIReceiver {
             }
           }
         })
-      .catch(() => UI.warn(UI.WARNING.NO_CONNECTION, err));
+      .catch((err) => UI.warn(UI.WARNING.NO_CONNECTION, err));
   }
 
 } // END of class GUIReceiver