From 9cad6ce4f559843260b4977fd083c365490f9a19 Mon Sep 17 00:00:00 2001
From: Jure Grabnar <jgrabnar@biosistemika.com>
Date: Fri, 23 Sep 2016 16:37:29 +0200
Subject: [PATCH] Don't include NaNs in some formula calculations

SCI-485 #close
---
 vendor/assets/javascripts/formula.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/vendor/assets/javascripts/formula.js b/vendor/assets/javascripts/formula.js
index 75f6aa481..da15f7a9e 100644
--- a/vendor/assets/javascripts/formula.js
+++ b/vendor/assets/javascripts/formula.js
@@ -5038,7 +5038,7 @@
     };
 
     Formula.MAX = function () {
-      var range = Formula.FLATTEN(arguments);
+      var range = Formula.NUMBERS(Formula.FLATTEN(arguments));
       var n = range.length;
       var max = (n > 0) ? range[0] : 0;
       for (var i = 0; i < n; i++) {
@@ -5053,11 +5053,11 @@
     };
 
     Formula.MEDIAN = function () {
-      return jStat.median(Formula.FLATTEN(arguments));
+      return jStat.median(Formula.NUMBERS(Formula.FLATTEN(arguments)));
     };
 
     Formula.MIN = function () {
-      var range = Formula.FLATTEN(arguments);
+      var range = Formula.NUMBERS(Formula.FLATTEN(arguments));
       var n = range.length;
       var min = (n > 0) ? range[0] : 0;
       for (var i = 0; i < n; i++) {
@@ -5337,8 +5337,8 @@
     };
 
     Formula.SLOPE = function (data_y, data_x) {
-      data_y = Formula.FLATTEN(data_y)
-      data_x = Formula.FLATTEN(data_x)
+      data_y = Formula.NUMBERS(Formula.FLATTEN(data_y));
+      data_x = Formula.NUMBERS(Formula.FLATTEN(data_x));
       var xmean = jStat.mean(data_x);
       var ymean = jStat.mean(data_y);
       var n = data_x.length;
@@ -5373,7 +5373,7 @@
     };
 
     Formula.STDEVP = function () {
-      var range = Formula.FLATTEN(arguments);
+      var range = Formula.NUMBERS(Formula.FLATTEN(arguments));
       var n = range.length;
       var sigma = 0;
       var count = 0;
@@ -5399,7 +5399,7 @@
     };
 
     Formula.STDEVS = function () {
-      var range = Formula.FLATTEN(arguments);
+      var range = Formula.NUMBERS(Formula.FLATTEN(arguments));
       var n = range.length;
       var sigma = 0;
       var count = 0;
@@ -5530,7 +5530,7 @@
     };
 
     Formula.VARS = function () {
-      var range = Formula.FLATTEN(arguments);
+      var range = Formula.NUMBERS(Formula.FLATTEN(arguments));
       var n = range.length;
       var sigma = 0;
       var count = 0;