Upgrade ndarray to 0.15.0

Author: Armavica

Cargo.toml

@@ -16,7 +16,7 @@ keywords = ["array", "multidimensional", "statistics", "matrix", "ndarray"]
 categories = ["data-structures", "science"]
 
 [dependencies]
-ndarray = "0.14"
+ndarray = "0.15.0"
 noisy_float = "0.2.0"
 num-integer = "0.1"
 num-traits = "0.2"
@@ -25,10 +25,10 @@ itertools = { version = "0.10.0", default-features = false }
 indexmap = "1.6.2"
 
 [dev-dependencies]
-ndarray = { version = "0.14", features = ["approx"] }
-criterion = "0.3.4"
+ndarray = { version = "0.15.0", features = ["approx"] }
+criterion = "0.3"
 quickcheck = { version = "0.9.2", default-features = false }
-ndarray-rand = "0.13.0"
+ndarray-rand = "0.14.0"
 approx = "0.4"
 quickcheck_macros = "1.0.0"
 num-bigint = "0.4.0"

src/deviation.rs

@@ -232,7 +232,7 @@ where
 
         let mut count = 0;
 
-        Zip::from(self).and(other).apply(|a, b| {
+        Zip::from(self).and(other).for_each(|a, b| {
             if a == b {
                 count += 1;
             }
@@ -259,7 +259,7 @@ where
 
         let mut result = A::zero();
 
-        Zip::from(self).and(other).apply(|self_i, other_i| {
+        Zip::from(self).and(other).for_each(|self_i, other_i| {
             let (a, b) = (self_i.clone(), other_i.clone());
             let diff = a - b;
             result += diff.clone() * diff;
@@ -291,7 +291,7 @@ where
 
         let mut result = A::zero();
 
-        Zip::from(self).and(other).apply(|self_i, other_i| {
+        Zip::from(self).and(other).for_each(|self_i, other_i| {
             let (a, b) = (self_i.clone(), other_i.clone());
             result += (a - b).abs();
         });
@@ -309,7 +309,7 @@ where
 
         let mut max = A::zero();
 
-        Zip::from(self).and(other).apply(|self_i, other_i| {
+        Zip::from(self).and(other).for_each(|self_i, other_i| {
             let (a, b) = (self_i.clone(), other_i.clone());
             let diff = (a - b).abs();
             if diff > max {

src/entropy.rs

@@ -169,7 +169,7 @@ where
         Zip::from(&mut temp)
             .and(self)
             .and(q)
-            .apply(|result, &p, &q| {
+            .for_each(|result, &p, &q| {
                 *result = {
                     if p == A::zero() {
                         A::zero()
@@ -202,7 +202,7 @@ where
         Zip::from(&mut temp)
             .and(self)
             .and(q)
-            .apply(|result, &p, &q| {
+            .for_each(|result, &p, &q| {
                 *result = {
                     if p == A::zero() {
                         A::zero()

src/maybe_nan/mod.rs

@@ -332,7 +332,7 @@ where
         A: 'a,
         F: FnMut(&'a A::NotNan),
     {
-        self.visit(|elem| {
+        self.for_each(|elem| {
             if let Some(not_nan) = elem.try_as_not_nan() {
                 f(not_nan)
             }

src/quantile/mod.rs

@@ -477,7 +477,7 @@ where
             let mut results = Array::from_elem(results_shape, data.first().unwrap().clone());
             Zip::from(results.lanes_mut(axis))
                 .and(data.lanes_mut(axis))
-                .apply(|mut results, mut data| {
+                .for_each(|mut results, mut data| {
                     let index_map =
                         get_many_from_sorted_mut_unchecked(&mut data, &searched_indexes);
                     for (result, &q) in results.iter_mut().zip(qs) {