diff --git a/data/webs/linguistics/linguistics.json b/data/webs/linguistics/linguistics.json index 5760115..4ab145e 100644 --- a/data/webs/linguistics/linguistics.json +++ b/data/webs/linguistics/linguistics.json @@ -1,6 +1,6 @@ { "tag": "linguistics", - "children" : [ + "dependencies" : [ "./data/webs/linguistics/name.json" ] } \ No newline at end of file diff --git a/data/webs/philosophy/philosophy.json b/data/webs/philosophy/philosophy.json index 16c032c..e52cfa7 100644 --- a/data/webs/philosophy/philosophy.json +++ b/data/webs/philosophy/philosophy.json @@ -1,6 +1,6 @@ { "tag": "philosophy", - "children" : [ + "dependencies" : [ "./data/webs/philosophy/concept.json" ] } \ No newline at end of file diff --git a/data/webs/physical-instances/characters/bert-self.json b/data/webs/physical-instances/characters/bert-self.json index 6627f4e..e3dfdf6 100644 --- a/data/webs/physical-instances/characters/bert-self.json +++ b/data/webs/physical-instances/characters/bert-self.json @@ -52,7 +52,7 @@ "child" : 9 } }, - "children" : [ + "dependencies" : [ "./data/webs/root.json" ] } \ No newline at end of file diff --git a/data/webs/physical-instances/conversations/convo1.json b/data/webs/physical-instances/conversations/convo1.json index 00e9f1d..a465652 100644 --- a/data/webs/physical-instances/conversations/convo1.json +++ b/data/webs/physical-instances/conversations/convo1.json @@ -1,6 +1,6 @@ { "tag" : "convo1", - "children" : [ + "dependencies" : [ "./data/webs/physical-instances/characters/bert-self.json" ] } \ No newline at end of file diff --git a/data/webs/qualia/color.json b/data/webs/qualia/color.json index 66a43eb..eab81f1 100644 --- a/data/webs/qualia/color.json +++ b/data/webs/qualia/color.json @@ -15,10 +15,14 @@ "id" : 0, "name" : "instanceOf", "parent" : 0, + "parentWeb" : "qualia", + "child" : 0 + }, + "1" : { + "id" : 1, + "name" : "instanceOf", + "parent" : 0, "child" : 1 } - }, - "crossRelations" : [ - - ] + } } \ No newline at end of file diff --git a/data/webs/qualia/qualia.json b/data/webs/qualia/qualia.json index f2ec105..ed5aab7 100644 --- a/data/webs/qualia/qualia.json +++ b/data/webs/qualia/qualia.json @@ -6,19 +6,10 @@ "name" : "qualia" } }, - "relations" : { - "0" : { - "id" : 0, - "name" : "instanceOf", - "parent" : 0, - "child" : 0, - "childWeb" : "color" - } - }, "anchors" : { "qualia" : 0 }, - "children" : [ + "dependencies" : [ "./data/webs/qualia/color.json" ] } \ No newline at end of file diff --git a/data/webs/root.json b/data/webs/root.json index 8b1d91c..fecd5e7 100644 --- a/data/webs/root.json +++ b/data/webs/root.json @@ -71,7 +71,7 @@ "anchors" : { "self" : 2 }, - "children" : [ + "dependencies" : [ "./data/webs/linguistics/linguistics.json", "./data/webs/philosophy/philosophy.json", "./data/webs/qualia/qualia.json" diff --git a/data/webs/test/web.json b/data/webs/test/web.json index 8b7eb06..ecc9f73 100644 --- a/data/webs/test/web.json +++ b/data/webs/test/web.json @@ -1,6 +1,6 @@ { "tag" : "web", - "children" : [ + "dependencies" : [ "./data/webs/physical-instances/conversations/convo1.json" ] } \ No newline at end of file diff --git a/src/main/java/org/studiorailgun/knowledge/KnowledgeWeb.java b/src/main/java/org/studiorailgun/knowledge/KnowledgeWeb.java index 6017422..8621bfb 100644 --- a/src/main/java/org/studiorailgun/knowledge/KnowledgeWeb.java +++ b/src/main/java/org/studiorailgun/knowledge/KnowledgeWeb.java @@ -56,7 +56,7 @@ public class KnowledgeWeb { /** * Child webs */ - List children; + List dependencies; /** * Constructor @@ -177,8 +177,8 @@ public class KnowledgeWeb { rVal.anchors.updateReferences(crossRelationLookupMap, rVal.getTag()); } //parse children - if(rVal.getChildren() != null && rVal.getChildren().size() > 0){ - for(String child : rVal.getChildren()){ + if(rVal.getDependencies() != null && rVal.getDependencies().size() > 0){ + for(String child : rVal.getDependencies()){ KnowledgeWeb childWeb = KnowledgeWeb.recursivelyLoad(crossRelationLookupMap, foundTags, child); KnowledgeWeb.registerChildItems(crossRelationLookupMap, rVal, childWeb); } @@ -281,11 +281,11 @@ public class KnowledgeWeb { } /** - * Gets the child webs of this web - * @return The list of child webs + * Gets the list of webs upon which this depends + * @return The list of dependency webs */ - public List getChildren(){ - return children; + public List getDependencies(){ + return dependencies; } public String getTag(){ diff --git a/web.json b/web.json index 9b2246a..7f55206 100644 --- a/web.json +++ b/web.json @@ -1,7 +1,7 @@ { "tag" : "top", "selfId": 2, - "children" : [ + "dependencies" : [ "./data/webs/root.json" ] } \ No newline at end of file