Changeset 493 for DCWoRMS/trunk/src/simulator

Timestamp:

10/09/12 14:38:34 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/simulator

Files:

• ConfigurationOptions.java (modified) (3 diffs)
• DCWormsUsers.java (modified) (1 diff)
• DataCenterWorkloadSimulator.java (modified) (2 diffs)
• stats/implementation/DCWormsStatistics.java (modified) (1 diff)

DCWoRMS/trunk/src/simulator/ConfigurationOptions.java

@@ -76 +76 @@
         public static final String JOBS_STATISTICS = CREATESTATISTICS + ".jobs";
         public static final String SIMULATION_STATISTICS = CREATESTATISTICS + ".simulation";
-        public static final String FORMAT_STATISTICS_OUTPUT = CREATESTATISTICS + ".formatoutput";
         
         /**
@@ -172 +171 @@
         public boolean createjobsstatistics = true;
         public boolean createsimulationstatistics = true;
-        public boolean formatstatisticsoutput = false;
         
         public String[] resForEnergyChart;
@@ -350 +348 @@
                         co.createsimulationstatistics = true;
                 }
-                try {
-                        co.formatstatisticsoutput = Boolean.valueOf(
-                                        bundle.getString(FORMAT_STATISTICS_OUTPUT)).booleanValue();
-                } catch(MissingResourceException e){
-                        co.formatstatisticsoutput = false;
-                }
-                
+
                 try {
                         co.numberOfSimulations = Integer.valueOf(bundle.getString(NUMBER_OF_SIMULATIONS)).intValue();

DCWoRMS/trunk/src/simulator/DCWormsUsers.java

@@ -8 +8 @@
 import gridsim.GridSimTags;
 import gridsim.IO_data;
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 import gridsim.net.InfoPacket;
 

DCWoRMS/trunk/src/simulator/DataCenterWorkloadSimulator.java

@@ -1 +1 @@
 package simulator;
 
-//import eduni.cloudsim.GSSIM;
 import java.io.File;
 import java.io.FileReader;
@@ -117 +116 @@
                                 @Override
                                 public String getDescription() {
-                                        return "WoRMS experiment file";
+                                        return "DCWoRMS experiment file";
                                 }
                         };

DCWoRMS/trunk/src/simulator/stats/implementation/DCWormsStatistics.java

@@ -161 +161 @@
                 this.outputFolderName = outputFolderName;
 
-                if (this.configuration.formatstatisticsoutput)
-                        this.serializer = new FormatedStringSerializer();
-                else
-                        this.serializer = new StringSerializer();
+
+                this.serializer = new StringSerializer();
 
                 this.serializer.setDefaultNumberFormat(DataCenterWorkloadSimulator.DFAULT_NUMBER_FORMAT);