Merge branch 'spelling' into development

Some more changes after checking out spelling: - add spelling data sources to matrix - change interface "ITutorObjectImpl" to "ITutorObject" in TSpellingComponent
RoboTutorLLC · Sep 16, 2018 · 32082bf · 32082bf
2 parents 85251d7 + 0edb718
commit 32082bf
Show file tree

Hide file tree

Showing 30 changed files with 4,734 additions and 36 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -141,6 +141,7 @@ dependencies {
     compile project(path: ':comp_nd')
     compile project(path: ':comp_picmatch')
     compile project(path: ':comp_bigmath')
+    compile project(path: ':comp_spelling')
 
 }
 
diff --git a/app/src/main/assets/tutors/activity_selector/assets/data/sw/dev_data.json b/app/src/main/assets/tutors/activity_selector/assets/data/sw/dev_data.json
@@ -379,7 +379,7 @@
       "next": "bigmath:add.by.rand.0..8.NoCarryBorrow.lev2",
       "next_next": "bigmath:sub.by.1.1..9.NoCarryBorrow.lev3",
       "prev": "picmatch:nature",
-      "harder": "bigmath:add.by.rand.0..8.NoCarryBorrow.lev2",
+      "harder": "spelling:datasource_2",
       "easier": "picmatch:nature"
     },
     "bigmath:add.by.rand.0..8.NoCarryBorrow.lev2": {
@@ -394,7 +394,7 @@
       "next": "bigmath:sub.by.1.1..9.NoCarryBorrow.lev3",
       "next_next": "bigmath:sub.by.rand.1..9.NoCarryBorrow.lev4",
       "prev": "bigmath:add.by.1.0..8.NoCarryBorrow.lev1",
-      "harder": "bigmath:sub.by.1.1..9.NoCarryBorrow.lev3",
+      "harder": "spelling:datasource_3",
       "easier": "picmatch:animal"
     },
     "bigmath:sub.by.1.1..9.NoCarryBorrow.lev3": {
@@ -409,7 +409,7 @@
       "next": "bigmath:sub.by.rand.1..9.NoCarryBorrow.lev4",
       "next_next": "bigmath:add.by.10.0..80.NoCarryBorrow.lev5",
       "prev": "bigmath:add.by.rand.0..8.NoCarryBorrow.lev2",
-      "harder": "bigmath:sub.by.rand.1..9.NoCarryBorrow.lev4",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:body"
     },
     "bigmath:sub.by.rand.1..9.NoCarryBorrow.lev4": {
@@ -424,7 +424,7 @@
       "next": "bigmath:add.by.10.0..80.NoCarryBorrow.lev5",
       "next_next": "bigmath:add.by.rand.0..80.NoCarryBorrow.lev6",
       "prev": "bigmath:sub.by.1.1..9.NoCarryBorrow.lev3",
-      "harder": "bigmath:add.by.10.0..80.NoCarryBorrow.lev5",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:food"
     },
     "bigmath:add.by.10.0..80.NoCarryBorrow.lev5": {
@@ -439,7 +439,7 @@
       "next": "bigmath:add.by.rand.0..80.NoCarryBorrow.lev6",
       "next_next": "bigmath:sub.by.10.20..90.NoCarryBorrow.lev7",
       "prev": "bigmath:sub.by.rand.1..9.NoCarryBorrow.lev4",
-      "harder": "bigmath:add.by.rand.0..80.NoCarryBorrow.lev6",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:thing"
     },
     "bigmath:add.by.rand.0..80.NoCarryBorrow.lev6": {
@@ -454,7 +454,7 @@
       "next": "bigmath:sub.by.10.20..90.NoCarryBorrow.lev7",
       "next_next": "bigmath:sub.by.rand.20..90.NoCarryBorrow.lev8",
       "prev": "bigmath:add.by.10.0..80.NoCarryBorrow.lev5",
-      "harder": "bigmath:sub.by.10.20..90.NoCarryBorrow.lev7",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:people"
     },
     "bigmath:sub.by.10.20..90.NoCarryBorrow.lev7": {
@@ -469,7 +469,7 @@
       "next": "bigmath:sub.by.rand.20..90.NoCarryBorrow.lev8",
       "next_next": "bigmath:add.by.rand.0..9.AllCarryBorrow.lev9",
       "prev": "bigmath:add.by.rand.0..80.NoCarryBorrow.lev6",
-      "harder": "bigmath:sub.by.rand.20..90.NoCarryBorrow.lev8",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:sub.by.rand.20..90.NoCarryBorrow.lev8": {
@@ -484,7 +484,7 @@
       "next": "bigmath:add.by.rand.0..9.AllCarryBorrow.lev9",
       "next_next": "bigmath:add.by.rand.0..9.SomeCarryBorrow.lev10",
       "prev": "bigmath:sub.by.10.20..90.NoCarryBorrow.lev7",
-      "harder": "bigmath:add.by.rand.0..9.AllCarryBorrow.lev9",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:add.by.rand.0..9.AllCarryBorrow.lev9": {
@@ -499,7 +499,7 @@
       "next": "bigmath:add.by.rand.0..9.SomeCarryBorrow.lev10",
       "next_next": "bigmath:add.by.rand.10..89.AllCarryBorrow.lev11",
       "prev": "bigmath:sub.by.rand.20..90.NoCarryBorrow.lev8",
-      "harder": "bigmath:add.by.rand.0..9.SomeCarryBorrow.lev10",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:add.by.rand.0..9.SomeCarryBorrow.lev10": {
@@ -514,7 +514,7 @@
       "next": "bigmath:add.by.rand.10..89.AllCarryBorrow.lev11",
       "next_next": "bigmath:add.by.rand.10..89.SomeCarryBorrow.lev12",
       "prev": "bigmath:add.by.rand.0..9.AllCarryBorrow.lev9",
-      "harder": "bigmath:add.by.rand.10..89.AllCarryBorrow.lev11",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:add.by.rand.10..89.AllCarryBorrow.lev11": {
@@ -529,7 +529,7 @@
       "next": "bigmath:add.by.rand.10..89.SomeCarryBorrow.lev12",
       "next_next": "bigmath:sub.by.rand.10..98.AllCarryBorrow.lev13",
       "prev": "bigmath:add.by.rand.0..9.SomeCarryBorrow.lev10",
-      "harder": "bigmath:add.by.rand.10..89.SomeCarryBorrow.lev12",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:add.by.rand.10..89.SomeCarryBorrow.lev12": {
@@ -544,7 +544,7 @@
       "next": "bigmath:sub.by.rand.10..98.AllCarryBorrow.lev13",
       "next_next": "bigmath:sub.by.rand.10..98.SomeCarryBorrow.lev14",
       "prev": "bigmath:add.by.rand.10..89.AllCarryBorrow.lev11",
-      "harder": "bigmath:sub.by.rand.10..98.AllCarryBorrow.lev13",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:sub.by.rand.10..98.AllCarryBorrow.lev13": {
@@ -559,7 +559,7 @@
       "next": "bigmath:sub.by.rand.10..98.SomeCarryBorrow.lev14",
       "next_next": "bigmath:add.by.100.100..800.NoCarryBorrow.lev15",
       "prev": "bigmath:add.by.rand.10..89.SomeCarryBorrow.lev12",
-      "harder": "bigmath:sub.by.rand.10..98.SomeCarryBorrow.lev14",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:sub.by.rand.10..98.SomeCarryBorrow.lev14": {
@@ -574,7 +574,7 @@
       "next": "bigmath:add.by.100.100..800.NoCarryBorrow.lev15",
       "next_next": "bigmath:add.by.rand.100..800.NoCarryBorrow.lev16",
       "prev": "bigmath:sub.by.rand.10..98.AllCarryBorrow.lev13",
-      "harder": "bigmath:add.by.100.100..800.NoCarryBorrow.lev15",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:add.by.100.100..800.NoCarryBorrow.lev15": {
@@ -589,7 +589,7 @@
       "next": "bigmath:add.by.rand.100..800.NoCarryBorrow.lev16",
       "next_next": "bigmath:add.by.rand.100..800.NoCarryBorrow.lev17",
       "prev": "bigmath:sub.by.rand.10..98.SomeCarryBorrow.lev14",
-      "harder": "bigmath:add.by.rand.100..800.NoCarryBorrow.lev16",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:add.by.rand.100..800.NoCarryBorrow.lev16": {
@@ -604,7 +604,7 @@
       "next": "bigmath:add.by.rand.100..800.NoCarryBorrow.lev17",
       "next_next": "bigmath:sub.by.100.100..900.NoCarryBorrow.lev18",
       "prev": "bigmath:add.by.100.100..800.NoCarryBorrow.lev15",
-      "harder": "bigmath:add.by.rand.100..800.NoCarryBorrow.lev17",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:add.by.rand.100..800.NoCarryBorrow.lev17": {
@@ -619,7 +619,7 @@
       "next": "bigmath:sub.by.100.100..900.NoCarryBorrow.lev18",
       "next_next": "bigmath:sub.by.rand.100..900.NoCarryBorrow.lev19",
       "prev": "bigmath:add.by.rand.100..800.NoCarryBorrow.lev16",
-      "harder": "bigmath:sub.by.100.100..900.NoCarryBorrow.lev18",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:sub.by.100.100..900.NoCarryBorrow.lev18": {
@@ -634,7 +634,7 @@
       "next": "bigmath:sub.by.rand.100..900.NoCarryBorrow.lev19",
       "next_next": "bigmath:sub.by.rand.100..900.NoCarryBorrow.lev20",
       "prev": "bigmath:add.by.rand.100..800.NoCarryBorrow.lev17",
-      "harder": "bigmath:sub.by.rand.100..900.NoCarryBorrow.lev19",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:sub.by.rand.100..900.NoCarryBorrow.lev19": {
@@ -649,7 +649,7 @@
       "next": "bigmath:sub.by.rand.100..900.NoCarryBorrow.lev20",
       "next_next": "bigmath:add.by.rand.100..800.AllCarryBorrow.lev21",
       "prev": "bigmath:sub.by.100.100..900.NoCarryBorrow.lev18",
-      "harder": "bigmath:sub.by.rand.100..900.NoCarryBorrow.lev20",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:sub.by.rand.100..900.NoCarryBorrow.lev20": {
@@ -664,7 +664,7 @@
       "next": "bigmath:add.by.rand.100..800.AllCarryBorrow.lev21",
       "next_next": "bigmath:add.by.rand.100..800.SomeCarryBorrow.lev22",
       "prev": "bigmath:sub.by.rand.100..900.NoCarryBorrow.lev19",
-      "harder": "bigmath:add.by.rand.100..800.AllCarryBorrow.lev21",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:add.by.rand.100..800.AllCarryBorrow.lev21": {
@@ -679,7 +679,7 @@
       "next": "bigmath:add.by.rand.100..800.SomeCarryBorrow.lev22",
       "next_next": "bigmath:sub.by.rand.100..980.AllCarryBorrow.lev23",
       "prev": "bigmath:sub.by.rand.100..900.NoCarryBorrow.lev20",
-      "harder": "bigmath:add.by.rand.100..800.SomeCarryBorrow.lev22",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:add.by.rand.100..800.SomeCarryBorrow.lev22": {
@@ -694,7 +694,7 @@
       "next": "bigmath:sub.by.rand.100..980.AllCarryBorrow.lev23",
       "next_next": "bigmath:sub.by.rand.100..980.SomeCarryBorrow.lev24",
       "prev": "bigmath:add.by.rand.100..800.AllCarryBorrow.lev21",
-      "harder": "bigmath:sub.by.rand.100..980.AllCarryBorrow.lev23",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:sub.by.rand.100..980.AllCarryBorrow.lev23": {
@@ -707,9 +707,9 @@
       "cell_column": "23",
       "same": "bigmath:sub.by.rand.100..980.AllCarryBorrow.lev23",
       "next": "bigmath:sub.by.rand.100..980.SomeCarryBorrow.lev24",
-      "next_next": "bigmath:sub.by.rand.100..980.AllCarryBorrow.lev23",
+      "next_next": "spelling:1",
       "prev": "bigmath:add.by.rand.100..800.SomeCarryBorrow.lev22",
-      "harder": "bigmath:sub.by.rand.100..980.SomeCarryBorrow.lev24",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
     },
     "bigmath:sub.by.rand.100..980.SomeCarryBorrow.lev24": {
@@ -721,11 +721,71 @@
       "cell_row": "6",
       "cell_column": "24",
       "same": "bigmath:sub.by.rand.100..980.SomeCarryBorrow.lev24",
-      "next": "bigmath:sub.by.rand.100..980.SomeCarryBorrow.lev24",
-      "next_next": "bigmath:sub.by.rand.100..980.SomeCarryBorrow.lev24",
+      "next": "spelling:1",
+      "next_next": "spelling:datasource_2",
       "prev": "bigmath:sub.by.rand.100..980.AllCarryBorrow.lev23",
-      "harder": "bigmath:add.by.1.0..8.NoCarryBorrow.lev1",
+      "harder": "spelling:datasource_4",
       "easier": "picmatch:nature"
+    },
+    "spelling:1": {
+      "type": "TRANSITION",
+      "skill": "numbers",
+      "tutor_id": "spelling:1",
+      "tutor_desc": "spelling",
+      "tutor_data": "[file]spelling_1.json",
+      "cell_row": "7",
+      "cell_column": "1",
+      "same": "spelling:1",
+      "next": "spelling:datasource_2",
+      "next_next": "spelling:datasource_3",
+      "prev": "bigmath:sub.by.rand.100..980.SomeCarryBorrow.lev24",
+      "harder": "spelling:datasource_2",
+      "easier": "bigmath:sub.by.rand.100..980.SomeCarryBorrow.lev24"
+    },
+    "spelling:datasource_2": {
+      "type": "TRANSITION",
+      "skill": "numbers",
+      "tutor_id": "spelling:datasource_2",
+      "tutor_desc": "spelling",
+      "tutor_data": "[file]spelling_datasource_2.json",
+      "cell_row": "7",
+      "cell_column": "2",
+      "same": "spelling:datasource_2",
+      "next": "spelling:datasource_3",
+      "next_next": "spelling:datasource_4",
+      "prev": "spelling:1",
+      "harder": "spelling:datasource_3",
+      "easier": "bigmath:add.by.1.0..8.NoCarryBorrow.lev1"
+    },
+    "spelling:datasource_3": {
+      "type": "TRANSITION",
+      "skill": "numbers",
+      "tutor_id": "spelling:datasource_3",
+      "tutor_desc": "spelling",
+      "tutor_data": "[file]spelling_datasource_3.json",
+      "cell_row": "7",
+      "cell_column": "3",
+      "same": "spelling:datasource_3",
+      "next": "spelling:datasource_4",
+      "next_next": "spelling:datasource_3",
+      "prev": "spelling:datasource_2",
+      "harder": "spelling:datasource_4",
+      "easier": "bigmath:add.by.rand.0..8.NoCarryBorrow.lev2"
+    },
+    "spelling:datasource_4": {
+      "type": "TRANSITION",
+      "skill": "numbers",
+      "tutor_id": "spelling:datasource_4",
+      "tutor_desc": "spelling",
+      "tutor_data": "[file]spelling_datasource_4.json",
+      "cell_row": "7",
+      "cell_column": "4",
+      "same": "spelling:datasource_4",
+      "next": "spelling:datasource_4",
+      "next_next": "spelling:datasource_4",
+      "prev": "spelling:datasource_3",
+      "harder": "spelling:1",
+      "easier": "bigmath:sub.by.1.1..9.NoCarryBorrow.lev3"
     }
   },
   "storyTransitions": {

diff --git a/app/src/main/assets/tutors/engine_descriptor.json b/app/src/main/assets/tutors/engine_descriptor.json
@@ -19,13 +19,16 @@
   // path through the given tutors animation_graph.
   //
   "tutorVariants": {
-
     "picmatch": {
       "type": "TUTORVAR_MAP",
       "tutorName": "picmatch",
       "features": ""
     },
-
+    "spelling": {
+      "type": "TUTORVAR_MAP",
+      "tutorName": "spelling",
+      "features": ""
+    },
     "numberscale": {
       "type": "TUTORVAR_MAP",
       "tutorName": "numberscale",
@@ -284,8 +287,6 @@
   // else it is pushed in with a prefixed component:datasource compound specification.
   //
   "bindingPatterns": {
-
-
     "picmatch": {
       "type": "TUTORDATA_MAP",
       "scene_bindings": {
@@ -300,7 +301,20 @@
         }
       }
     },
-
+    "spelling": {
+      "type": "TUTORDATA_MAP",
+      "scene_bindings": {
+        "spelling": {
+          "type": "SCENEDATA_MAP",
+          "databindings": [
+            {
+              "name": "SSpelling",
+              "datasource": ""
+            }
+          ]
+        }
+      }
+    },
     "numberscale": {
       "type": "TUTORDATA_MAP",
       "scene_bindings": {