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

Timestamp:

10/11/12 11:30:30 (13 years ago)

Author:

wojtekp

Message:

 

File:

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

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

@@ -294 +294 @@
                 basicResLoad = calculatePELoad( basicResStats);
 
-                if (configuration.creatediagrams_processors) {
+                if (configuration.creatediagrams_gantt) {
                         createPEGanttDiagram(basicResStats);
                 }
@@ -322 +322 @@
                                         }
                                         if(type_stats.get(resourceName).contains(Stats.chartLoad)){
-                                                if (configuration.creatediagrams_resources) {
+                                                if (configuration.creatediagrams_resutilization) {
                                                         createResourceLoadDiagram(resourceUsage);
                                                 }
@@ -359 +359 @@
                                         if(type_stats.get(resourceName).contains(Stats.chartEnergy)){
 
-                                                if (configuration.creatediagrams_energyusage) {
+                                                if (configuration.creatediagrams_respowerusage) {
                                                         createResourceEnergyDiagramData(energyUsage);
                                                 }
@@ -397 +397 @@
                                         if(type_stats.get(resourceName).contains(Stats.chartAirFlow)){
 
-                                                if (configuration.creatediagrams_airflow) {
+                                                if (configuration.creatediagrams_resairflow) {
                                                         createResourceAirFlowDiagramData(airFlow);
                                                 }
@@ -719 +719 @@
 
                 JFreeChart peDiagram = null;
-                if (configuration.creatediagrams_processors) {
+                if (configuration.creatediagrams_gantt) {
                         peDiagram = getPEGanttDiagram(chartName, subtitle,
                                         simulationTime);
@@ -728 +728 @@
 
                 JFreeChart resourceLoadDiagram = null;
-                if (configuration.creatediagrams_resources) {
+                if (configuration.creatediagrams_resutilization) {
                         String axisName = "UTILIZATION [%]";
                         for(ResourceType resType: resourceLoadDiagrams.keySet()){
@@ -739 +739 @@
                 
                 JFreeChart resourceEnergyDiagram = null;
-                if (configuration.creatediagrams_energyusage) {
+                if (configuration.creatediagrams_respowerusage) {
                         String axisName = "POWER [W]";
                         for(ResourceType resType: resourcePowerUsageDiagrams.keySet()){
@@ -750 +750 @@
                 
                 JFreeChart resourceAirFlowDiagram = null;
-                if (configuration.creatediagrams_airflow) {
+                if (configuration.creatediagrams_resairflow) {
                         String axisName = "AIR FLOW [m^3/min]";
                         for(ResourceType resType: resourceAirFlowDiagrams.keySet()){