Changeset 1328 for DCWoRMS/branches

Timestamp:

03/31/14 17:07:50 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/simulator/stats/implementation/DCWormsStatistics.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/simulator/stats/implementation/DCWormsStatistics.java

@@ -801 +801 @@
 
                                         try{
-                                                double usefulWork = execTask.getResourceConsumptionProfile().getUsefulWork();
+                                                double usefulWork = execTask.getResourceConsumptionProfile().getUsefulWork()/pes.size();
                                                 //double usefulWork = gatherUsefulWorkStats(pe).getValue();
                                                 GSSAccumulator uwAcc;
-                                                if(metCalc.getMetricsData().containsKey(pe.getFullName())){
-                                                        uwAcc = metCalc.getMetricsData().get(pe.getFullName()).get(0);
+                                                if(metCalc.getMetricsData().containsKey("UW_" + pe.getFullName())){
+                                                        uwAcc = metCalc.getMetricsData().get("UW_" + pe.getFullName()).get(0);
                                                         uwAcc.add(usefulWork);
                                                 } else {
                                                         uwAcc = new GSSAccumulator();
                                                         uwAcc.add(usefulWork);
-                                                        metCalc.addMetricsData(pe.getFullName(), uwAcc);
+                                                        metCalc.addMetricsData("UW_" + pe.getFullName(), uwAcc);
                                                 }
                                         }  catch (Exception e){
@@ -1531 +1531 @@
                                 Executable task = (Executable) execList.get(j);
                                 if(task.isFinished() == false){
-                                        return;
+                                        continue;
                                 }
                                 TaskStats taskStats = createTaskStats(task);