Changeset 1140 for DCWoRMS/branches/coolemall/src/simulator

Timestamp:

07/15/13 17:18:22 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/simulator/stats/implementation/out

Files:

• CoolEmAllStringSerializer.java (modified) (2 diffs)
• StringSerializer.java (modified) (4 diffs)

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

@@ -104 +104 @@
                                 buffer.append(nodeMetricName);
                                 buffer.append(fieldSeparator);
-                                buffer.append(resourceEnergyStats.getResourceName());
+                                if(resourceEnergyStats.getResourceName().startsWith("/"))
+                                        buffer.append(resourceEnergyStats.getResourceName().substring(1));
+                                else buffer.append(resourceEnergyStats.getResourceName());
                                 buffer.append(fieldSeparator);
                                 Double value = resourceEnergy.get(timestamp);
@@ -158 +160 @@
                                 buffer.append(nodeMetricName);
                                 buffer.append(fieldSeparator);
-                                buffer.append(resourceAirFlowStats.getResourceName());
+                                if(resourceAirFlowStats.getResourceName().startsWith("/"))
+                                        buffer.append(resourceAirFlowStats.getResourceName().substring(1));
+                                else buffer.append(resourceAirFlowStats.getResourceName());
                                 buffer.append(fieldSeparator);
                                 Double value = resourceAirFlow.get(timestamp);

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

@@ -317 +317 @@
                 if(resourceUsage.size() > 0){
                         //uffer.append("mean: " + resourceUsageStats.getMeanValue());
-                        //buffer.append(System.getProperty("line.separator"));  
+                        buffer.append(System.getProperty("line.separator"));    
                 }
                 return buffer.toString();
@@ -380 +380 @@
                 if(resourceEnergy.size() > 0) {
                         //buffer.append("mean: "+resourceEnergyStats.getMeanValue() + " sum: " +resourceEnergyStats.getSumValue());
-                        //buffer.append(System.getProperty("line.separator"));  
+                        buffer.append(System.getProperty("line.separator"));    
                 }
 
@@ -443 +443 @@
                 if(resourceAirFlow.size() > 0) {
                         //buffer.append("mean: "+resourceAirFlowStats.getMeanValue() + " sum: " +resourceAirFlowStats.getSumValue());
-                        //buffer.append(System.getProperty("line.separator"));  
+                        buffer.append(System.getProperty("line.separator"));    
                 }
 
@@ -507 +507 @@
                 if(resourceTemperature.size() > 0) {
                         //buffer.append("mean: "+resourceTemperatureStats.getMeanValue() + " sum: " +resourceTemperatureStats.getSumValue());
-                        //buffer.append(System.getProperty("line.separator"));  
+                        buffer.append(System.getProperty("line.separator"));    
                 }