Renamed flat_iterator.rs to iterators.rs

src/tensor/equals.rs

@@ -1,6 +1,6 @@
 use crate::data_buffer::DataBuffer;
 use crate::dtype::RawDataType;
-use crate::iterator::flat_iterator::FlatIterator;
+use crate::iterator::iterators::FlatIterator;
 use crate::TensorBase;
 
 impl<B1, T1, B2, T2> PartialEq<TensorBase<B1>> for TensorBase<B2>

src/tensor/iterator/flat_iterator.rs → src/tensor/iterator/iterators.rs

@@ -1,7 +1,10 @@
+use crate::data_buffer::DataBuffer;
 use crate::dtype::RawDataType;
 use crate::iterator::buffer_iterator::BufferIterator;
 use crate::iterator::flat_index_generator::FlatIndexGenerator;
-use crate::{Tensor, TensorView};
+use crate::tensor_iterator::TensorIterator;
+use crate::traits::haslength::HasLength;
+use crate::{AxisType, Tensor, TensorBase, TensorView};
 use std::ops::Range;
 
 pub trait FlatIterator<T: RawDataType> {
@@ -23,3 +26,21 @@ impl<T: RawDataType> FlatIterator<T> for TensorView<T> {
         BufferIterator::from(self, indices)
     }
 }
+
+impl<B, T> TensorBase<B>
+where
+    B: DataBuffer<crate::tensor::data_buffer::buffer::DType=T>,
+    T: RawDataType,
+{
+    pub fn iter(&self) -> TensorIterator<T> {
+        TensorIterator::from(self, [0])
+    }
+
+    pub fn iter_along(&self, axis: impl AxisType) -> TensorIterator<T> {
+        TensorIterator::from(self, [axis.usize()])
+    }
+
+    pub fn nditer(&self, axes: impl IntoIterator<Item=usize> + HasLength + Clone) -> TensorIterator<T> {
+        TensorIterator::from(self, axes)
+    }
+}

src/tensor/iterator/mod.rs

@@ -1,9 +1,9 @@
 pub mod buffer_iterator;
 pub mod flat_index_generator;
-pub mod flat_iterator;
+pub mod iterators;
 pub mod tensor_iterator;
 
 pub(super) mod collapse_contiguous;
 mod util;
 
-pub use flat_iterator::*;
+pub use iterators::*;

src/tensor/iterator/tensor_iterator.rs

@@ -2,7 +2,7 @@ use crate::data_buffer::DataBuffer;
 use crate::dtype::RawDataType;
 use crate::iterator::util::split_by_indices;
 use crate::traits::haslength::HasLength;
-use crate::{AxisType, TensorBase, TensorView};
+use crate::{TensorBase, TensorView};
 
 #[non_exhaustive]
 pub struct TensorIterator<T>
@@ -20,24 +20,6 @@ where
     size: usize,
 }
 
-impl<B, T> TensorBase<B>
-where
-    B: DataBuffer<DType=T>,
-    T: RawDataType,
-{
-    pub fn iter(&self) -> TensorIterator<T> {
-        TensorIterator::from(self, [0])
-    }
-
-    pub fn iter_along(&self, axis: impl AxisType) -> TensorIterator<T> {
-        TensorIterator::from(self, [axis.usize()])
-    }
-
-    pub fn nditer(&self, axes: impl IntoIterator<Item=usize> + HasLength + Clone) -> TensorIterator<T> {
-        TensorIterator::from(self, axes)
-    }
-}
-
 impl<T> TensorIterator<T>
 where
     T: RawDataType,

tests/tensor.rs

@@ -319,7 +319,6 @@ fn flat_iter() {
     assert_eq!(slice, [10, 11, 12, 16, 17, 18, 22, 23, 24]);
 
     let b = a.slice(s![1]);
-    println!("{:?}", b);
     let slice: Vec<_> = b.flat_iter().collect();
     assert_eq!(slice, [16, 17, 18, 19, 20, 21]);