tagger with disjoint annotations

diff --git a/Robust/src/Benchmarks/mlp/tagger/mlp-java/Engine.java b/Robust/src/Benchmarks/mlp/tagger/mlp-java/Engine.java
index 5c3d52c90ac9250a823e950a26bc91fb2271bfbf..5fe3fb668442bc91bbf992b3e4ff5e4565faf091 100644 (file)
--- a/Robust/src/Benchmarks/mlp/tagger/mlp-java/Engine.java
+++ b/Robust/src/Benchmarks/mlp/tagger/mlp-java/Engine.java
@@ -29,8 +29,8 @@ public class Engine {
   public Engine () {\r
     actions = new LinkedList [Token.MAXTOKEN() + 1];\r
     for (int i = 0; i < actions.length; i++)\r
-      actions[i] = new LinkedList ();\r
-    default_actions = new LinkedList ();\r
+      actions[i] = disjoint llActions new LinkedList ();\r
+    default_actions = /*disjoint llDefault*/ new LinkedList ();\r
   }\r
 \r
   public void register_by_type (Action action, int type) {\r

diff --git a/Robust/src/Benchmarks/mlp/tagger/mlp-java/PropertyParser.java b/Robust/src/Benchmarks/mlp/tagger/mlp-java/PropertyParser.java
index 5bc79fdea74fe4ad8e2626ec3fba1259bbcb4a85..ca999d14060e76d947b3a257ddd4aec2470bbebf 100644 (file)
--- a/Robust/src/Benchmarks/mlp/tagger/mlp-java/PropertyParser.java
+++ b/Robust/src/Benchmarks/mlp/tagger/mlp-java/PropertyParser.java
@@ -67,7 +67,7 @@ public class PropertyParser {
    *   case in which first property is removed (eg, because it's a style name)\r
    */\r
   public LinkedList get_property_list () {\r
-    LinkedList result = new LinkedList ();\r
+    LinkedList result = /*disjoint llPropList*/ new LinkedList ();\r
     while (!is_eol (next_char) && !is_eos(next_char))\r
       result.add (get_property ());\r
     consume_char ();\r

diff --git a/Robust/src/Benchmarks/mlp/tagger/mlp-java/QuarkGenerator.java b/Robust/src/Benchmarks/mlp/tagger/mlp-java/QuarkGenerator.java
index 981d68a4101e8bb072f0b1dccf3afa6cc7e71a6c..ecb678c2c05df968cc99b1fa9e55843ccd4dde72 100644 (file)
--- a/Robust/src/Benchmarks/mlp/tagger/mlp-java/QuarkGenerator.java
+++ b/Robust/src/Benchmarks/mlp/tagger/mlp-java/QuarkGenerator.java
@@ -20,7 +20,7 @@ public class QuarkGenerator extends Generator {
     output_stream = s;\r
     \r
     // stack holds strings used to terminate formats\r
-    format_stack = new LinkedList ();\r
+    format_stack = /*disjoint llQuarkGen*/ new LinkedList ();\r
   }\r
   \r
   public void suppress_on () {\r

diff --git a/Robust/src/Benchmarks/mlp/tagger/mlp-java/makefile b/Robust/src/Benchmarks/mlp/tagger/mlp-java/makefile
index 281bd079c5f43703c39309d432c632906fc84aa6..34e8d80ca4aaf88fe4603b1a50a4c58605cbd819 100644 (file)
--- a/Robust/src/Benchmarks/mlp/tagger/mlp-java/makefile
+++ b/Robust/src/Benchmarks/mlp/tagger/mlp-java/makefile
@@ -4,12 +4,12 @@ PROGRAM=test
 SOURCE_FILES=*.java
 
 BUILDSCRIPT=~/research/Robust/src/buildscript
-BSFLAGS= -debug -nooptimize -mainclass $(MAIN_CLASS) #-justanalyze -ownership -ownallocdepth 1 -ownwritedots final -enable-assertions
+BSFLAGS= -debug -nooptimize -mainclass $(MAIN_CLASS) -justanalyze -ownership -ownallocdepth 1 -ownwritedots final -ownaliasfile aliases.txt -enable-assertions
 
 all: run
 
 run: $(PROGRAM).bin
-       $(PROGRAM).bin test
+#      $(PROGRAM).bin test
 
 view: PNGs
        eog *.png &