Changeset 233

Timestamp:

04/06/12 12:49:55 (13 years ago)

Author:

wojtekp

Message:

 

File:

• xssim/trunk/src/simulator/stats/implementation/GSSimStatistics.java (modified) (3 diffs)

xssim/trunk/src/simulator/stats/implementation/GSSimStatistics.java

@@ -856 +856 @@
                         double load = calculateResourceLoad(child, basicResLoad);
                         accStats.meanTotalLoad.add(load);
-                //      accStats.meanEnergyUsage.add(tempMeanEnergyUsage.getMean());
+                        //ResourceEnergyStats energyUsage = gatherResourceEnergyStats(child);
+                        //energyUsage.setMeanUsage(calculateEnergyLoad(energyUsage));
+                        //accStats.meanEnergyUsage.add(energyUsage.meanUsage);
                 }
 
@@ -898 +900 @@
                 double meanEnergyUsage = 0;
                 long time = 0;
-                double load = 0;
-                Map<Long, Double> usage = resEnergyStats.getEnergy();
-                for (Long key : usage.keySet()) {
+                double usage = 0;
+                Map<Long, Double> enUsage = resEnergyStats.getEnergy();
+                for (Long key : enUsage.keySet()) {
                         
                         if (time != 0) {
-                                meanEnergyUsage += (load * (key - time))
+                                meanEnergyUsage += (usage * (key - time))
                                                 / (endSimulationTime - startSimulationTime);
 
@@ -910 +912 @@
                                 time = key;
                         }
-                        load = (double) usage.get(key);
+                        usage = (double) enUsage.get(key);
                 }
                 return meanEnergyUsage;