From fb0c0837598c0f9c9b8f06e13445464912ec0c44 Mon Sep 17 00:00:00 2001 From: jjenista Date: Tue, 3 Mar 2009 18:12:56 +0000 Subject: [PATCH] tagger with disjoint annotations --- Robust/src/Benchmarks/mlp/tagger/mlp-java/Engine.java | 4 ++-- Robust/src/Benchmarks/mlp/tagger/mlp-java/PropertyParser.java | 2 +- Robust/src/Benchmarks/mlp/tagger/mlp-java/QuarkGenerator.java | 2 +- Robust/src/Benchmarks/mlp/tagger/mlp-java/makefile | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Robust/src/Benchmarks/mlp/tagger/mlp-java/Engine.java b/Robust/src/Benchmarks/mlp/tagger/mlp-java/Engine.java index 5c3d52c9..5fe3fb66 100644 --- 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 () { actions = new LinkedList [Token.MAXTOKEN() + 1]; for (int i = 0; i < actions.length; i++) - actions[i] = new LinkedList (); - default_actions = new LinkedList (); + actions[i] = disjoint llActions new LinkedList (); + default_actions = /*disjoint llDefault*/ new LinkedList (); } public void register_by_type (Action action, int type) { diff --git a/Robust/src/Benchmarks/mlp/tagger/mlp-java/PropertyParser.java b/Robust/src/Benchmarks/mlp/tagger/mlp-java/PropertyParser.java index 5bc79fde..ca999d14 100644 --- 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) */ public LinkedList get_property_list () { - LinkedList result = new LinkedList (); + LinkedList result = /*disjoint llPropList*/ new LinkedList (); while (!is_eol (next_char) && !is_eos(next_char)) result.add (get_property ()); consume_char (); diff --git a/Robust/src/Benchmarks/mlp/tagger/mlp-java/QuarkGenerator.java b/Robust/src/Benchmarks/mlp/tagger/mlp-java/QuarkGenerator.java index 981d68a4..ecb678c2 100644 --- 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; // stack holds strings used to terminate formats - format_stack = new LinkedList (); + format_stack = /*disjoint llQuarkGen*/ new LinkedList (); } public void suppress_on () { diff --git a/Robust/src/Benchmarks/mlp/tagger/mlp-java/makefile b/Robust/src/Benchmarks/mlp/tagger/mlp-java/makefile index 281bd079..34e8d80c 100644 --- 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 & -- 2.34.1