linny-r 2.0.12 → 2.1.1

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

@@ -319,7 +319,7 @@ function compareTailFirst(a, b, tail) {
 }
 
 function endsWithDigits(str) {
-  // Returns trailing digts of `str` (empty string will evaluate as FALSE)
+  // Return trailing digts of `str` (empty string will evaluate as FALSE).
   let i = str.length - 1,
       c = str[i],
       d = '';
@@ -332,8 +332,8 @@ function endsWithDigits(str) {
 }
 
 function indexOfMatchingBracket(str, offset) {
-  // Returns index of closing bracket, ignoring matched [...] inside
-  // NOTE: starts at offset + 1, assuming that character at offset = '['
+  // Return index of closing bracket, ignoring matched [...] inside.
+  // NOTE: Start at offset + 1, assuming that character at offset = '['.
   let ob = 0, c;
   for(let i = offset + 1; i < str.length; i++) {
     c = str.charAt(i);
@@ -347,12 +347,12 @@ function indexOfMatchingBracket(str, offset) {
       }
     }
   }
-  // No matching bracket => return -1
+  // No matching bracket => return -1.
   return -1;
 }
 
 function monoSpaced(vbl) {
-  // Removes all non-essential spaces from variable reference `vbl`.
+  // Remove all non-essential spaces from variable reference `vbl`.
   // First reduce all whitespace to a single space.
   return vbl.replace(/\s+/g, ' ')
        // Then remove spaces after the opening bracket.
@@ -834,13 +834,11 @@ function customizeXML(str) {
   // and then load it again for the customization to be performed.
   if(str.indexOf('!!CUSTOMIZE</name><author>') >= 0) {
     // Modify `str` -- by default, do nothing, but typical modifications
-    // will replace RexEx patterns by other strings.
-    
-/*
+    // will replace RexEx patterns by other strings.    
+
     const
-        re = /xyz/gi,
-        r = 'abc';
-*/
+        re = /pattern/g,
+        r = 'replacement';
 
     // Trace the changes to the console.
     console.log('Customizing:', re, r);
@@ -868,8 +866,8 @@ function cleanXML(node) {
 }
 
 function parseXML(xml) {
-  // Parses string `xml` into an XML document, and returns its root node
-  // (or null if errors)
+  // Parse string `xml` into an XML document, and returns its root node
+  // (or null if errors).
   xml = XML_PARSER.parseFromString(customizeXML(xml), 'application/xml');
   const
       de = xml.documentElement,
@@ -880,8 +878,8 @@ function parseXML(xml) {
 }
 
 function childNodeByTag(node, tag) {
-  // Returns the XML child node of `node` having node name `tag`, or NULL if
-  // no such child node exists
+  // Return the XML child node of `node` having node name `tag`, or NULL if
+  // no such child node exists.
   let cn = null;
   for (let i = 0; i < node.childNodes.length; i++) {
     if(node.childNodes[i].tagName === tag) {
@@ -893,19 +891,19 @@ function childNodeByTag(node, tag) {
 }
 
 function nodeContentByTag(node, tag) {
-  // Returns the text content of the child node of `node` having name `tag`,
-  // or the empty string if no such node exists
+  // Return the text content of the child node of `node` having name `tag`,
+  // or the empty string if no such node exists.
   return nodeContent(childNodeByTag(node, tag));
 }
 
 function nodeContent(node) {
-  // Returns the text content of XML element `node`
+  // Return the text content of XML element `node`.
   if(node) {
-    // For text nodes, return their value
+    // For text nodes, return their value.
     if(node.nodeType === 3) return node.nodeValue;
-    // For empty nodes, return empty string
+    // For empty nodes, return empty string.
     if(node.childNodes.length === 0) return '';
-    // If first child is text, return its value
+    // If first child is text, return its value.
     const fcn = node.childNodes.item(0);
     if(fcn && fcn.nodeType === 3) return fcn.nodeValue;
     console.log('UNEXPECTED XML', fcn.nodeType, node);
@@ -914,8 +912,8 @@ function nodeContent(node) {
 }
 
 function nodeParameterValue(node, param) {
-  // Returns the value of parameter `param` as string if `node` has
-  // this parameter, otherwise the empty string
+  // Return the value of parameter `param` as string if `node` has
+  // this parameter, otherwise the empty string.
   const a = node.getAttribute(param);
   return a || '';
 }

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

@@ -309,7 +309,7 @@ class Expression {
     if(DEBUGGING) {
       // Show the "time step stack" for --START and --STOP
       if(action.startsWith('--') || action.startsWith('"')) {
-        action = `[${step.join(', ')}] ${action}`;
+        action = `[${this.step.join(', ')}] ${action}`;
       }
       console.log(action);
     }
@@ -2903,7 +2903,11 @@ class VirtualMachine {
         vlist = [],
         xlist = [];
     for(const x of this.call_stack) {
-      vlist.push(x.object.displayName + '|' + x.attribute);
+      // For equations, only show the attribute.
+      const ons = (x.object === MODEL.equations_dataset ?
+          (x.attribute.startsWith(':') ? x.method_object_prefix : '') :
+              x.object.displayName + '|');
+      vlist.push(ons + x.attribute);
       // Trim spaces around all object-attribute separators in the
       // expression as entered by the modeler.
       xlist.push(x.text.replace(/\s*\|\s*/g, '|'));
@@ -6933,7 +6937,8 @@ function VMI_push_method(x, args) {
   // and possibly also the entity to be used as its object.
   // NOTE: Methods can only be called "as is" (without prefix) in a
   // method expression. The object of such "as is" method calls is
-  // the object of the calling method expression `x`.
+  // the object of the calling method expression `x`, or for chart
+  // variables the method object selected for the chart.
   const
       method = args[0].meq,
       mex = method.expression,
@@ -7675,7 +7680,13 @@ function VMI_add(x) {
   const d = x.pop();
   if(d !== false) {
     if(DEBUGGING) console.log('ADD (' + d.join(', ') + ')');
-    x.retop(d[0] + d[1]);
+    if(Math.abs(d[0]) === VM.PLUS_INFINITY) {
+      x.retop(d[0]);
+    } else if(Math.abs(d[1]) === VM.PLUS_INFINITY) {
+      x.retop(d[1]);
+    } else {
+      x.retop(d[0] + d[1]);
+    }
   }
 }
 
@@ -7685,17 +7696,27 @@ function VMI_sub(x) {
   const d = x.pop();
   if(d !== false) {
     if(DEBUGGING) console.log('SUB (' + d.join(', ') + ')');
-    x.retop(d[0] - d[1]);
+    if(d[0] === VM.PLUS_INFINITY || d[1] === VM.MINUS_INFINITY) {
+      x.retop(VM.PLUS_INFINITY);
+    } else if(d[0] === VM.MINUS_INFINITY || d[1] === VM.PLUS_INFINITY) {
+      x.retop(VM.MINUS_INFINITY);
+    } else {
+      x.retop(d[0] + d[1]);
+    }
   }
 }
 
 function VMI_mul(x) {
   // Pop the top number on the stack, and multiply it with the new
-  // top number
+  // top number.
   const d = x.pop();
   if(d !== false) {
     if(DEBUGGING) console.log('MUL (' + d.join(', ') + ')');
-    x.retop(d[0] * d[1]);
+    if(Math.abs(d[0]) === VM.PLUS_INFINITY || Math.abs(d[1]) === VM.PLUS_INFINITY) {
+      x.retop(VM.PLUS_INFINITY * Math.sign(d[0] * d[1]));
+    } else {
+      x.retop(d[0] * d[1]);
+    }
   }
 }
 
@@ -7707,7 +7728,19 @@ function VMI_div(x) {
     if(DEBUGGING) console.log('DIV (' + d.join(', ') + ')');
     if(Math.abs(d[1]) <= VM.NEAR_ZERO) {
       x.retop(VM.DIV_ZERO);
+    } else if(Math.abs(d[0]) === VM.PLUS_INFINITY) {
+      if(Math.abs(d[1]) === VM.PLUS_INFINITY) {
+        // Treat INF / INF as 1.
+        x.retop(Math.sign(d[0]) * Math.sign(d[1]));
+      } else {
+        // Push the + or - infinity value.
+        x.retop(d[0]);
+      }
+    } else if(Math.abs(d[1]) === VM.PLUS_INFINITY) {
+      // Treat N / Infinity as 0 for any non-infinite value of N.
+      x.retop(0);
     } else {
+      // Standard division.
       x.retop(d[0] / d[1]);
     }
   }
@@ -7722,7 +7755,19 @@ function VMI_div_zero(x) {
     if(DEBUGGING) console.log('DIV-ZERO (' + d.join(', ') + ')');
     if(Math.abs(d[1]) <= VM.NEAR_ZERO) {
       x.retop(d[0]);
+    } else if(Math.abs(d[0]) === VM.PLUS_INFINITY) {
+      if(Math.abs(d[1]) === VM.PLUS_INFINITY) {
+        // Treat INF / INF as 1.
+        x.retop(Math.sign(d[0]) * Math.sign(d[1]));
+      } else {
+        // Push the + or - infinity value.
+        x.retop(d[0]);
+      }
+    } else if(Math.abs(d[1]) === VM.PLUS_INFINITY) {
+      // Treat N / Infinity as 0 for any non-infinite value of N.
+      x.retop(0);
     } else {
+      // Standard division.
       x.retop(d[0] / d[1]);
     }
   }
@@ -7738,6 +7783,9 @@ function VMI_mod(x) {
     if(DEBUGGING) console.log('DIV (' + d.join(', ') + ')');
     if(Math.abs(d[1]) <= VM.NEAR_ZERO) {
       x.retop(VM.DIV_ZERO);
+    } else if(Math.abs(d[0]) === VM.PLUS_INFINITY || Math.abs(d[1]) === VM.PLUS_INFINITY) {
+      // If either operand is infinite, return 0 as remainder.
+      x.retop(0);
     } else {
       x.retop(d[0] % d[1]);  // % is the modulo operator in JavaScript.
     }
@@ -7759,7 +7807,16 @@ function VMI_power(x) {
   const d = x.pop();
   if(d !== false) {
     if(DEBUGGING) console.log('POWER (' + d.join(', ') + ')');
-    x.retop(Math.pow(d[0], d[1]));
+    const r = Math.pow(d[0], d[1]);
+    if(isNaN(r)) {
+      x.retop(VM.BAD_CALC);
+    } else if(r >= VM.PLUS_INFINITY) {
+      x.retop(VM.PLUS_INFINITY);
+    } else if(r <= VM.MINUS_INFINITY) {
+      x.retop(VM.MINUS_INFINITY);
+    } else {
+      x.retop(r);
+    }
   }
 }
 
@@ -7771,6 +7828,8 @@ function VMI_sqrt(x) {
     if(DEBUGGING) console.log('SQRT ' + d);
     if(d < 0) {
       x.retop(VM.BAD_CALC);
+    } else if (d === VM.PLUS_INFINITY) {
+      x.retop(VM.PLUS_INFINITY);
     } else {
       x.retop(Math.sqrt(d));
     }
@@ -7782,7 +7841,12 @@ function VMI_sin(x) {
   const d = x.top();
   if(d !== false) {
     if(DEBUGGING) console.log('SIN ' + d);
-    x.retop(Math.sin(d));
+    const r = Math.sin(d);
+    if(isNaN(r) || Math.abs(d) === VM.PLUS_INFINITY) {
+      x.retop(VM.BAD_CALC);
+    } else {
+      x.retop(r);
+    }
   }
 }
 
@@ -7791,7 +7855,12 @@ function VMI_cos(x) {
   const d = x.top();
   if(d !== false) {
     if(DEBUGGING) console.log('COS ' + d);
-    x.retop(Math.cos(d));
+    const r = Math.cos(d);
+    if(isNaN(r) || Math.abs(d) === VM.PLUS_INFINITY) {
+      x.retop(VM.BAD_CALC);
+    } else {
+      x.retop(r);
+    }
   }
 }
 
@@ -7800,7 +7869,12 @@ function VMI_atan(x) {
   const d = x.top();
   if(d !== false) {
     if(DEBUGGING) console.log('ATAN ' + d);
-    x.retop(Math.atan(d));
+    const r = Math.atan(d);
+    if(isNaN(r) || Math.abs(d) === VM.PLUS_INFINITY) {
+      x.retop(VM.BAD_CALC);
+    } else {
+      x.retop(r);
+    }
   }
 }
 
@@ -7812,6 +7886,8 @@ function VMI_ln(x) {
     if(DEBUGGING) console.log('LN ' + d);
     if(d < 0) {
       x.retop(VM.BAD_CALC);
+    } else if(d === VM.PLUS_INFINITY) {
+      x.retop(VM.PLUS_INFINITY);
     } else {
       x.retop(Math.log(d));
     }
@@ -7823,7 +7899,13 @@ function VMI_exp(x) {
   const d = x.top();
   if(d !== false) {
     if(DEBUGGING) console.log('EXP ' + d);
-    x.retop(Math.exp(d));
+    if(d === VM.PLUS_INFINITY) {
+      x.retop(VM.PLUS_INFINITY);
+    } else if(d === VM.MINUS_INFINITY) {
+      x.retop(0);
+    } else {
+      x.retop(Math.exp(d));
+    }
   }
 }
 
@@ -7833,12 +7915,16 @@ function VMI_log(x) {
   let d = x.pop();
   if(d !== false) {
     if(DEBUGGING) console.log('LOG (' + d.join(', ') + ')');
-    try {
-      d = Math.log(d[1]) / Math.log(d[0]);
-    } catch(err) {
-      d = VM.BAD_CALC;
+    if(Math.abs(d[0]) === VM.PLUS_INFINITY || Math.abs(d[1]) === VM.PLUS_INFINITY) {
+      x.retop(VM.BAD_CALC);
+    } else {
+      try {
+        d = Math.log(d[1]) / Math.log(d[0]);
+      } catch(err) {
+        d = VM.BAD_CALC;
+      }
+      x.retop(d);
     }
-    x.retop(d);
   }
 }