polishing up mlp version of benchmark
authorjjenista <jjenista>
Mon, 2 Mar 2009 21:58:32 +0000 (21:58 +0000)
committerjjenista <jjenista>
Mon, 2 Mar 2009 21:58:32 +0000 (21:58 +0000)
18 files changed:
Robust/src/Benchmarks/mlp/directto/mlp-java/AircraftList.java
Robust/src/Benchmarks/mlp/directto/mlp-java/Algorithm.java
Robust/src/Benchmarks/mlp/directto/mlp-java/D2.java
Robust/src/Benchmarks/mlp/directto/mlp-java/FixList.java
Robust/src/Benchmarks/mlp/directto/mlp-java/FlightList.java
Robust/src/Benchmarks/mlp/directto/mlp-java/FlightPlan.java
Robust/src/Benchmarks/mlp/directto/mlp-java/Message.java
Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java
Robust/src/Benchmarks/mlp/directto/mlp-java/ReadWrite.java
Robust/src/Benchmarks/mlp/directto/mlp-java/Static.java
Robust/src/Benchmarks/mlp/directto/mlp-java/Track.java
Robust/src/Benchmarks/mlp/directto/mlp-java/Trajectory.java
Robust/src/Benchmarks/mlp/directto/mlp-java/TrajectorySynthesizer.java
Robust/src/Benchmarks/mlp/directto/mlp-java/TrialFlight.java
Robust/src/Benchmarks/mlp/directto/mlp-java/makefile
Robust/src/Benchmarks/mlp/directto/original-java/Message.java
Robust/src/Benchmarks/mlp/directto/original-java/MessageList.java
Robust/src/Benchmarks/mlp/directto/original-java/makefile [new file with mode: 0644]

index 766e391b6c297d655f09e3c6f56f2cf259918764..3326ec9584388db99081819ed873411592aa5afe 100755 (executable)
@@ -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);
     }
   }
 
index e8682b077ca730b6ffd7d058d01ae11d310412e8..a969ad76040dff18be232daac9df05da33ef886e 100755 (executable)
@@ -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;i<n;i++)
       for (j=i+1;j<n;j++) {
index 531cbe32e578f399c4268236fcf9af5e2a988084..42a9257aeb7f56b76e6d477789c4d1c0a32dfec2 100755 (executable)
@@ -28,6 +28,8 @@ public class D2 {
   }
 
   public static void main(String arg[]) {
+    System.out.println("D2 - Application started");
+
     D2 d2 = new D2();
 
     d2.rw=new ReadWrite( d2 );
@@ -41,10 +43,10 @@ public class D2 {
       
       count++;
       if( count % 10000 == 0 ) {
-       System.out.println( "iteration "+count );
+       //System.out.println( "iteration "+count );
       }
 
-      if( count == 40000 ) {
+      if( count == 1000 ) {
        break;
       }
     }
index 5c324656b4279b69bfe9f4702fc31cef35e5f5d4..dd7186b46834a45ea917f3d9b49ba132229d2ae8 100755 (executable)
@@ -51,11 +51,11 @@ public class FixList {
   }
 
   public /*static*/ void printInfo() {
-    //System.out.println("\n\nThe number of fixes:"+_noFixes);
-    //System.out.println("The fixes are:");
+    System.out.println("\n\nThe number of fixes:"+_noFixes);
+    System.out.println("The fixes are:");
     for( int i = 0; i < _fixes.size(); ++i ) {
       Fix bAux=(Fix) _fixes.elementAt( i );
-      //System.out.println(bAux);
+      System.out.println(bAux);
     }
   }
 
index b3b5caf6dc42cb1f7c114de3fbb1ae90b2d4e923..f1a5c1e59444e8dff94fe67b26a6f060d6fbb2a3 100755 (executable)
@@ -77,14 +77,14 @@ public class FlightList {
       t=new Track(pos, vel);
       nameFix=st.nextToken();
       fAux=getFlight(id);
-      //System.out.println(id+" Flight id: "+fAux.flightID);
+      System.out.println(id+" Flight id: "+fAux.flightID);
       fAux.setTrack(t);
-      //System.out.println("Setting current fix ...");
+      System.out.println("Setting current fix ...");
       fAux.fPlan.setCurrentFix(nameFix);
-      //System.out.println("Sent flight "+
-      //fAux.flightID+
-      //                "; position: "+
-      //                fAux.track.pos);
+      System.out.println("Sent flight "+
+                        fAux.flightID+
+                        "; position: "+
+                        fAux.track.pos);
       d2.getTrajectorySynthesizer().updateTrajectory(time, fAux);
       fAux.traject.printInfo();      
     }
@@ -119,11 +119,11 @@ public class FlightList {
   }
 
   public /*static*/ void printInfo() {
-    //System.out.println("\n\nThe number of flights:"+noFlights);
-    //System.out.println("The flights are:");
+    System.out.println("\n\nThe number of flights:"+noFlights);
+    System.out.println("The flights are:");
     for( int i = 0; i < f.size(); ++i ) {
       Flight fAux=(Flight) f.elementAt(i);
-      //System.out.println(fAux);
+      System.out.println(fAux);
     }
   }
 }
index 1deabb25adcd5940bb149e81f0a8e11eda924ecc..6a3ce0194126eccf1971e79e5075d10e8fe60e67 100755 (executable)
@@ -25,7 +25,7 @@ public class FlightPlan {
 
   public void setCurrentFix(String nameFix) {
     int i=r.getIndexOf(nameFix);
-    //System.out.println("name of the fix: "+nameFix+" index:"+i);
+    System.out.println("name of the fix: "+nameFix+" index:"+i);
     r.setCurrent(i);
   }    
 }
index d2958c07d2f5d35eb192dcde07996ce3c6c48039..9d98f6fbd26569bbc3a394bcdb183b2a02d6c564 100755 (executable)
@@ -22,39 +22,39 @@ public class Message {
   }
 
   public void executeMessage() {
-    //System.out.println("Executing message of type "+type);
+    System.out.println("Executing message of type "+type);
 
     //static messages
     if (type.compareTo("SET_MAP_SIZE")==0) {
-      //System.out.println("Setting the map size...");
+      System.out.println("Setting the map size...");
       d2.getStatic().setMapSize(parameters);
     }
     else if (type.compareTo("SET_ITERATION_STEP")==0) {
-      //System.out.println("Setting the iteration step...");
+      System.out.println("Setting the iteration step...");
       d2.getStatic().setIterationStep(parameters);             
     }
     else if (type.compareTo("SET_NO_OF_ITERATIONS")==0) {
-      //System.out.println("Setting the no. of iterations...");
+      System.out.println("Setting the no. of iterations...");
       d2.getStatic().setNumberOfIterations(parameters);                
     }
     else if (type.compareTo("SET_CYLINDER")==0) {
-      //System.out.println("Setting the cylinder of safety/unsafety...");
+      System.out.println("Setting the cylinder of safety/unsafety...");
       d2.getStatic().setCylinder(parameters);          
     }
     else if (type.compareTo("ADD_FIX")==0) {
-      //System.out.println("Adding a new fix...");
+      System.out.println("Adding a new fix...");
       d2.getFixList().addFix(parameters);
     }
     else if (type.compareTo("REMOVE_FIX")==0) {
-      //System.out.println("Removing a fix...");
+      System.out.println("Removing a fix...");
       d2.getFixList().removeFix(parameters);
     }
     else if (type.compareTo("ADD_AIRCRAFT")==0) {
-      //System.out.println("Adding an aircraft...");
+      System.out.println("Adding an aircraft...");
       d2.getAircraftList().addAircraft(parameters);
     }
     else if (type.compareTo("REMOVE_AIRCRAFT")==0) {
-      //System.out.println("Removing an aircraft...");
+      System.out.println("Removing an aircraft...");
       d2.getAircraftList().removeAircraft(parameters);
     }
 
@@ -63,23 +63,23 @@ public class Message {
       d2.getAlgorithm().setInitialTime(time);
 
     if (type.compareTo("ADD_FLIGHT_PLAN")==0) {
-      //System.out.println("Adding flight plan...");
+      System.out.println("Adding flight plan...");
       d2.getFlightList().addFlightPlan(time,parameters);               
     }
     else if (type.compareTo("REMOVE_FLIGHT_PLAN")==0) {
-      //System.out.println("Removing flight plan...");
+      System.out.println("Removing flight plan...");
       d2.getFlightList().removeFlightPlan(time,parameters);            
     }
     else if (type.compareTo("AMEND_FLIGHT_INFO")==0) {
-      //System.out.println("Amending flight info...");
+      System.out.println("Amending flight info...");
       d2.getFlightList().amendFlightInfo(time,parameters);
     }              
     else if (type.compareTo("AMEND_FLIGHT_PLAN")==0) {
-      //System.out.println("Amending flight plan...");
+      System.out.println("Amending flight plan...");
       d2.getFlightList().amendFlightPlan(time,parameters);            
     }
     else if (type.compareTo("SENDING_AIRCRAFT")==0) {
-      //System.out.println("Sending aircraft data...");
+      System.out.println("Sending aircraft data...");
       d2.getFlightList().sendingAircraft(time,parameters);
     }
   }
index 41bb5c929e1a5a7428ecb8c7bb56811b84243a52..b5af4b372e9297fcf44cb8d7339a52b699f7e171 100755 (executable)
@@ -29,7 +29,7 @@ public class MessageList {
     if (line.equals(""))
       return false;
 
-    //System.out.println("I'm reading line "+line);       
+    System.out.println("I'm reading line "+line);       
 
     // treating comments
     if ((line.charAt(0)=='/')&&(line.charAt(1)=='/'))
@@ -47,13 +47,13 @@ public class MessageList {
   }
   
   public void executeAll() {
-    //System.out.println("executeAll: we have "+messages.size()+" messages.");
+    System.out.println("executeAll: we have "+messages.size()+" messages.");
     while(hasNext())
       next().executeMessage();     
     d2.getStatic().printInfo();
     d2.getFixList().printInfo();
     d2.getAircraftList().printInfo();  
     d2.getFlightList().printInfo();
-    //System.out.println("Messages executed\n\n\n\n\n");
+    System.out.println("Messages executed\n\n\n\n\n");
   }
 }
index eea84aad61575bd825f87622b2fe4aedc99cddad..f3f67914d79a14ef0ccd9c10cca5c4df211ce4f3 100755 (executable)
@@ -24,7 +24,8 @@ public class ReadWrite {
        break;
     }
 
-    //System.out.println("Input data read.");
+    System.out.println("Input data read.");
+    System.out.println("Data set read");
   }   
 
   public void write() {
index af96431fe830b677943b864f4e63f72c2857a1d6..ad376244ac92ebbacf8c7c9356649304fd2ce1fa 100755 (executable)
@@ -37,10 +37,10 @@ public class Static {
 
   // this is a test procedure
   public /*static*/ void printInfo() {
-    //System.out.println("\n\nStatic Data:");
-    //System.out.println("Width:"+_width+"        Height:"+_height);
-    //System.out.println("Radius of safety/unsafety:"+_radius);
-    //System.out.println("Distance of safety/unsafety:"+_distance);
-    //System.out.println("Iteration step:"+_iterationStep+"     No. of Iterations:"+_noIterations);                      
+    System.out.println("\n\nStatic Data:");
+    System.out.println("Width:"+_width+"        Height:"+_height);
+    System.out.println("Radius of safety/unsafety:"+_radius);
+    System.out.println("Distance of safety/unsafety:"+_distance);
+    System.out.println("Iteration step:"+_iterationStep+"     No. of Iterations:"+_noIterations);                        
   }  
 }
index 23642cfc96bdc9ebeaa14267edba8a61d2c1469e..73b3d8ead5ca0837a797397adc093dfd51db1e71 100755 (executable)
@@ -18,6 +18,6 @@ public class Track {
   }
   
   public void printInfo() {
-    //System.out.println("track: "+pos+"||"+vel);
+    System.out.println("track: "+pos+"||"+vel);
   }
 }
index e2a25e165ff7f1ba490ebd14434f57bcedc64188..a8fd4698f507a5970628fbf0350695552f150c51 100755 (executable)
@@ -52,9 +52,9 @@ public class Trajectory {
   }
 
   public void printInfo() {
-    //System.out.println("New trajectory: ");
+    System.out.println("New trajectory: ");
     for (int i=0 ; i<noPoints ; i++) {
-      //System.out.println(getPointAt(i));
+      System.out.println(getPointAt(i));
     }    
   }  
 }
index 753e0ead5c236c77533b93da46f8a4b5c9352120..232d6b7a6461461eb2a4e8591b501c31f8f02974 100755 (executable)
@@ -33,10 +33,10 @@ public class TrajectorySynthesizer {
   }
 
   public /*static*/ Trajectory updateTrajectory (double time, Flight flight) {
-    //System.out.println("Updating trajectory for "+flight.flightID);
+    System.out.println("Updating trajectory for "+flight.flightID);
     int i;
     setInitialParameters(flight);
-    //System.out.println("Starting position: "+currentPos);
+    System.out.println("Starting position: "+currentPos);
     if (currentPos.outOfRange()) {
       traject.setNoPoints(1);
       traject.setPoint(0, currentPos);
@@ -47,7 +47,7 @@ public class TrajectorySynthesizer {
       for (i=0 ; (!currentPos.outOfRange()) && (i<limit()) ; i++) {
        getTrajectoryPoint(flight, time+i*d2.getStatic().iterationStep());
        if (i==0) {
-         //System.out.println("current position: "+currentPos);
+         System.out.println("current position: "+currentPos);
          traject.distToDest=horizTotalDist;
          traject.nextFixIndex=nextFix;
          traject.nextFix=(currentPos.outOfRange())? null : flight.fPlan.r.getFixAt(nextFix);
@@ -58,12 +58,12 @@ public class TrajectorySynthesizer {
        traject.setPoint(i, (Point4d) currentPos);
       }
       traject.setNoPoints(--i);
-      //System.out.println(traject.noPoints);
+      System.out.println(traject.noPoints);
       traject.timeToDest=(i>0)? 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;
index 409773d967d53ca16f142882cb9f278a59feb0f0..f420b71f93a166c1b1714874d4cd04b4c767c2b3 100755 (executable)
@@ -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<newConflicts.noConflicts ; i++) {
       Conflict conflict=newConflicts.conflictAt(i);
index cdaea1f52feea331aa07b529142503ba8eefc406..168cf6cebf1c2f3e6ad1ab5d0864a084736608a7 100644 (file)
@@ -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 -enable-assertions
 
 all: $(PROGRAM).bin
 
@@ -26,3 +26,5 @@ clean:
        rm -f  *.dot
        rm -f  *.png
        rm -f  aliases.txt
+       rm -f  output.txt
+
index 37a87b03914a7bf4dc29a745c6c596bbc80165ae..1fefb9aae8963ab16e56ab396b6828b3fc2dd861 100755 (executable)
@@ -71,7 +71,7 @@ class Message
 
        if (type.compareTo("ADD_FLIGHT_PLAN")==0)
            {
-               System.out.println("Adding flight plane...");
+               System.out.println("Adding flight plan...");
                FlightList.addFlightPlan(time,parameters);              
            }
        if (type.compareTo("REMOVE_FLIGHT_PLAN")==0)
index e8094b4f113f59126f550eae878c38290104b3df..ac2920b2d077b9c8d9542b0cfc30579efcfca4fd 100755 (executable)
@@ -46,7 +46,7 @@ class MessageList
   
   public static void executeAll()
   {
-      System.out.println("executeAll: we have "+messages.size()+" messages.");
+    System.out.println("executeAll: we have "+messages.size()+" messages.");
     while (hasNext())
       next().executeMessage();     
     Static.printInfo();
diff --git a/Robust/src/Benchmarks/mlp/directto/original-java/makefile b/Robust/src/Benchmarks/mlp/directto/original-java/makefile
new file mode 100644 (file)
index 0000000..02354d4
--- /dev/null
@@ -0,0 +1,12 @@
+all: run
+
+run: D2.class
+       java D2 > output.txt
+
+D2.class: D2.java
+       javac D2.java
+
+clean:
+       rm -f *.class
+       rm -f *~
+       rm -f output.txt