From 96bccdf72a8858cfd6f9ea655f88638c045e0aac Mon Sep 17 00:00:00 2001 From: Jason Ramapuram Date: Sat, 26 Mar 2016 12:39:32 +0100 Subject: [PATCH 1/2] more unused fixes --- src/array.rs | 3 ++- src/index.rs | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/array.rs b/src/array.rs index 1d0c39d43..c83a1cea1 100644 --- a/src/array.rs +++ b/src/array.rs @@ -119,9 +119,10 @@ impl Array { /// # Examples /// /// ``` - /// use arrayfire::{Array, Dim4}; + /// use arrayfire::{Array, Dim4, print}; /// let values: &[f32] = &[1.0, 2.0, 3.0]; /// let indices = Array::new(values, Dim4::new(&[3, 1, 1, 1])).unwrap(); + /// print(&indices).unwrap(); /// ``` #[allow(unused_mut)] pub fn new(slice: &[T], dims: Dim4) -> Result { diff --git a/src/index.rs b/src/index.rs index 00aeeb437..ef70ff233 100644 --- a/src/index.rs +++ b/src/index.rs @@ -160,7 +160,7 @@ pub fn index(input: &Array, seqs: &[Seq]) -> Result /// let a = randu::(dims).unwrap(); /// println!("Grab last row of the random matrix"); /// print(&a); -/// print(&row(&a, 4).unwrap()); +/// print(&row(&a, 4).unwrap()).unwrap(); /// ``` #[allow(dead_code)] pub fn row(input: &Array, row_num: u64) -> Result { @@ -355,7 +355,7 @@ pub fn assign_seq(lhs: &Array, seqs: &[Seq], rhs: &Array) -> Result< /// idxrs.set_index(&seq4gen, 1, Some(false)); // 3rd parameter indicates batch operation /// /// let sub2 = index_gen(&a, idxrs).unwrap(); -/// println!("a(indices, seq(0, 2, 1))"); print(&sub2); +/// println!("a(indices, seq(0, 2, 1))"); print(&sub2).unwrap(); /// // [3 3 1 1] /// // 0.1315 0.0470 0.5194 /// // 0.7556 0.6789 0.8310 @@ -400,7 +400,7 @@ pub fn index_gen(input: &Array, indices: Indexer) -> Result { /// idxrs.set_index(&seq4gen, 1, Some(false)); // 3rd parameter indicates batch operation /// /// let sub2 = assign_gen(&a, &idxrs, &b).unwrap(); -/// println!("a(indices, seq(0, 2, 1))"); print(&sub2); +/// println!("a(indices, seq(0, 2, 1))"); print(&sub2).unwrap(); /// // [5 3 1 1] /// // 0.0000 0.2190 0.3835 /// // 2.0000 2.0000 2.0000 From 3c2f70cd790c2f814171b616de265eb93b0ad623 Mon Sep 17 00:00:00 2001 From: Jason Ramapuram Date: Sat, 26 Mar 2016 12:58:44 +0100 Subject: [PATCH 2/2] add unwrap for set_index calls --- src/index.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/index.rs b/src/index.rs index ef70ff233..9b9cc4c5b 100644 --- a/src/index.rs +++ b/src/index.rs @@ -351,8 +351,8 @@ pub fn assign_seq(lhs: &Array, seqs: &[Seq], rhs: &Array) -> Result< /// Ok(v) => v, /// Err(e) => panic!("{}",e), /// }; -/// idxrs.set_index(&indices, 0, None); // 2nd parameter is indexing dimension -/// idxrs.set_index(&seq4gen, 1, Some(false)); // 3rd parameter indicates batch operation +/// idxrs.set_index(&indices, 0, None).unwrap(); // 2nd parameter is indexing dimension +/// idxrs.set_index(&seq4gen, 1, Some(false)).unwrap(); // 3rd parameter indicates batch operation /// /// let sub2 = index_gen(&a, idxrs).unwrap(); /// println!("a(indices, seq(0, 2, 1))"); print(&sub2).unwrap(); @@ -396,8 +396,8 @@ pub fn index_gen(input: &Array, indices: Indexer) -> Result { /// Ok(v) => v, /// Err(e) => panic!("{}",e), /// }; -/// idxrs.set_index(&indices, 0, None); // 2nd parameter is indexing dimension -/// idxrs.set_index(&seq4gen, 1, Some(false)); // 3rd parameter indicates batch operation +/// idxrs.set_index(&indices, 0, None).unwrap(); // 2nd parameter is indexing dimension +/// idxrs.set_index(&seq4gen, 1, Some(false)).unwrap(); // 3rd parameter indicates batch operation /// /// let sub2 = assign_gen(&a, &idxrs, &b).unwrap(); /// println!("a(indices, seq(0, 2, 1))"); print(&sub2).unwrap();