From ecea89dac16c80cef725c068326d395e3ef0d30f Mon Sep 17 00:00:00 2001 From: jjenista Date: Mon, 2 Mar 2009 21:58:32 +0000 Subject: [PATCH] polishing up mlp version of benchmark --- .../mlp/directto/mlp-java/AircraftList.java | 6 ++-- .../mlp/directto/mlp-java/Algorithm.java | 8 +++--- .../Benchmarks/mlp/directto/mlp-java/D2.java | 6 ++-- .../mlp/directto/mlp-java/FixList.java | 6 ++-- .../mlp/directto/mlp-java/FlightList.java | 18 ++++++------ .../mlp/directto/mlp-java/FlightPlan.java | 2 +- .../mlp/directto/mlp-java/Message.java | 28 +++++++++---------- .../mlp/directto/mlp-java/MessageList.java | 6 ++-- .../mlp/directto/mlp-java/ReadWrite.java | 3 +- .../mlp/directto/mlp-java/Static.java | 10 +++---- .../mlp/directto/mlp-java/Track.java | 2 +- .../mlp/directto/mlp-java/Trajectory.java | 4 +-- .../mlp-java/TrajectorySynthesizer.java | 12 ++++---- .../mlp/directto/mlp-java/TrialFlight.java | 20 ++++++------- .../Benchmarks/mlp/directto/mlp-java/makefile | 4 ++- .../mlp/directto/original-java/Message.java | 2 +- .../directto/original-java/MessageList.java | 2 +- .../mlp/directto/original-java/makefile | 12 ++++++++ 18 files changed, 84 insertions(+), 67 deletions(-) create mode 100644 Robust/src/Benchmarks/mlp/directto/original-java/makefile diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-java/AircraftList.java b/Robust/src/Benchmarks/mlp/directto/mlp-java/AircraftList.java index 766e391b..3326ec95 100755 --- a/Robust/src/Benchmarks/mlp/directto/mlp-java/AircraftList.java +++ b/Robust/src/Benchmarks/mlp/directto/mlp-java/AircraftList.java @@ -39,11 +39,11 @@ public class AircraftList { } public void printInfo() { - //System.out.println("\n\nThe number of aircrafts:"+noAircrafts); - //System.out.println("The aircrafts are:"); + System.out.println("\n\nThe number of aircrafts:"+noAircrafts); + System.out.println("The aircrafts are:"); for( int i = 0; i < aircrafts.size(); ++i ) { Aircraft aAux=(Aircraft) aircrafts.elementAt(i); - //System.out.println(aAux); + System.out.println(aAux); } } diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-java/Algorithm.java b/Robust/src/Benchmarks/mlp/directto/mlp-java/Algorithm.java index e8682b07..a969ad76 100755 --- a/Robust/src/Benchmarks/mlp/directto/mlp-java/Algorithm.java +++ b/Robust/src/Benchmarks/mlp/directto/mlp-java/Algorithm.java @@ -44,7 +44,7 @@ public class Algorithm { Point4d point1=(Point4d) p1.elementAt(pos); Point4d point2=(Point4d) p2.elementAt(pos); if (isConflict(point1,point2)) { - //System.out.println(point1+" "+point2); + System.out.println(point1+" "+point2); found=true; conflictPoint=point1; } @@ -81,8 +81,8 @@ public class Algorithm { public /*static*/ void doIteration() { time=initialTime+currIteration*d2.getStatic().iterationStep(); currIteration++; - //System.out.println("In doIteration!"); - //System.out.println("Time:"+time); + System.out.println("In doIteration!"); + System.out.println("Time:"+time); cList.clear(); @@ -95,7 +95,7 @@ public class Algorithm { d2.getTrajectorySynthesizer().updateTrajectory(time,aAux); } - //System.out.println("Does it get here? (after the trajectory update)"); + System.out.println("Does it get here? (after the trajectory update)"); for (i=0;i0)? traject.getPointAt(i-1).time+timeF:time+timeF; } flight.traject=traject; - //System.out.println("Finished updating trajectory ..."); + System.out.println("Finished updating trajectory ..."); return traject; } @@ -160,7 +160,7 @@ public class TrajectorySynthesizer { if ((distance>horizTotalDist)&&(horizTotalDist>0)) { timeF=(accel<=0)?(horizTotalDist/hSpeed): (-hSpeed+Math.sqrt(hSpeed*hSpeed+2*accel*horizTotalDist))/accel; - //System.out.println("TIMEF= "+timeF); + System.out.println("TIMEF= "+timeF); } horizTotalDist-=distance; diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-java/TrialFlight.java b/Robust/src/Benchmarks/mlp/directto/mlp-java/TrialFlight.java index 409773d9..f420b71f 100755 --- a/Robust/src/Benchmarks/mlp/directto/mlp-java/TrialFlight.java +++ b/Robust/src/Benchmarks/mlp/directto/mlp-java/TrialFlight.java @@ -52,33 +52,33 @@ public class TrialFlight { changeToTrialRoute(position, fixIndex); trajectoryDiff(position.time); conflictsDiff(position.time); - //System.out.println("old route:"+oldFlight.fPlan.r); - //System.out.println("new route:"+trialFlight.fPlan.r); + System.out.println("old route:"+oldFlight.fPlan.r); + System.out.println("new route:"+trialFlight.fPlan.r); trialFlight.trialStatus=-1; } public void trajectoryDiff (double time) { trialFlight.updateTrajectory(time); oldFlight.updateTrajectory(time); - //System.out.println("Flight "+trialFlight.flightID+":"); + System.out.println("Flight "+trialFlight.flightID+":"); distDiff=oldFlight.traject.distanceToDestination()- trialFlight.traject.distanceToDestination(); timeDiff=oldFlight.traject.timeToDestination(time)- trialFlight.traject.timeToDestination(time); if (timeDiff<0) { timeDiff=0; } - //System.out.println("Time difference: "+timeDiff); - //System.out.println("Distance difference: "+distDiff); + System.out.println("Time difference: "+timeDiff); + System.out.println("Distance difference: "+distDiff); } public void conflictsDiff(double time) { int i, j; oldConflicts=d2.getAlgorithm().getConflictsWith(time,oldFlight); newConflicts=d2.getAlgorithm().getConflictsWith(time,trialFlight); - //System.out.println("Flight "+trialFlight.flightID+":"); - //System.out.println("Conflicts for the old flight:"); - //System.out.println(oldConflicts); - //System.out.println("Conflicts for the trial flight:"); - //System.out.println(newConflicts); + System.out.println("Flight "+trialFlight.flightID+":"); + System.out.println("Conflicts for the old flight:"); + System.out.println(oldConflicts); + System.out.println("Conflicts for the trial flight:"); + System.out.println(newConflicts); noNew=0; for (i=0 ; i output.txt + +D2.class: D2.java + javac D2.java + +clean: + rm -f *.class + rm -f *~ + rm -f output.txt -- 2.34.1