From: bdemsky Date: Mon, 23 Mar 2009 21:36:06 +0000 (+0000) Subject: changes X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=89f7bd3a082f931288ba1f2c244e899a9e80d754;p=IRC.git changes --- diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/D2.java b/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/D2.java index 874a1d18..5a0c06f9 100644 --- a/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/D2.java +++ b/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/D2.java @@ -41,7 +41,7 @@ public class D2 { int count = 0; while( d2.getFlightList().anyPlanesAlive() ) { - d2.getAlgorithm().doIteration(d2); + // d2.getAlgorithm().doIteration(d2); count++; if( count % 10000 == 0 ) { diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/Message.java b/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/Message.java index 6d49a2d9..f002f4a5 100644 --- a/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/Message.java +++ b/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/Message.java @@ -49,7 +49,7 @@ public class Message { else*/ if (type.compareTo("ADD_AIRCRAFT")==0) { System.out.println("Adding an aircraft..."); d2.getAircraftList().addAircraft(parameters); - } + } else /* else if (type.compareTo("REMOVE_AIRCRAFT")==0) { System.out.println("Removing an aircraft..."); diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/TrajectorySynthesizer.java b/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/TrajectorySynthesizer.java index bec9ff85..5de6652b 100644 --- a/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/TrajectorySynthesizer.java +++ b/Robust/src/Benchmarks/mlp/directto/mlp-small-for-testing/TrajectorySynthesizer.java @@ -30,7 +30,8 @@ public class TrajectorySynthesizer { } public /*static*/ Trajectory updateTrajectory (D2 d2, double time, Flight flight) { - System.out.println("Updating trajectory for "+flight.flightID); + return null; + /* System.out.println("Updating trajectory for "+flight.flightID); int i; setInitialParameters(flight); System.out.println("Starting position: "+currentPos); @@ -61,7 +62,7 @@ public class TrajectorySynthesizer { flight.traject=traject; System.out.println("Finished updating trajectory ..."); - return traject; + return traject;*/ } private /*static*/ void setInitialParameters(Flight flight) {