Changeset 1423 for DCWoRMS/branches/coolemall/src/simulator/stats/implementation/DCWormsStatistics.java

Timestamp:

07/30/14 12:25:00 (11 years ago)

Author:

wojtekp

Message:

 

File:

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

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

@@ -289 +289 @@
                 for(String resourceTypeName: resourceController.getComputingResourceLayers()){
                         List<Stats> cStats = new ArrayList<Stats>();
+                        /*if(ArrayUtils.contains(configuration.compResForUtilizationText, resourceTypeName))
+                                cStats.add(Stats.textLoad);
+                        if(ArrayUtils.contains(configuration.compResForEnergyText, resourceTypeName))
+                                cStats.add(Stats.textEnergy);
+                        if(ArrayUtils.contains(configuration.compResForAirflowText, resourceTypeName))
+                                cStats.add(Stats.textAirFlow);
+                        if(ArrayUtils.contains(configuration.compResForTemperatureText, resourceTypeName))
+                                cStats.add(Stats.textTemperature);*/
                         cStats.add(Stats.textLoad);
-                        if(ArrayUtils.contains(configuration.resForUtilizationChart, resourceTypeName))
+                        if(ArrayUtils.contains(configuration.compResForUtilizationChart, resourceTypeName))
                                 cStats.add(Stats.chartLoad);
                         cStats.add(Stats.textEnergy);
-                        if(ArrayUtils.contains(configuration.resForEnergyChart, resourceTypeName))
+                        if(ArrayUtils.contains(configuration.compResForEnergyChart, resourceTypeName))
                                 cStats.add(Stats.chartEnergy);
                         cStats.add(Stats.textAirFlow);
-                        if(ArrayUtils.contains(configuration.resForAirflowChart, resourceTypeName))
+                        if(ArrayUtils.contains(configuration.compResForAirflowChart, resourceTypeName))
                                 cStats.add(Stats.chartAirFlow);
                         cStats.add(Stats.textTemperature);
-                        if(ArrayUtils.contains(configuration.resForTemperatureChart, resourceTypeName))
+                        if(ArrayUtils.contains(configuration.compResForTemperatureChart, resourceTypeName))
                                 cStats.add(Stats.chartTemperature);
                         type_stats.put(resourceTypeName, cStats);
 
                 }               
-                
-                peGanttMap = new HashMap<String, TimetableEventSource>();
-                taskGanttMap = new HashMap<String, TimetableEventGroup>();              
-                
-                resourceOccupancyDiagrams = new HashMap<String, List<XYDataset>>();
-                resourceUtilizationDiagrams = new HashMap<String, List<XYDataset>>();
-                resourcePowerUsageDiagrams = new HashMap<String, List<XYDataset>>();
-                resourceAirFlowDiagrams = new HashMap<String, List<XYDataset>>();
-                resourceTemperatureDiagrams = new HashMap<String, List<XYDataset>>();
+
+                resourceOccupancyDiagrams = new HashMap<String, List<XYDataset>>(2);
+                resourceUtilizationDiagrams = new HashMap<String, List<XYDataset>>(2);
+                resourcePowerUsageDiagrams = new HashMap<String, List<XYDataset>>(2);
+                resourceAirFlowDiagrams = new HashMap<String, List<XYDataset>>(2);
+                resourceTemperatureDiagrams = new HashMap<String, List<XYDataset>>(2);
                 
                 ganttDiagramTimetable = new Timetable(new FixedMillisecond(
@@ -536 +541 @@
                                                         }
                                                         
-                                                        if(ArrayUtils.contains(configuration.resForEnergyChart, device.getType().getName())){
+                                                        if(ArrayUtils.contains(configuration.compResForEnergyChart, device.getType().getName())){
                                                                 if (configuration.creatediagrams_respowerusage) {
                                                                         createResourceEnergyDiagramData(deviceEnergyUsage);
@@ -590 +595 @@
                                                         }
                                                         
-                                                        if(ArrayUtils.contains(configuration.resForAirflowChart, device.getType().getName())){
+                                                        if(ArrayUtils.contains(configuration.compResForAirflowChart, device.getType().getName())){
                                                                 if (configuration.creatediagrams_resairflow) {
                                                                         createResourceAirFlowDiagramData(deviceAirFlow);
@@ -645 +650 @@
                                                         }
                                                         
-                                                        if(ArrayUtils.contains(configuration.resForTemperatureChart, device.getType().getName())){
+                                                        if(ArrayUtils.contains(configuration.compResForTemperatureChart, device.getType().getName())){
                                                                 if (configuration.creatediagrams_restemperature) {
                                                                         createResourceTemperatureDiagramData(deviceTemperature);
@@ -847 +852 @@
                                         }
                                         if(st == -1){
-                                                st = execHistItem.getTimeStamp().getMillis();
+                                                st = execHistItem.getTimeStamp();
                                         }
                                                 
                                         if(j < execHistory.size() - 1 && (execHistory.get(j + 1).getResIndex() != execHistItem.getResIndex() || execHistory.get(j + 1).getStatus() == DCWormsTags.PAUSED) || j + 1 == execHistory.size()){
                                                 if(j < execHistory.size() -1 && (execHistory.get(j + 1).getResIndex() != execHistItem.getResIndex() || execHistory.get(j + 1).getStatus() == DCWormsTags.PAUSED))
-                                                        et = execHistory.get(j + 1).getTimeStamp().getMillis(); 
+                                                        et = execHistory.get(j + 1).getTimeStamp(); 
                                                 else et = Double.valueOf(exec.getFinishTime()).longValue() * MILLI_SEC; 
                                                 if(resUnit instanceof ProcessingElements){
@@ -922 +927 @@
                 for(ExecutionHistoryItem execHistItem: execTask.getExecutionHistory()){
                         if(previousStatus == DCWormsTags.INEXEC){
-                                executionTime = executionTime  + (execHistItem.getTimeStamp().getMillis()/1000 - previousTimestamp);
+                                executionTime = executionTime  + (execHistItem.getTimeStamp()/1000 - previousTimestamp);
                         } 
-                        previousTimestamp  = execHistItem.getTimeStamp().getMillis()/1000;
+                        previousTimestamp  = execHistItem.getTimeStamp()/1000;
                         previousStatus = execHistItem.getStatus();
                 }
@@ -1520 +1525 @@
         
         private void createPEGanttDiagram(Map<String,List<ResStat>> basicResStats) {
+                peGanttMap = new HashMap<String, TimetableEventSource>();
+                taskGanttMap = new HashMap<String, TimetableEventGroup>();
                 for(String peName: basicResStats.keySet()){
                         TimetableEventSource pe = new TimetableEventSource(peName);