ivy: add tests for matrix indexing

Change-Id: I09a4c98c9d21ae3686fcb76abe0c2ae0bd058269
griesemer · Dec 3, 2014 · 5a78716 · 5a78716
1 parent f1e9c71
commit 5a78716
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/testdata/binary_matrix.ivy b/testdata/binary_matrix.ivy
@@ -507,3 +507,27 @@
 (2 3 rho iota 10)[2 1]
 	4 5 6
 	1 2 3
+
+x = 3 4 5 rho iota 100
+x[2]
+	21 22 23 24 25
+	26 27 28 29 30
+	31 32 33 34 35
+	36 37 38 39 40
+
+x = 3 4 5 rho iota 100
+x[3 2 1]
+	41 42 43 44 45
+	46 47 48 49 50
+	51 52 53 54 55
+	56 57 58 59 60
+
+	21 22 23 24 25
+	26 27 28 29 30
+	31 32 33 34 35
+	36 37 38 39 40
+
+	 1  2  3  4  5
+	 6  7  8  9 10
+	11 12 13 14 15
+	16 17 18 19 20
diff --git a/value/matrix.go b/value/matrix.go
@@ -56,9 +56,9 @@ func (m Matrix) String() string {
 	var b bytes.Buffer
 	switch len(m.shape) {
 	case 0:
-		return ""
+		Errorf("matrix is scalar")
 	case 1:
-		return m.data.String()
+		Errorf("matrix is vector")
 	case 2:
 		nrows := int(m.shape[0].(Int))
 		ncols := int(m.shape[1].(Int))