Changeset 687 for DCWoRMS/trunk/src/simulator/stats/implementation/DCWormsStatistics.java

Timestamp:

11/30/12 13:24:51 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/src/simulator/stats/implementation/DCWormsStatistics.java (modified) (11 diffs)

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

@@ -50 +50 @@
 import org.jfree.data.xy.XYSeriesCollection;
 import org.jfree.ui.TextAnchor;
+import org.joda.time.DateTime;
 import org.joda.time.DateTimeUtilsExt;
 
@@ -173 +174 @@
         public void generateStatistics() {
 
-                this.startSimulationTime = DateTimeUtilsExt.getOffsetTime().getTimeInMillis();
+                if(users.isSimStartTimeDefined())
+                        this.startSimulationTime = DateTimeUtilsExt.getOffsetTime().getTimeInMillis();
+                else
+                        this.startSimulationTime = new DateTime(users.getSubmissionStartTime() * 1000l).getMillis();
                 this.endSimulationTime = DateTimeUtilsExt.currentTimeMillis();
 
@@ -204 +208 @@
 
         private void init() {
-
                 task_processorsMap = new HashMap<String, List<String>>();
                 accStats = new GSSAccumulatorsStats();
@@ -683 +686 @@
                 XYSeriesCollection dataset = new XYSeriesCollection();
                 XYSeries data = new XYSeries(dynamicStats.getResourceName(), false, true);
-                //data.add(start, 0);
+                data.add(start, 0);
                 for (Long key : chartData.keySet()) {
                         Double val = chartData.get(key);
-                        data.add(key, val);
+                        if(key >= startSimulationTime)
+                                data.add(key, val);
                 }
                 data.add(end, 0);
@@ -726 +730 @@
                                 return false;
                 }
-
+                chartName = "Load diagram for "
+                        + DataCenterWorkloadSimulator.SIMULATOR_NAME;
                 JFreeChart resourceLoadDiagram = null;
                 if (configuration.creatediagrams_resutilization) {
@@ -738 +743 @@
                 }
                 
+                chartName = "Energy usage diagram for "
+                        + DataCenterWorkloadSimulator.SIMULATOR_NAME;
                 JFreeChart resourceEnergyDiagram = null;
                 if (configuration.creatediagrams_respowerusage) {
@@ -749 +756 @@
                 }
                 
+                chartName = "Air flow diagram for "
+                        + DataCenterWorkloadSimulator.SIMULATOR_NAME;
                 JFreeChart resourceAirFlowDiagram = null;
                 if (configuration.creatediagrams_resairflow) {
@@ -923 +932 @@
         private double calculateMeanValue(ResourceDynamicStats resDynamicStats ){
                 double meanValue = 0;
-                long time = 0;
+                long time = -1;
                 double value = 0;
                 
@@ -929 +938 @@
                 for (Long key : history.keySet()) {
                         
-                        if (time != 0) {
-                                meanValue += (value * (key - time)) / (endSimulationTime - startSimulationTime);
-                                time = key;
-                        } else {
-                                time = key;
+                        if(key >= startSimulationTime){
+                                if (time != -1) {
+                                        meanValue += (value * (key - time)) / (endSimulationTime - startSimulationTime);
+                                        time = key;
+                                } else {
+                                        time = key;
+                                }       
                         }
                         value = history.get(key);
@@ -1167 +1178 @@
                                 .getAbsolutePath();
 
-                String chartName = "Gantt diagram for " + DataCenterWorkloadSimulator.SIMULATOR_NAME;
+                String chartName = "Task diagram for " + DataCenterWorkloadSimulator.SIMULATOR_NAME;
                 String simulationTime = "Simulation time";
                 Title subtitle = new TextTitle("created for \"" + simulationIdentifier + "\" at "
@@ -1178 +1189 @@
                 }
 
+                chartName = "Task waiting times diagram for " + DataCenterWorkloadSimulator.SIMULATOR_NAME;
                 if (configuration.creatediagrams_taskswaitingtime) {
                         waitingTimeDiagram = getWaitingTimeDiagram(chartName, subtitle, simulationTime);