Replace usage of len by shape

Author: TrAyZeN

muscatpy/src/leakage_detection.rs

@@ -15,8 +15,8 @@ pub fn compute_snr<'py>(
     get_class: &Bound<'py, PyFunction>,
     batch_size: usize,
 ) -> PyResult<Bound<'py, PyArray1<f32>>> {
-    let mut traces_class = Array1::zeros(traces.len());
-    for i in 0..traces_class.len() {
+    let mut traces_class = Array1::zeros(traces.shape()[0]);
+    for i in 0..traces_class.shape()[0] {
         traces_class[i] = get_class
             .call((i,), None)
             .unwrap()
@@ -64,8 +64,8 @@ pub fn compute_nicv<'py>(
     get_class: &Bound<'py, PyFunction>,
     batch_size: usize,
 ) -> PyResult<Bound<'py, PyArray1<f32>>> {
-    let mut traces_class = Array1::zeros(traces.len());
-    for i in 0..traces_class.len() {
+    let mut traces_class = Array1::zeros(traces.shape()[0]);
+    for i in 0..traces_class.shape()[0] {
         traces_class[i] = get_class
             .call((i,), None)
             .unwrap()

src/leakage_detection.rs

@@ -116,7 +116,7 @@ where
     /// # Panics
     /// - Panics in debug if the length of the trace is different from the size of [`SnrProcessor`].
     pub fn process(&mut self, trace: ArrayView1<T>, class: usize) {
-        debug_assert!(trace.len() == self.size());
+        debug_assert!(trace.shape()[0] == self.size());
         debug_assert!(class < self.num_classes());
 
         self.mean_var.process(trace);
@@ -168,7 +168,7 @@ where
 
     /// Return the number of classes handled.
     pub fn num_classes(&self) -> usize {
-        self.classes_count.len()
+        self.classes_count.shape()[0]
     }
 
     /// Determine if two [`SnrProcessor`] are compatible for addition.
@@ -351,7 +351,7 @@ where
     /// # Panics
     /// Panics in debug if the length of the trace is different from the size of [`Snr`].
     pub fn process(&mut self, trace: ArrayView1<T>, class: usize) {
-        debug_assert!(trace.len() == self.size());
+        debug_assert!(trace.shape()[0] == self.size());
         debug_assert!(class < self.num_classes());
 
         self.mean_var.process(trace);
@@ -397,7 +397,7 @@ where
 
     /// Returns the number of classes handled.
     pub fn num_classes(&self) -> usize {
-        self.classes_count.len()
+        self.classes_count.shape()[0]
     }
 
     /// Determine if two [`NicvProcessor`] are compatible for addition.
@@ -525,9 +525,9 @@ where
     /// * `class` - Indicates to which of the two partitions the given trace belongs.
     ///
     /// # Panics
-    /// Panics in debug if `trace.len() != self.size()`.
+    /// Panics in debug if `trace.shape()[0] != self.size()`.
     pub fn process(&mut self, trace: ArrayView1<T>, class: bool) {
-        debug_assert!(trace.len() == self.size());
+        debug_assert!(trace.shape()[0] == self.size());
 
         if class {
             self.mean_var_2.process(trace);

src/preprocessors.rs

@@ -218,9 +218,9 @@ where
             cmp,
         );
 
-        let mut aligned_trace = Array1::zeros([trace.len()]);
+        let mut aligned_trace = Array1::zeros([trace.shape()[0]]);
         let mut k = 0;
-        for j in 0..trace.len() {
+        for j in 0..trace.shape()[0] {
             let mut count = T::Container::zero();
             let mut sum = T::Container::zero();
 

src/processors.rs

@@ -46,9 +46,9 @@ where
     /// # Panics
     /// Panics in debug if the length of the trace is different form the size of [`MeanVar`].
     pub fn process(&mut self, trace: ArrayView1<T>) {
-        debug_assert!(trace.len() == self.size());
+        debug_assert!(trace.shape()[0] == self.size());
 
-        for i in 0..self.sum.len() {
+        for i in 0..self.sum.shape()[0] {
             let x = trace[i].into();
 
             self.sum[i] += x;
@@ -74,7 +74,7 @@ where
 
     /// Returns the trace size handled.
     pub fn size(&self) -> usize {
-        self.sum.len()
+        self.sum.shape()[0]
     }
 
     /// Returns the number of traces processed.

src/util.rs

@@ -70,7 +70,7 @@ where
 {
     let mut idx_max = 0;
 
-    for i in 0..array.len() {
+    for i in 0..array.shape()[0] {
         if compare(&array[i], &array[idx_max]).is_gt() {
             idx_max = i;
         }