From 6f1b22105a987334e824dd9c1ccbaded678a8872 Mon Sep 17 00:00:00 2001
From: jjenista <jjenista>
Date: Mon, 2 Mar 2009 22:38:08 +0000
Subject: [PATCH] disjointness annotations to D2

---
 Robust/src/Benchmarks/mlp/directto/mlp-java/Flight.java      | 2 +-
 Robust/src/Benchmarks/mlp/directto/mlp-java/FlightList.java  | 2 +-
 Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java | 2 +-
 Robust/src/Benchmarks/mlp/directto/mlp-java/makefile         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-java/Flight.java b/Robust/src/Benchmarks/mlp/directto/mlp-java/Flight.java
index 4089257b..25529f54 100755
--- a/Robust/src/Benchmarks/mlp/directto/mlp-java/Flight.java
+++ b/Robust/src/Benchmarks/mlp/directto/mlp-java/Flight.java
@@ -51,7 +51,7 @@ public class Flight /*implements Cloneable*/ {
   }
 
   public static Flight copyOf( D2 d2, Flight f) {
-    Flight fNew       = new Flight(d2, f.flightID);
+    Flight fNew       = disjoint flightCopy new Flight(d2, f.flightID);
     fNew.trialStatus  = f.trialStatus;
     fNew.aircraftType = f.aircraftType;
     fNew.track        = f.track;
diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-java/FlightList.java b/Robust/src/Benchmarks/mlp/directto/mlp-java/FlightList.java
index f1a5c1e5..4049d274 100755
--- a/Robust/src/Benchmarks/mlp/directto/mlp-java/FlightList.java
+++ b/Robust/src/Benchmarks/mlp/directto/mlp-java/FlightList.java
@@ -21,7 +21,7 @@ public class FlightList {
   */
 
   public /*static*/ void addFlightPlan(int time, StringTokenizer st) { 
-    Flight newFlight=new Flight(d2, st.nextToken());
+    Flight newFlight=disjoint flightAdd new Flight(d2, st.nextToken());
     noFlights++;
     f.addElement(newFlight);
     FlightPlan fAux=new FlightPlan();
diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java b/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java
index b5af4b37..826f7814 100755
--- a/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java
+++ b/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java
@@ -38,7 +38,7 @@ public class MessageList {
     StringTokenizer st=new StringTokenizer(line);
     int time=Integer.parseInt(st.nextToken());
     String type=st.nextToken();	
-    Message newMessage=new Message(d2,time,type,st);
+    Message newMessage=disjoint msgs new Message(d2,time,type,st);
     messages.addElement(newMessage);
     if (type.equals("DO_WORK"))
       return true;
diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-java/makefile b/Robust/src/Benchmarks/mlp/directto/mlp-java/makefile
index 168cf6ce..d9679373 100644
--- a/Robust/src/Benchmarks/mlp/directto/mlp-java/makefile
+++ b/Robust/src/Benchmarks/mlp/directto/mlp-java/makefile
@@ -4,7 +4,7 @@ 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: $(PROGRAM).bin
 
-- 
2.34.1