afnan/ndarray 0.14.0 (#10)

* --wip--

* Update to ndarray 0.14

* Address some breaking changes in the upstream API
* Clean up unused code indicated by `clippy`

oars/Cargo.toml

@@ -19,7 +19,7 @@ rand = "0.8"
 primes = "0.3"
 itertools = "0.9"
 num = "0.3"
-ndarray = "0.13.1"
+ndarray = "0.14.0"
 serde = { version = "1.0", optional = true }
 serde_derive = { version = "1.0", optional = true }
 rayon = { version = "1.3", optional = true }

oars/src/constructors/bose.rs

@@ -1,5 +1,5 @@
 use crate::oa::{OAConstructor, OAResult, OA};
-use crate::utils::{ErrorKind, Integer, OarsError, OarsResult};
+use crate::utils::{Integer, OarsError, OarsResult};
 use ndarray::Array2;
 use num::pow;
 use oars_proc_macro::Checked;
@@ -12,7 +12,7 @@ use rayon::prelude::*;
 use crate::oa::ParOAConstructor;
 
 #[cfg(feature = "parallel")]
-use ndarray::{stack, Axis};
+use ndarray::{concatenate, Axis};
 
 impl<T: Integer> BoseChecked<T> {
     /// Check the parameters for Bose construction
@@ -155,7 +155,7 @@ impl<T: Integer> ParOAConstructor<T> for Bose<T> {
                             % self.prime_base;
                     })
             });
-        let points = stack![Axis(1), initial_points, points];
+        let points: Array2<T> = concatenate(Axis(1), &[initial_points.view(), points.view()])?;
         Ok(OA {
             strength: T::from(2).unwrap(),
             levels: self.prime_base,

oars/src/constructors/bush.rs

@@ -1,5 +1,5 @@
 use crate::oa::{OAConstructor, OAResult, OA};
-use crate::utils::{poly_eval, to_base_fixed, ErrorKind, Integer, OarsError, OarsResult};
+use crate::utils::{poly_eval, to_base_fixed, Integer, OarsError, OarsResult};
 use ndarray::Array2;
 use num::pow::pow;
 use oars_proc_macro::Checked;
@@ -10,7 +10,7 @@ use std::cmp::min;
 use crate::oa::ParOAConstructor;
 
 #[cfg(feature = "parallel")]
-use ndarray::{parallel::prelude::*, stack, Axis};
+use ndarray::{concatenate, parallel::prelude::*, Axis};
 
 #[cfg(feature = "parallel")]
 use rayon::iter::IntoParallelIterator;
@@ -161,7 +161,7 @@ impl<T: Integer> ParOAConstructor<T> for Bush<T> {
                             col[[0 as usize; 0]] = T::from(row_idx - 1).unwrap() % self.prime_base;
                         })
                 });
-            let points = stack![Axis(1), initial_points, last_col];
+            let points = concatenate(Axis(1), &[initial_points.view(), last_col.view()])?;
 
             return Ok(OA {
                 strength: self.strength,

oars/src/oa.rs

@@ -5,8 +5,8 @@
 //! and can be extended by users to define new OA construction methods.
 
 use crate::perm_vec::PermutationVector;
-use crate::utils::{ErrorKind, OarsError, OarsResult};
 use crate::utils::{Float, Integer};
+use crate::utils::{OarsError, OarsResult};
 use itertools::Itertools;
 use ndarray::Array2;
 use num::{pow, ToPrimitive};

oars/src/perm_vec.rs

@@ -1,7 +1,6 @@
 //! Provides an interface for a permutation vector class that makes it easy to
 //! randomly shuffle orthogonal arrays, or shuffle any set.
 
-use rand;
 use rand::seq::SliceRandom;
 use std::ops::Index;
 

oars/src/soa.rs

@@ -7,12 +7,8 @@
 use crate::utils::OarsError;
 use itertools::{zip, Itertools};
 use ndarray::Array2;
-use oars_proc_macro::Checked;
 use std::collections::{HashMap, HashSet};
 
-#[cfg(feature = "serialize")]
-use serde_derive::{Deserialize, Serialize};
-
 /// A result type for strong orthogonal array construction
 pub type SOAResult = Result<SOA, OarsError>;
 

oars/src/utils.rs

@@ -1,8 +1,6 @@
 //! Misc utilities and convenience functions for the library
 
 use num::{self, NumCast};
-use std::error::Error;
-use std::fmt;
 use std::vec::Vec;
 use thiserror::Error;
 
@@ -93,6 +91,12 @@ pub enum ErrorKind {
 pub enum OarsError {
     #[error("Invalid params supplied to the constructor: {0}")]
     InvalidParams(String),
+
+    #[error("There was an error pertaining to the shape of a matrix")]
+    ShapeError {
+        #[from]
+        source: ndarray::ShapeError,
+    },
 }
 
 /// A generic type for anything that can return an `OarsError`.