Changeset 496 for DCWoRMS/trunk/src/simulator/stats/implementation/out

Timestamp:

10/10/12 14:02:11 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/simulator/stats/implementation/out

Files:

• StatsSerializer.java (modified) (2 diffs)
• StringSerializer.java (modified) (7 diffs)

DCWoRMS/trunk/src/simulator/stats/implementation/out/StatsSerializer.java

@@ -5 +5 @@
 import simulator.stats.implementation.JobStats;
 import simulator.stats.implementation.ResourceAirFlowStats;
-import simulator.stats.implementation.ResourceEnergyStats;
+import simulator.stats.implementation.ResourcePowerStats;
 import simulator.stats.implementation.ResourceStats;
 import simulator.stats.implementation.ResourceUsageStats;
@@ -27 +27 @@
         public Object visit(ResourceUsageStats arg);
         
-        public Object visit(ResourceEnergyStats arg);
+        public Object visit(ResourcePowerStats arg);
 
         public Object visit(ResourceAirFlowStats arg);

DCWoRMS/trunk/src/simulator/stats/implementation/out/StringSerializer.java

@@ -12 +12 @@
 import simulator.stats.implementation.JobStats;
 import simulator.stats.implementation.ResourceAirFlowStats;
-import simulator.stats.implementation.ResourceEnergyStats;
+import simulator.stats.implementation.ResourcePowerStats;
 import simulator.stats.implementation.ResourceStats;
 import simulator.stats.implementation.ResourceUsageStats;
@@ -259 +259 @@
 
         public Object visit(ResourceUsageStats resourceUsageStats) {
-                Map<Long, Double> resourceUsage = resourceUsageStats.getUsage();
+                Map<Long, Double> resourceUsage = resourceUsageStats.getHistory();
                 
                 int mapSize = resourceUsage.size();
@@ -308 +308 @@
                 }
                 if(resourceUsage.size() > 0){
-                        buffer.append("mean: " + resourceUsageStats.getMeanUsage());
+                        buffer.append("mean: " + resourceUsageStats.getMeanValue());
                         buffer.append(System.getProperty("line.separator"));    
                 }
@@ -314 +314 @@
         }
 
-        public Object visit(ResourceEnergyStats resourceEnergyStats) {
-                Map<Long, Double> resourceEnergy = resourceEnergyStats.getEnergy();
+        public Object visit(ResourcePowerStats resourceEnergyStats) {
+                Map<Long, Double> resourceEnergy = resourceEnergyStats.getHistory();
                 
                 int mapSize = resourceEnergy.size();
@@ -365 +365 @@
                 
                 if(resourceEnergy.size() > 0) {
-                        buffer.append("mean: "+resourceEnergyStats.getMeanUsage() + " sum: " +resourceEnergyStats.getSumUsage());
+                        buffer.append("mean: "+resourceEnergyStats.getMeanValue() + " sum: " +resourceEnergyStats.getSumValue());
                         buffer.append(System.getProperty("line.separator"));    
                 }
@@ -373 +373 @@
 
         public Object visit(ResourceAirFlowStats resourceAirFlowStats) {
-                Map<Long, Double> resourceAirFlow = resourceAirFlowStats.getAirFlow();
+                Map<Long, Double> resourceAirFlow = resourceAirFlowStats.getHistory();
                 
                 int mapSize = resourceAirFlow.size();
@@ -423 +423 @@
                 
                 if(resourceAirFlow.size() > 0) {
-                        buffer.append("mean: "+resourceAirFlowStats.getMeanUsage() + " sum: " +resourceAirFlowStats.getSumUsage());
+                        buffer.append("mean: "+resourceAirFlowStats.getMeanValue() + " sum: " +resourceAirFlowStats.getSumValue());
                         buffer.append(System.getProperty("line.separator"));    
                 }