Changeset 497 for DCWoRMS/trunk/src/simulator/stats/implementation/DCWormsStatistics.java

Timestamp:

10/11/12 09:07:11 (13 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/src/simulator/stats/implementation/DCWormsStatistics.java (modified) (8 diffs)

DCWoRMS/trunk/src/simulator/stats/implementation/DCWormsStatistics.java

@@ -315 +315 @@
                                         if(type_stats.get(resourceName).contains(Stats.textLoad)){
                                                 resourceUsage = gatherResourceLoadStats(resource, basicResStats);
-                                                resourceUsage.setMeanValue(calculateResourceLoad(resource, basicResLoad));
+                                                resourceUsage.setMeanValue(calculateMeanValue(resourceUsage));
                                                 if (resourceLoadStatsFile != null) {
                                                         Object txt = resourceUsage.serialize(serializer);
@@ -452 +452 @@
 
                         List<ResourceHistoryItem> resHistItemList = exec.getUsedResources();
+                        if(resHistItemList.size() == 0)
+                                return basicResStats;
                         Map<ResourceUnitName, ResourceUnit> res = resHistItemList.get(resHistItemList.size() - 1).getResourceUnits();
                         ResourceUnit resUnit = res.get(StandardResourceUnitName.PE);
@@ -492 +494 @@
         }
         
-        private ResourceUsageStats gatherResourceLoadStats(ComputingResource resource, Map<String,List<ResStat>> basicStats) {
+        private ResourceUsageStats gatherResourceLoadStats(ComputingResource resource, Map<String, List<ResStat>> basicStats) {
                 ResourceUsageStats usageStats = new ResourceUsageStats(resource.getName(), resource.getType(), "resourceLoadStats");
-                int cnt =0;
+                int cnt = 0;
                 for(String resName: basicStats.keySet()){
                         try {
                                 if(resource.getDescendantByName(resName) != null || resource.getName().compareTo(resName) == 0){
+                                        createResourceLoadData(usageStats, basicStats.get(resName));
                                         cnt++;
-                                        createResourceLoadData(usageStats, basicStats.get(resName));
                                 }
                         } catch (ResourceException e) {
@@ -508 +510 @@
                 for(Long key: usageStats.getHistory().keySet()){
                         Double value = usageStats.getHistory().get(key)/cnt;
-                        usageStats.getHistory().put(key, 100*value);
+                        usageStats.getHistory().put(key, value);
                 }
 
@@ -627 +629 @@
         private void createResourceLoadDiagram(ResourceUsageStats resLoadStats) {
 
+                for(Long key: resLoadStats.getHistory().keySet()){
+                        Double value = resLoadStats.getHistory().get(key) * 100;
+                        resLoadStats.getHistory().put(key, value);
+                }
+
                 XYDataset dataset = createResourceChartDataSet(resLoadStats,
                                 startSimulationTime, endSimulationTime);
@@ -861 +868 @@
 
 
-
+        //TO DO
         private void createAccumulatedResourceSimulationStatistic() {
 
@@ -867 +874 @@
                 for(ComputingResource compRes: resources){
                         //for(ComputingResource child :compRes.getChildren()){
+                        
+                                //ResourceUsageStats resourceUsage = gatherResourceLoadStats(compRes, basicResStats);
+                                //double load = calculateMeanValue(resourceUsage);
                                 double load = calculateResourceLoad(compRes, basicResLoad);
                                 accStats.meanTotalLoad.add(load);
@@ -876 +886 @@
         }
 
-        private HashMap<String, Double> calculatePELoad(Map<String,List<ResStat>> basicResStats){
-                HashMap<String, Double> peLoad = new HashMap<String, Double>();
+        private Map<String, Double> calculatePELoad(Map<String, List<ResStat>> basicResStats){
+                Map<String, Double> peLoad = new HashMap<String, Double>();
                 for(String resName: basicResStats.keySet()){
                         List<ResStat> resStats = basicResStats.get(resName);