update rand

Author: jonasBoss

CHANGELOG.md

@@ -1,4 +1,5 @@
 # 0.5.0
+ - update `ndarray` to version 0.16
  - update `BuilderError` 
    - combine variants `DimensionError` and `AxisLenght` into `ShapeError`
    - add `ValueError` variant

Cargo.toml

@@ -21,7 +21,7 @@ cargo-tarpaulin = "0.27"
 ndarray = {version = "0.16", features = ["approx", "rayon"] }
 approx = "0.5" 
 criterion = "0.5"
-rand = "0.8"
+rand = "0.9"
 
 [[bench]]
 name = "bench_vector_extensions"

benches/bench_vector_extensions.rs

@@ -1,7 +1,7 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use ndarray::{Array, Array1};
 use ndarray_interp::vector_extensions::VectorExtensions;
-use rand::{distributions::Uniform, prelude::*};
+use rand::{distr::Uniform, prelude::*};
 use rand_extensions::RandArray;
 
 mod rand_extensions;
@@ -24,7 +24,7 @@ fn bunched_linspace() -> Array1<f64> {
     let mut arr: Vec<f64> =
         Vec::from_iter(Array::linspace(0.0, 1.0, 20).into_iter().flat_map(|x| {
             rng(42)
-                .sample_iter(Uniform::new_inclusive(-0.001, 0.001))
+                .sample_iter(Uniform::new_inclusive(-0.001, 0.001).unwrap())
                 .take(5)
                 .map(move |noise| x + noise)
         }));
@@ -42,7 +42,7 @@ fn noisy_linspace() -> Array1<f64> {
 fn bench_get_lower_index(c: &mut Criterion) {
     let query = Array::from_iter(
         rng(69)
-            .sample_iter(Uniform::new_inclusive(-0.1, 1.1))
+            .sample_iter(Uniform::new_inclusive(-0.1, 1.1).unwrap())
             .take(1000),
     );
 
@@ -69,7 +69,7 @@ fn bench_get_lower_index(c: &mut Criterion) {
     let arr = Array::logspace(2.0, 0.0, 8.0, 100);
     let query = Array::from_iter(
         rng(69)
-            .sample_iter(Uniform::new_inclusive(0.95, 256.5))
+            .sample_iter(Uniform::new_inclusive(0.95, 256.5).unwrap())
             .take(1000),
     );
     c.bench_function("Logspaced", |b| {

benches/rand_extensions.rs

@@ -1,6 +1,6 @@
 use ndarray::{Array, Ix1};
 use rand::{
-    distributions::{uniform::SampleUniform, Uniform},
+    distr::{uniform::SampleUniform, Uniform},
     rngs::StdRng,
     Rng, SeedableRng,
 };
@@ -18,15 +18,15 @@ impl<T: SampleUniform + PartialOrd> RandArray<T> for Array<T, Ix1> {
     fn from_rand(size: usize, range: (T, T), seed: u64) -> Self {
         Array::from_iter(
             rng(seed)
-                .sample_iter(Uniform::new_inclusive(range.0, range.1))
+                .sample_iter(Uniform::new_inclusive(range.0, range.1).unwrap())
                 .take(size),
         )
     }
 
     fn from_rand_ordered(size: usize, range: (T, T), seed: u64) -> Self {
         let mut arr = Vec::from_iter(
             rng(seed)
-                .sample_iter(Uniform::new_inclusive(range.0, range.1))
+                .sample_iter(Uniform::new_inclusive(range.0, range.1).unwrap())
                 .take(size),
         );
         arr.sort_by(|a, b| a.partial_cmp(b).unwrap());

src/interp1d/mod.rs

@@ -485,7 +485,7 @@ mod tests {
     use approx::assert_abs_diff_eq;
     use ndarray::{array, Array, Array1, IxDyn};
     use rand::{
-        distributions::{uniform::SampleUniform, Uniform},
+        distr::{uniform::SampleUniform, Uniform},
         rngs::StdRng,
         Rng, SeedableRng,
     };
@@ -495,7 +495,7 @@ mod tests {
     fn rand_arr<T: SampleUniform>(size: usize, range: (T, T), seed: u64) -> Array1<T> {
         Array::from_iter(
             StdRng::seed_from_u64(seed)
-                .sample_iter(Uniform::new_inclusive(range.0, range.1))
+                .sample_iter(Uniform::new_inclusive(range.0, range.1).unwrap())
                 .take(size),
         )
     }

src/interp2d/mod.rs

@@ -523,7 +523,7 @@ mod tests {
     use approx::assert_abs_diff_eq;
     use ndarray::{array, Array, Array1, IxDyn};
     use rand::{
-        distributions::{uniform::SampleUniform, Uniform},
+        distr::{uniform::SampleUniform, Uniform},
         rngs::StdRng,
         Rng, SeedableRng,
     };
@@ -533,7 +533,7 @@ mod tests {
     fn rand_arr<T: SampleUniform>(size: usize, range: (T, T), seed: u64) -> Array1<T> {
         Array::from_iter(
             StdRng::seed_from_u64(seed)
-                .sample_iter(Uniform::new_inclusive(range.0, range.1))
+                .sample_iter(Uniform::new_inclusive(range.0, range.1).unwrap())
                 .take(size),
         )
     }