Changeset 38

Timestamp:

04/17/08 01:04:15 (4 months ago)

Author:

jordi

Message:

fixed ticket#30; revised code with Java format

Location:

trunk/src/planet

Files:

• simulate/Results.java (modified) (2 diffs)
• test/dht/DHTTest.java (modified) (2 diffs)

trunk/src/planet/simulate/Results.java

@@ -219 +219 @@
          *  the lookup and insert times 
          */
-        private static int lookup_number = 0;
+        private static int lookupNumber = 0;
         /**
          * print total and average hops
          */
-        public static void printhops() {
+        public static void printHops() {
                 Collection keys = hops.keySet();
                 Iterator  it = keys.iterator();
-                long total_hops = 0;
-                int lookup_number_temp = 0;
+                long totalHops = 0;
+                int temp = 0;
                 while (it.hasNext()) {
-                        lookup_number_temp++;
-                        String id_and_source =(String)it.next();
-                        total_hops += ((Integer)(hops.get(id_and_source))).longValue();
-                        // System.out.println(id_and_source + " " +
-                        // hops.get(id_and_source));
-
-                }
-                
-                lookup_number = lookup_number_temp;
+                        temp++;
+                        String idAndSource =(String)it.next();
+                        totalHops += ((Integer)(hops.get(idAndSource))).longValue();
+                }
+                
+                lookupNumber = temp;
                 Logger.log("************************", Logger.PRINT_LOG);
                 Logger.log("*****Hops Results*******", Logger.PRINT_LOG);
                 Logger.log("************************", Logger.PRINT_LOG);
-                if (lookup_number_temp == 0) {
+                if (temp == 0) {
                         Logger.log("There are no lookup operation", Logger.PRINT_LOG);
                 } else {
-                        Logger.log("The total hops in the test is : [" + total_hops
-                                        + "] in [" + lookup_number_temp + "] lookup operations",
+                        Logger.log("The total hops in the test is : [" + totalHops
+                                        + "] in [" + temp + "] lookup operations",
                                         Logger.PRINT_LOG);
                         Logger.log("The average hops in the test is : "
-                                        + (double) ((double) total_hops / (double) lookup_number_temp),
+                                        + (double) ((double) totalHops / (double) temp),
                                         Logger.PRINT_LOG);
                 }
@@ -255 +252 @@
         }
 
-        public static int getLookup_number() {
-                return lookup_number;
+        public static int getLookupNumber() {
+                return lookupNumber;
         }
 

trunk/src/planet/test/dht/DHTTest.java

@@ -109 +109 @@
           System.out.println ("Keys inserted with ["+steps+"] steps and ["+GenericApp.timeElapsedInSeconds(t1,t2)+"] seconds.\n");
           
-          Results.printhops();
-                        int lookup_number_1 = Results.getLookup_number();
+          Results.printHops();
+                  int lookupNumber1 = Results.getLookupNumber();
           //LOOKUP PROCESS
           t1 = System.currentTimeMillis();
@@ -128 +128 @@
           System.out.println ("Key lookup finished with ["+steps+"] steps and ["+GenericApp.timeElapsedInSeconds(t1,t2)+"] seconds.\n");
           
-          Results.printhops();
-                        int lookup_number_2 = Results.getLookup_number();
-                        System.out.println("loopup opertions is " + (lookup_number_2 - lookup_number_1));
+          Results.printHops();
+                  int lookupNumber2 = Results.getLookupNumber();
+              System.out.println("loopup opertions is " + (lookupNumber2 - lookupNumber1));
 
           //PRINT APPLICATON INFORMATION