little benchmark cleanup changes

diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-java/D2.java b/Robust/src/Benchmarks/mlp/directto/mlp-java/D2.java
index 724f09d95430fe80ff0786cb22e0192688904c1e..874a1d18065ccf9746e3b9a42561594349f2ae6e 100755 (executable)
--- a/Robust/src/Benchmarks/mlp/directto/mlp-java/D2.java
+++ b/Robust/src/Benchmarks/mlp/directto/mlp-java/D2.java
@@ -32,11 +32,13 @@ public class D2 {
 
     D2 d2 = new D2();
 
+    
     d2.rw=new ReadWrite();
     d2.rw.read(d2);
+    
 
     d2.getMessageList().executeAll(d2);
-       
+    
     int count = 0;
     while( d2.getFlightList().anyPlanesAlive() ) {
       d2.getAlgorithm().doIteration(d2);

diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-java/Flight.java b/Robust/src/Benchmarks/mlp/directto/mlp-java/Flight.java
index 165e8253a666bc318d7e99f714a0a9f8b8833313..b5bae9c52700a030c3b1810798ced48c072810ec 100755 (executable)
--- a/Robust/src/Benchmarks/mlp/directto/mlp-java/Flight.java
+++ b/Robust/src/Benchmarks/mlp/directto/mlp-java/Flight.java
@@ -22,7 +22,7 @@ public class Flight /*implements Cloneable*/ {
   public void setAircraftType (Aircraft ac) {
     this.aircraftType=ac;
   }
-  
+
   public void setFlightType(String flightType) { 
     this.flightType=flightType;
   }
@@ -34,7 +34,7 @@ public class Flight /*implements Cloneable*/ {
   public void setFlightPlan(FlightPlan fp) {
     fPlan=fp;
   }
-    
+
   public void updateTrajectory(D2 d2, double time) {
     d2.getTrajectorySynthesizer().updateTrajectory(d2, time, this);
   }

diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-java/FlightList.java b/Robust/src/Benchmarks/mlp/directto/mlp-java/FlightList.java
index fe484a619e9f726edb220f93e21df46a7329eae1..d0cd5dce378f5a25ec76d79ce9bd4f9f11130ef5 100755 (executable)
--- a/Robust/src/Benchmarks/mlp/directto/mlp-java/FlightList.java
+++ b/Robust/src/Benchmarks/mlp/directto/mlp-java/FlightList.java
@@ -3,8 +3,8 @@
 //import java.util.*;
 
 public class FlightList {
-  public /*static*/ int noFlights;
-  public /*static*/ Vector f;
+  public  int noFlights;
+  public  Vector f;
 
   public FlightList() {
     noFlights=0;
@@ -17,13 +17,15 @@ public class FlightList {
   }
   */
 
-    public /*static*/ void addFlightPlan(D2 d2, int time, StringTokenizer st) { 
+  public  void addFlightPlan(D2 d2, int time, StringTokenizer st) { 
     Flight newFlight=disjoint flightAdd new Flight(st.nextToken());
     noFlights++;
     f.addElement(newFlight);
+
     FlightPlan fAux=new FlightPlan();
     Aircraft aAux=d2.getAircraftList().getAircraft(st.nextToken());      
     newFlight.setAircraftType(aAux);
+  
     newFlight.setFlightType(st.nextToken());
     Route rAux=new Route(Integer.parseInt(st.nextToken()));
     for (int i=0;i<rAux.noFixes;i++)
@@ -33,12 +35,12 @@ public class FlightList {
     newFlight.setFlightPlan(fAux);
   }
 
-  public /*static*/ String getFlightName(int index) {
+  public  String getFlightName(int index) {
     Flight fAux=(Flight) f.elementAt(index);
     return fAux.flightID;
   }
 
-  public /*static*/ void amendFlightPlan(D2 d2, int time, StringTokenizer st) {
+  public  void amendFlightPlan(D2 d2, int time, StringTokenizer st) {
     Flight fAux=getFlight(st.nextToken());
     Route rAux=new Route(Integer.parseInt(st.nextToken()));    
     for (int i=0;i<rAux.noFixes;i++)
@@ -47,14 +49,14 @@ public class FlightList {
     fAux.fPlan.setCruiseParam(Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()));
   }
 
-    public /*static*/ void amendFlightInfo(D2 d2, int time, StringTokenizer st) {
+    public  void amendFlightInfo(D2 d2, int time, StringTokenizer st) {
     Flight fAux=getFlight(st.nextToken());
     Aircraft aAux=d2.getAircraftList().getAircraft(st.nextToken());      
     fAux.setAircraftType(aAux);
     fAux.setFlightType(st.nextToken());
   }
 
-    public /*static*/ void sendingAircraft(D2 d2, int time, StringTokenizer st) {
+    public  void sendingAircraft(D2 d2, int time, StringTokenizer st) {
     int noF=Integer.parseInt(st.nextToken());
     String id;
     Point4d pos;
@@ -87,14 +89,14 @@ public class FlightList {
     }
   }  
 
-  public /*static*/ void removeFlightPlan(int time, StringTokenizer st) {
+  public  void removeFlightPlan(int time, StringTokenizer st) {
     String id=st.nextToken();
     int i=0;
     while ((i<noFlights) && (((Flight) f.elementAt(i)).hasID(id))) i++;
     if (i<noFlights) f.removeElementAt(i);
   }
 
-  public /*static*/ Flight getFlight(String id) {
+  public  Flight getFlight(String id) {
     for( int i = 0; i < f.size(); ++i ) {
       Flight fAux=(Flight) f.elementAt(i);
       if (fAux.hasID(id))
@@ -105,7 +107,7 @@ public class FlightList {
     return null;
   }
 
-  public /*static*/ boolean anyPlanesAlive() {
+  public  boolean anyPlanesAlive() {
     for( int i = 0; i < f.size(); ++i ) {
       Flight aAux=(Flight) f.elementAt(i);
       Vector p1=aAux.traject.p;
@@ -116,7 +118,7 @@ public class FlightList {
     return false;
   }
 
-  public /*static*/ void printInfo() {
+  public  void printInfo() {
     System.out.println("\n\nThe number of flights:"+noFlights);
     System.out.println("The flights are:");
     for( int i = 0; i < f.size(); ++i ) {

diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-java/Message.java b/Robust/src/Benchmarks/mlp/directto/mlp-java/Message.java
index 4e2a3aebc80fec32b9fb7a9a2ea4e999a247ad2e..08c7e4f6bb8f762c07f158fa185f578715723583 100755 (executable)
--- a/Robust/src/Benchmarks/mlp/directto/mlp-java/Message.java
+++ b/Robust/src/Benchmarks/mlp/directto/mlp-java/Message.java
@@ -60,7 +60,7 @@ public class Message {
 
     if (type.compareTo("ADD_FLIGHT_PLAN")==0) {
       System.out.println("Adding flight plan...");
-      d2.getFlightList().addFlightPlan(d2,time,parameters);            
+      d2.getFlightList().addFlightPlan(d2,time,parameters);
     }
     else if (type.compareTo("REMOVE_FLIGHT_PLAN")==0) {
       System.out.println("Removing flight plan...");

diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java b/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java
index a49cb737f3243b438384eafe9d1ddba3f45634f2..c91db3bbd4ea375dcb90afedf76d3d0974f200bb 100755 (executable)
--- a/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java
+++ b/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java
@@ -23,7 +23,7 @@ public class MessageList {
   }
 
   //is true for DO_WORK
-    public boolean setMessage(String line) {   
+  public boolean setMessage(String line) {     
     if (line.equals(""))
       return false;
 
@@ -48,6 +48,7 @@ public class MessageList {
     System.out.println("executeAll: we have "+messages.size()+" messages.");
     while(hasNext())
       next().executeMessage(d2);     
+
     d2.getStatic().printInfo();
     d2.getFixList().printInfo();
     d2.getAircraftList().printInfo();