refactoring, e.g. edges have scores, not weights

1 files changed, 21 insertions, 21 deletions

diff --git a/example/json/test.json b/example/json/test.json
index bc422c6..aa0b45e 100644
--- a/example/json/test.json
+++ b/example/json/test.json
@@ -4,30 +4,30 @@
 },
 "nodes":
 [
-{ "id":-1, "cat":"root" },
-{ "id":0, "cat":"NP" },
-{ "id":1, "cat":"V" },
-{ "id":2, "cat":"JJ" },
-{ "id":3, "cat":"NN" },
-{ "id":4, "cat":"NP" },
-{ "id":5, "cat":"VP" },
-{ "id":6, "cat":"S" },
-{ "id":7, "cat":"Goal" }
+{ "id":-1 },
+{ "id":0  },
+{ "id":1  },
+{ "id":2  },
+{ "id":3  },
+{ "id":4  },
+{ "id":5  },
+{ "id":6  },
+{ "id":7  }
 ],
 "edges":
 [
-{"head":0, "rule":"[NP@0:1] ||| ich ||| i ||| logp=-0.5 use_i=1.0",              "tails":[ -1 ], "f":{"logp":-0.5, "use_i":1.0} },
-{"head":1, "rule":"[V@1:2] ||| sah ||| saw ||| logp=-0.25 use_saw=1.0",          "tails":[ -1  ], "f":{"logp":-0.25, "use_saw":1.0} },
-{"head":2, "rule":"[JJ@3:4] ||| kleines ||| small ||| logp=0.0 use_small=1.0",   "tails":[ -1 ], "f":{"logp":0.0, "use_small":1.0} },
-{"head":2, "rule":"[JJ@3:4] ||| kleines ||| little ||| logp=0.0 use_little=1.0", "tails":[ -1  ], "f":{"logp":0.0, "use_little":1.0} },
-{"head":3, "rule":"[NN@3:5] ||| kleines haus ||| small house ||| logp=0.0 use_house=1.0",  "tails":[ -1 ], "f":{"logp":0.0, "use_house":1.0} },
-{"head":3, "rule":"[NN@3:5] ||| kleines haus ||| little house ||| logp=0.0 use_house=1.0", "tails":[ -1 ], "f":{"logp":0.0, "use_house":1.0} },
-{"head":3, "rule":"[NN@3:5] ||| [JJ@3:4,1] haus ||| [JJ@3:4,1] house ||| logp=0.0 use_house=1.0", "tails":[ 2 ], "f":{"logp":0.0, "use_house":1.0} },
-{"head":3, "rule":"[NN@3:5] ||| [JJ@3:4,1] haus ||| [JJ@3:4,1] shell ||| logp=0.0 use_shell=1.0", "tails":[ 2 ], "f":{"logp":0.0, "use_shell":1.0} },
-{"head":4, "rule":"[NP@2:5] ||| ein [NN@3:5,1] ||| a [NN@3:5,1] ||| logp=0.0 use_a=1.0", "tails":[ 3 ], "f":{"logp":0.0, "use_a":1.0}, "weight":1.0 },
-{"head":5, "rule":"[VP@1:5] ||| [V@1:2,1] [NP@2:5,2] ||| [V@1:2,1] [NP@2:5,2] ||| logp=0.0", "tails":[ 1,4 ], "f":{"logp":0.0} },
-{"head":6, "rule":"[S@0:5] ||| [NP@0:1,1] [VP@1:5,2] ||| [NP@0:1,1] [VP@1:5,2] ||| logp=0.0", "tails":[ 0,5 ], "f":{"logp":0.0} },
-{"head":7, "rule":"[Goal@0:5] ||| [S@0:5,1] ||| [S@0:5,1] ||| ", "tails":[ 6 ], "f":{}, "weight":1.0 }
+{"head":0, "rule":"[NP@0:1]   ||| ich                   ||| i                     ||| logp=-0.5 use_i=1.0",     "tails":[ -1 ],  "f":{"logp":-0.5, "use_i":1.0} },
+{"head":1, "rule":"[V@1:2]    ||| sah                   ||| saw                   ||| logp=-0.25 use_saw=1.0",  "tails":[ -1 ], "f":{"logp":-0.25, "use_saw":1.0} },
+{"head":2, "rule":"[JJ@3:4]   ||| kleines               ||| small                 ||| logp=0.0 use_small=1.0",  "tails":[ -1 ],  "f":{"logp":0.0, "use_small":1.0} },
+{"head":2, "rule":"[JJ@3:4]   ||| kleines               ||| little                ||| logp=0.0 use_little=1.0", "tails":[ -1 ], "f":{"logp":0.0, "use_little":1.0} },
+{"head":3, "rule":"[NN@3:5]   ||| kleines haus          ||| small house           ||| logp=0.0 use_house=1.0",  "tails":[ -1 ],  "f":{"logp":0.0, "use_house":1.0} },
+{"head":3, "rule":"[NN@3:5]   ||| kleines haus          ||| little house          ||| logp=0.0 use_house=1.0",  "tails":[ -1 ],  "f":{"logp":0.0, "use_house":1.0} },
+{"head":3, "rule":"[NN@3:5]   ||| [JJ@3:4,1] haus       ||| [JJ@3:4,1] house      ||| logp=0.0 use_house=1.0",  "tails":[ 2 ],   "f":{"logp":0.0, "use_house":1.0} },
+{"head":3, "rule":"[NN@3:5]   ||| [JJ@3:4,1] haus       ||| [JJ@3:4,1] shell      ||| logp=0.0 use_shell=1.0",  "tails":[ 2 ],   "f":{"logp":0.0, "use_shell":1.0} },
+{"head":4, "rule":"[NP@2:5]   ||| ein [NN@3:5,1]        ||| a [NN@3:5,1]          ||| logp=0.0 use_a=1.0",      "tails":[ 3 ],   "f":{"logp":0.0, "use_a":1.0} },
+{"head":5, "rule":"[VP@1:5]   ||| [V@1:2,1] [NP@2:5,2]  ||| [V@1:2,1] [NP@2:5,2]  ||| logp=0.0",                "tails":[ 1,4 ], "f":{"logp":0.0} },
+{"head":6, "rule":"[S@0:5]    ||| [NP@0:1,1] [VP@1:5,2] ||| [NP@0:1,1] [VP@1:5,2] ||| logp=0.0",                "tails":[ 0,5 ], "f":{"logp":0.0} },
+{"head":7, "rule":"[Goal@0:5] ||| [S@0:5,1]             ||| [S@0:5,1]             ||| ",                        "tails":[ 6 ],   "f":{} }
 ]
 }