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

Timestamp:

06/18/13 10:14:07 (12 years ago)

Author:

wojtekp

Message:

 

File:

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

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

@@ -84 +84 @@
 import simulator.stats.SimulationStatistics;
 import simulator.stats.implementation.out.AbstractStringSerializer;
+import simulator.stats.implementation.out.CoolEmAllStringSerializer;
 import simulator.stats.implementation.out.StringSerializer;
 import csiro.mit.utils.jfreechart.timetablechart.TimetableChartFactory;
@@ -154 +155 @@
         protected TaskSeriesCollection ganttDiagramTaskSeriesCollection;
         protected TaskSeriesCollection ganttDiagramWaitingTimeSeriesCollection;
-        protected HashMap<String, List<String>> task_processorsMap;
+        protected Map<String, List<String>> task_processorsMap;
 
         protected JobRegistry jr;
@@ -167 +168 @@
                 this.outputFolderName = outputFolderName;
 
-                this.serializer = new StringSerializer();
+                this.serializer = new CoolEmAllStringSerializer();
                 this.serializer.setDefaultNumberFormat(DataCenterWorkloadSimulator.DFAULT_NUMBER_FORMAT);
 
@@ -339 +340 @@
                                                 if (resourceLoadStatsFile != null) {
                                                         Object txt = resourceUsage.serialize(serializer);
-                                                        resourceLoadStatsFile.println(txt);
+                                                        resourceLoadStatsFile.print(txt);
                                                 }
                                         }
@@ -375 +376 @@
                                                 if (energyStatsFile != null) {
                                                         Object txt = energyUsage.serialize(serializer);
-                                                        energyStatsFile.println(txt);
+                                                        energyStatsFile.print(txt);
                                                 }
                                         }
@@ -413 +414 @@
                                                 if (airFlowStatsFile != null) {
                                                         Object txt = airFlow.serialize(serializer);
-                                                        airFlowStatsFile.println(txt);
+                                                        airFlowStatsFile.print(txt);
                                                 }
                                         }
@@ -451 +452 @@
                                                 if (temperatureStatsFile != null) {
                                                         Object txt = temperature.serialize(serializer);
-                                                        temperatureStatsFile.println(txt);
+                                                        temperatureStatsFile.print(txt);
                                                 }
                                         }
@@ -1442 +1443 @@
                         o1int = Integer.parseInt(o1.substring(o1.indexOf("_")+1));
                         o2int = Integer.parseInt(o2.substring(o2.indexOf("_")+1));
-                        if(o1string.compareTo(o2string) != 0)
-                                return o1string.compareTo(o2string);
-                        else
+                        //if(o1string.compareTo(o2string) != 0)
+                        //      return o1string.compareTo(o2string);
+                        //else
                                 return o1int.compareTo(o2int);
                 }