Changeset 914

Timestamp:

03/04/13 13:27:43 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/simulator/stats/implementation/out/StringSerializer.java (modified) (17 diffs)

DCWoRMS/branches/coolemall/src/simulator/stats/implementation/out/StringSerializer.java

@@ -261 +261 @@
         public Object visit(ResourceUsageStats resourceUsageStats) {
                 Map<Long, Double> resourceUsage = resourceUsageStats.getHistory();
-                
+                String metricName = "utlization";
                 int mapSize = resourceUsage.size();
                 /*
@@ -284 +284 @@
                         buffer = new StringBuffer(size + 42);
                         String[] headers = resourceUsageStats.getHeaders();
-                        for(int i = 0; i < headers.length; i++)
-                        {
-                                buffer.append(headers[i]);
-                                buffer.append(fieldSeparator);
-                        }
-                        buffer.append(System.getProperty("line.separator"));
+                        /*for(int i = 0; i < headers.length; i++)
+                        {
+                                buffer.append(headers[i]);
+                                buffer.append(fieldSeparator);
+                        }
+                        buffer.append(System.getProperty("line.separator"));*/
                 } else {
                         buffer = new StringBuffer(size);
@@ -297 +297 @@
                 for (Long timestamp : resourceUsage.keySet()) {
                         
+                        buffer.append(metricName);
+                        buffer.append(fieldSeparator);
                         buffer.append(resourceUsageStats.getResourceName());
                         buffer.append(fieldSeparator);
@@ -308 +310 @@
 
                 }
+                
+                int lastIdx = buffer.lastIndexOf(System.getProperty("line.separator"));
+                if(lastIdx != -1)
+                        buffer.deleteCharAt(lastIdx);
+                
                 if(resourceUsage.size() > 0){
-                        buffer.append("mean: " + resourceUsageStats.getMeanValue());
-                        buffer.append(System.getProperty("line.separator"));    
+                        //uffer.append("mean: " + resourceUsageStats.getMeanValue());
+                        //buffer.append(System.getProperty("line.separator"));  
                 }
                 return buffer.toString();
@@ -317 +324 @@
         public Object visit(ResourcePowerStats resourceEnergyStats) {
                 Map<Long, Double> resourceEnergy = resourceEnergyStats.getHistory();
-                
+                String metricName = "powerConsumption";
                 int mapSize = resourceEnergy.size();
                 /*
@@ -340 +347 @@
                         buffer = new StringBuffer(size + 42);
                         String[] headers = resourceEnergyStats.getHeaders();
-                        for(int i = 0; i < headers.length; i++)
-                        {
-                                buffer.append(headers[i]);
-                                buffer.append(fieldSeparator);
-                        }
-                        buffer.append(System.getProperty("line.separator"));
+                        /*for(int i = 0; i < headers.length; i++)
+                        {
+                                buffer.append(headers[i]);
+                                buffer.append(fieldSeparator);
+                        }
+                        buffer.append(System.getProperty("line.separator"));*/
                 } else {
                         buffer = new StringBuffer(size);
@@ -353 +360 @@
                 for (Long timestamp : resourceEnergy.keySet()) {
                         
+                        buffer.append(metricName);
+                        buffer.append(fieldSeparator);
                         buffer.append(resourceEnergyStats.getResourceName());
                         buffer.append(fieldSeparator);
@@ -365 +374 @@
                 }
                 
+                int lastIdx = buffer.lastIndexOf(System.getProperty("line.separator"));
+                if(lastIdx != -1)
+                        buffer.deleteCharAt(lastIdx);
+                
                 if(resourceEnergy.size() > 0) {
-                        buffer.append("mean: "+resourceEnergyStats.getMeanValue() + " sum: " +resourceEnergyStats.getSumValue());
-                        buffer.append(System.getProperty("line.separator"));    
+                        //buffer.append("mean: "+resourceEnergyStats.getMeanValue() + " sum: " +resourceEnergyStats.getSumValue());
+                        //buffer.append(System.getProperty("line.separator"));  
                 }
 
@@ -375 +388 @@
         public Object visit(ResourceAirFlowStats resourceAirFlowStats) {
                 Map<Long, Double> resourceAirFlow = resourceAirFlowStats.getHistory();
-                
+                String metricName = "airFlow";
                 int mapSize = resourceAirFlow.size();
                 /*
@@ -398 +411 @@
                         buffer = new StringBuffer(size + 42);
                         String[] headers = resourceAirFlowStats.getHeaders();
-                        for(int i = 0; i < headers.length; i++)
-                        {
-                                buffer.append(headers[i]);
-                                buffer.append(fieldSeparator);
-                        }
-                        buffer.append(System.getProperty("line.separator"));
+                        /*for(int i = 0; i < headers.length; i++)
+                        {
+                                buffer.append(headers[i]);
+                                buffer.append(fieldSeparator);
+                        }
+                        buffer.append(System.getProperty("line.separator"));*/
                 } else {
                         buffer = new StringBuffer(size);
@@ -411 +424 @@
                 for (Long timestamp : resourceAirFlow.keySet()) {
                         
+                        buffer.append(metricName);
+                        buffer.append(fieldSeparator);
                         buffer.append(resourceAirFlowStats.getResourceName());
                         buffer.append(fieldSeparator);
@@ -422 +437 @@
 
                 }
+                int lastIdx = buffer.lastIndexOf(System.getProperty("line.separator"));
+                if(lastIdx != -1)
+                        buffer.deleteCharAt(lastIdx);
                 
                 if(resourceAirFlow.size() > 0) {
-                        buffer.append("mean: "+resourceAirFlowStats.getMeanValue() + " sum: " +resourceAirFlowStats.getSumValue());
-                        buffer.append(System.getProperty("line.separator"));    
+                        //buffer.append("mean: "+resourceAirFlowStats.getMeanValue() + " sum: " +resourceAirFlowStats.getSumValue());
+                        //buffer.append(System.getProperty("line.separator"));  
                 }
 
@@ -433 +451 @@
         public Object visit(ResourceTemperatureStats resourceTemperatureStats) {
                 Map<Long, Double> resourceTemperature = resourceTemperatureStats.getHistory();
-                
+                String metricName = "temperature";
                 int mapSize = resourceTemperature.size();
                 /*
@@ -455 +473 @@
                 if(printedHeaders.add(resourceTemperatureStats.getUsageType())) {
                         buffer = new StringBuffer(size + 42);
-                        String[] headers = resourceTemperatureStats.getHeaders();
+                        /*String[] headers = resourceTemperatureStats.getHeaders();
                         for(int i = 0; i < headers.length; i++)
                         {
@@ -461 +479 @@
                                 buffer.append(fieldSeparator);
                         }
-                        buffer.append(System.getProperty("line.separator"));
+                        buffer.append(System.getProperty("line.separator"));*/
                 } else {
                         buffer = new StringBuffer(size);
@@ -469 +487 @@
                 for (Long timestamp : resourceTemperature.keySet()) {
                         
+                        buffer.append(metricName);
+                        buffer.append(fieldSeparator);
                         buffer.append(resourceTemperatureStats.getResourceName());
                         buffer.append(fieldSeparator);
@@ -481 +501 @@
                 }
                 
+                int lastIdx = buffer.lastIndexOf(System.getProperty("line.separator"));
+                if(lastIdx != -1)
+                        buffer.deleteCharAt(lastIdx);
+                
                 if(resourceTemperature.size() > 0) {
-                        buffer.append("mean: "+resourceTemperatureStats.getMeanValue() + " sum: " +resourceTemperatureStats.getSumValue());
-                        buffer.append(System.getProperty("line.separator"));    
+                        //buffer.append("mean: "+resourceTemperatureStats.getMeanValue() + " sum: " +resourceTemperatureStats.getSumValue());
+                        //buffer.append(System.getProperty("line.separator"));  
                 }