working on an array

FultonBrowne · Nov 16, 2019 · 132c395 · 132c395
1 parent ce56785
commit 132c395
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/com/andromeda/araserver/util/SortWords.kt b/src/main/java/com/andromeda/araserver/util/SortWords.kt
@@ -23,7 +23,7 @@ class SortWords(keyWord: KeyWord, mainVal: String) {
                     }
                     else -> {
                         if (graph != null) {
-                            sortNouns(graph)
+                            sortForGraph(graph)
                         }
                         working = false
                         }
@@ -36,11 +36,14 @@ class SortWords(keyWord: KeyWord, mainVal: String) {
 
 
     }
-    private fun sortNouns(graph: Parse){
+    private fun sortForGraph(graph: Parse): ArrayList<WordGraph> {
+        val toReturn = ArrayList<WordGraph>()
         for (i in graph.children!!) {
+            toReturn.add(WordGraph(i.coveredText, i.label))
             println(i.type)
-            if (i.childCount > 0) sortNouns(i)
+            if (i.childCount > 0) toReturn.addAll(sortForGraph(i))
             }
+        return toReturn
 
     }
 

diff --git a/src/main/java/com/andromeda/araserver/util/WordGraph.kt b/src/main/java/com/andromeda/araserver/util/WordGraph.kt
@@ -1,3 +1,3 @@
 package com.andromeda.araserver.util
 
-data class WordGraph(val word:String, val type:Int)
+data class WordGraph(val word:String, val type:String)