linny-r 2.0.11 → 2.1.0

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);

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

@@ -7204,7 +7204,13 @@ function VMI_push_run_result(x, args) {
     let xp = rrspec.x,
         rn = rrspec.r,
         rri = rrspec.v;
-    if(xp === false) xp = MODEL.running_experiment;
+    if(xp === false) {
+      // If no experiment is specified, use the running experiment.
+      // NOTE: To facilitate testing a "single run" without using the
+      // Experiment manager, default to the experiment that is selected
+      // in the Experiment manager (but not "running").
+      xp = MODEL.running_experiment || EXPERIMENT_MANAGER.selected_experiment;
+    }
     if(xp instanceof Experiment) {
       if(Array.isArray(rn)) {
         // Let the running experiment infer run number from selector list `rn`
@@ -7212,7 +7218,22 @@ function VMI_push_run_result(x, args) {
         rn = xp.matchingCombinationIndex(rn); 
       } else if(rn < 0) {
         // Relative run number: use current run # + r (first run has number 0).
-        rn += xp.active_combination_index;
+        if(xp === MODEL.running_experiment) {
+          rn += xp.active_combination_index;
+        } else if(xp.chart_combinations.length) {
+          // Modeler has selected one or more runs in the viewer table.
+          // FInd the highest number of a selected run that has been performed.
+          let last = -1;
+          for(const ccn of xp.chart_combinations) {
+            if(ccn > last && ccn < xp.runs.length) last = ccn;
+          }
+          // If no performed runs are selected, use the last performed run. 
+          if(last < 0) last = xp.runs.length - 1;
+          rn += last;
+        } else {
+          // Choose the run relative to the total number of completed runs.
+          rn += xp.runs.length - 1;
+        }
       } else if(rrspec.nr !== false) {
         // Run number inferred from local time step of expression.
         const
@@ -7654,7 +7675,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]);
+    }
   }
 }
 
@@ -7664,17 +7691,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]);
+    }
   }
 }
 
@@ -7686,7 +7723,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]);
     }
   }
@@ -7701,7 +7750,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]);
     }
   }
@@ -7717,6 +7778,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.
     }
@@ -7738,7 +7802,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);
+    }
   }
 }
 
@@ -7750,6 +7823,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));
     }
@@ -7761,7 +7836,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);
+    }
   }
 }
 
@@ -7770,7 +7850,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);
+    }
   }
 }
 
@@ -7779,7 +7864,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);
+    }
   }
 }
 
@@ -7791,6 +7881,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));
     }
@@ -7802,7 +7894,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));
+    }
   }
 }
 
@@ -7812,12 +7910,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);
   }
 }