Skip to content

Commit a7e3aab

Browse files
committed
append: Update doc comment for try_append_array
1 parent af47658 commit a7e3aab

File tree

1 file changed

+30
-9
lines changed

1 file changed

+30
-9
lines changed

src/impl_owned_array.rs

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -206,29 +206,50 @@ impl<A> Array<A, Ix2> {
206206
impl<A, D> Array<A, D>
207207
where D: Dimension
208208
{
209-
/// Append a row to an array with row major memory layout.
209+
/// Append an array to the array
210+
///
211+
/// The axis-to-append-to `axis` must be the array's "growing axis" for this operation
212+
/// to succeed. The growing axis is the outermost or last-visited when elements are visited in
213+
/// memory order:
214+
///
215+
/// `axis` must be the growing axis of the current array, an axis with length 0 or 1.
216+
///
217+
/// - This is the 0th axis for standard layout arrays
218+
/// - This is the *n*-1 th axis for fortran layout arrays
219+
/// - If the array is empty (the axis or any other has length 0) or if `axis`
220+
/// has length 1, then the array can always be appended.
210221
///
211222
/// ***Errors*** with a layout error if the array is not in standard order or
212223
/// if it has holes, even exterior holes (from slicing). <br>
213224
/// ***Errors*** with shape error if the length of the input row does not match
214225
/// the length of the rows in the array. <br>
215226
///
216-
/// The memory layout matters, since it determines in which direction the array can easily
217-
/// grow. Notice that an empty array is compatible both ways. The amortized average
218-
/// complexity of the append is O(m) where *m* is the length of the row.
227+
/// The memory layout of the `self` array matters, since it determines in which direction the
228+
/// array can easily grow. Notice that an empty array is compatible both ways. The amortized
229+
/// average complexity of the append is O(m) where *m* is the number of elements in the
230+
/// array-to-append (equivalent to how `Vec::extend` works).
231+
///
232+
/// The memory layout of the argument `array` does not matter.
219233
///
220234
/// ```rust
221-
/// use ndarray::{Array, ArrayView, array};
235+
/// use ndarray::{Array, ArrayView, array, Axis};
222236
///
223237
/// // create an empty array and append
224238
/// let mut a = Array::zeros((0, 4));
225-
/// a.try_append_row(ArrayView::from(&[1., 2., 3., 4.])).unwrap();
226-
/// a.try_append_row(ArrayView::from(&[0., -2., -3., -4.])).unwrap();
239+
/// let ones = ArrayView::from(&[1.; 8]).into_shape((2, 4)).unwrap();
240+
/// let zeros = ArrayView::from(&[0.; 8]).into_shape((2, 4)).unwrap();
241+
/// a.try_append_array(Axis(0), ones).unwrap();
242+
/// a.try_append_array(Axis(0), zeros).unwrap();
243+
/// a.try_append_array(Axis(0), ones).unwrap();
227244
///
228245
/// assert_eq!(
229246
/// a,
230-
/// array![[1., 2., 3., 4.],
231-
/// [0., -2., -3., -4.]]);
247+
/// array![[1., 1., 1., 1.],
248+
/// [1., 1., 1., 1.],
249+
/// [0., 0., 0., 0.],
250+
/// [0., 0., 0., 0.],
251+
/// [1., 1., 1., 1.],
252+
/// [1., 1., 1., 1.]]);
232253
/// ```
233254
pub fn try_append_array(&mut self, axis: Axis, array: ArrayView<A, D>)
234255
-> Result<(), ShapeError>

0 commit comments

Comments
 (0)