Merge pull request #221 from martinRenou/min_max

Add support for minimum/maximum

Author: JohanMabille

include/xframe/xaxis_math.hpp

@@ -62,9 +62,8 @@ namespace xf
     using xt::fmax;
     using xt::fmin;
     using xt::fdim;
-    // Needs a fix in xtensor
-    //using xt::maximum;
-    //using xt::minimum;
+    using xt::maximum;
+    using xt::minimum;
     using xt::clip;
     using xt::sign;
 

test/test_xvariable_math.cpp

@@ -323,32 +323,37 @@ namespace xf
         EXPECT_EQ(fdim(sa, a.select(sel)), fdim(sa, a).select(sel));
     }
 
-    // TODO: enable this when xoptional is fixed
-    /*TEST(xvariable_math, maximum)
+    TEST(xvariable_math, maximum)
     {
-        variable_type a = make_test_variable();
-        dict_type sel = make_selector_aa();
-        EXPECT_EQ(std::max(a.select(sel), a.select(sel)), maximum(a, a).select(sel));
+        auto missing = xtl::missing<double>();
+        using data_type = xt::xoptional_assembly<xt::xarray<double>, xt::xarray<bool>>;
 
-        double sb = 1.2;
-        EXPECT_EQ(std::max(a.select(sel), sb), maximum(a, sb).select(sel));
+        variable_type a = make_test_variable();
+        variable_type b = make_test_variable2();
 
-        double sa = 1.2;
-        EXPECT_EQ(std::max(sa, a.select(sel)), maximum(sa, a).select(sel));
+        variable_type res = maximum(a, b);
+        data_type expected = {{{      1,       2, missing},
+                               {missing, missing, missing}},
+                              {{     11,      12,      13},
+                               {missing,      15,      16}}};
+        EXPECT_EQ(res.data(), expected);
     }
 
     TEST(xvariable_math, minimum)
     {
-        variable_type a = make_test_variable();
-        dict_type sel = make_selector_aa();
-        EXPECT_EQ(std::min(a.select(sel), a.select(sel)), minimum(a, a).select(sel));
+        auto missing = xtl::missing<double>();
+        using data_type = xt::xoptional_assembly<xt::xarray<double>, xt::xarray<bool>>;
 
-        double sb = 1.2;
-        EXPECT_EQ(std::min(a.select(sel), sb), minimum(a, sb).select(sel));
+        variable_type a = make_test_variable();
+        variable_type b = make_test_variable2();
 
-        double sa = 1.2;
-        EXPECT_EQ(std::min(sa, a.select(sel)), minimum(sa, a).select(sel));
-    }*/
+        variable_type res = minimum(a, b);
+        data_type expected = {{{      1,       1, missing},
+                               {missing, missing, missing}},
+                              {{      7,       7,       7},
+                               {missing,       9,       9}}};
+        EXPECT_EQ(res.data(), expected);
+    }
 
     TEST(xvariable_math, clip)
     {