Min and max accumulators didn't return correct results in all cases. C…

…loses #21.

analysis-server/tests.py

@@ -60,6 +60,12 @@ def test_aggregate_max():
   require_array_schema(array2, [("i", "int64", 0, 1, 1)], [("val_max", "float64")])
   numpy.testing.assert_array_almost_equal(value(array2), values(array1).max())
 
+def test_aggregate_max_2():
+  array1 = random(50, 10)
+  array2 = aggregate(array1, ["max(val)"])
+  require_array_schema(array2, [("i", "int64", 0, 1, 1)], [("val_max", "float64")])
+  numpy.testing.assert_array_almost_equal(value(array2), values(array1).max())
+
 def test_aggregate_min():
   array1 = random(5, 3)
   array2 = aggregate(array1, ["min(val)"])

packages/slycat/analysis/worker/accumulator.py

@@ -73,7 +73,7 @@ class maximum(accumulator):
   def __init__(self):
     self.max = None
   def accumulate(self, observations):
-    self.max = observations.max() if self.max is None else max(self.max, observations.max)
+    self.max = observations.max() if self.max is None else max(self.max, observations.max())
   def reduce(self, other):
     self.max = other.max if self.max is None else self.max if other.max is None else max(self.max, other.max)
   def result(self):
@@ -83,7 +83,7 @@ class minimum(accumulator):
   def __init__(self):
     self.min = None
   def accumulate(self, observations):
-    self.min = observations.min() if self.min is None else min(self.min, observations.min)
+    self.min = observations.min() if self.min is None else min(self.min, observations.min())
   def reduce(self, other):
     self.min = other.min if self.min is None else self.min if other.min is None else min(self.min, other.min)
   def result(self):