Merge pull request #1387 from exercism/smann/matrix-notation

matrix: Switch to canonical notation of matrix indices
exercism · Dec 24, 2018 · 155566f · 155566f
2 parents d9b62c9 + e380856
commit 155566f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/exercises/matrix/canonical-data.json b/exercises/matrix/canonical-data.json
@@ -1,13 +1,13 @@
 {
   "exercise": "matrix",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "cases": [
     {
       "description": "extract row from one number matrix",
       "property": "row",
       "input": {
         "string": "1",
-        "index": 0
+        "index": 1
       },
       "expected": [1]
     },
@@ -16,7 +16,7 @@
       "property": "row",
       "input": {
         "string": "1 2\n3 4",
-        "index": 1
+        "index": 2
       },
       "expected": [3, 4]
     },
@@ -25,7 +25,7 @@
       "property": "row",
       "input": {
         "string": "1 2\n10 20",
-        "index": 1
+        "index": 2
       },
       "expected": [10, 20]
     },
@@ -34,7 +34,7 @@
       "property": "row",
       "input": {
         "string": "1 2 3\n4 5 6\n7 8 9\n8 7 6",
-        "index": 2
+        "index": 3
       },
       "expected": [7, 8, 9]
     },
@@ -43,7 +43,7 @@
       "property": "column",
       "input": {
         "string": "1",
-        "index": 0
+        "index": 1
       },
       "expected": [1]
     },
@@ -52,7 +52,7 @@
       "property": "column",
       "input": {
         "string": "1 2 3\n4 5 6\n7 8 9",
-        "index": 2
+        "index": 3
       },
       "expected": [3, 6, 9]
     },
@@ -61,7 +61,7 @@
       "property": "column",
       "input": {
         "string": "1 2 3\n4 5 6\n7 8 9\n8 7 6",
-        "index": 2
+        "index": 3
       },
       "expected": [3, 6, 9, 6]
     },
@@ -70,7 +70,7 @@
       "property": "column",
       "input": {
         "string": "89 1903 3\n18 3 1\n9 4 800",
-        "index": 1
+        "index": 2
       },
       "expected": [1903, 3, 4]
     }

diff --git a/exercises/matrix/description.md b/exercises/matrix/description.md
@@ -12,11 +12,11 @@ So given a string with embedded newlines like:
 representing this matrix:
 
 ```text
-    0  1  2
+    1  2  3
   |---------
-0 | 9  8  7
-1 | 5  3  2
-2 | 6  6  7
+1 | 9  8  7
+2 | 5  3  2
+3 | 6  6  7
 ```
 
 your code should be able to spit out:
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,11 +12,11 @@ So given a string with embedded newlines like: @@
     representing this matrix:
     ```text
-1  2
+2  3
       |---------
-| 9  8  7
-| 5  3  2
-| 6  6  7
+| 9  8  7
+| 5  3  2
+| 6  6  7
     ```
     your code should be able to spit out:
@@ Expand Down @@