Changeset 1423 for DCWoRMS/branches/coolemall/src/simulator/ConfigurationOptions.java

Timestamp:

07/30/14 12:25:00 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/simulator/ConfigurationOptions.java (modified) (6 diffs)

DCWoRMS/branches/coolemall/src/simulator/ConfigurationOptions.java

@@ -77 +77 @@
 
         
-        public static final String CREATESTATISTICS = "createstatistics";
-        public static final String ACCUMULATED_RESOURCES_STATISTICS = CREATESTATISTICS + ".accumulatedresources";
-        public static final String EXTENDED_TASKS_STATISTICS = CREATESTATISTICS + ".extendedtasks";
-        public static final String JOBS_STATISTICS = CREATESTATISTICS + ".jobs";
-        public static final String SIMULATION_STATISTICS = CREATESTATISTICS + ".simulation";
-
+        public static final String CREATEXTSTATISTICS = "creatextatistics";
+        public static final String ACCUMULATED_RESOURCES_STATISTICS = CREATEXTSTATISTICS + ".accumulatedresources";
+        public static final String EXTENDED_TASKS_STATISTICS = CREATEXTSTATISTICS + ".extendedtasks";
+        public static final String JOBS_STATISTICS = CREATEXTSTATISTICS + ".jobs";
+        public static final String SIMULATION_STATISTICS = CREATEXTSTATISTICS + ".simulation";
+        public static final String SIMULATION_UTILIZATION  = CREATEXTSTATISTICS + ".resutilization";
+        public static final String SIMULATION_ENERGYUSAGE = CREATEXTSTATISTICS + ".respowerusage";
+        public static final String SIMULATION_AIRFLOW = CREATEXTSTATISTICS + ".resairflow";
+        public static final String SIMULATION_TEMPERATURE = CREATEXTSTATISTICS + ".restemperature";
+        
+        
         public static final String PRESSURE_DROP = "pressuredrop";
         public static final String OUTLET_ROOM_AIR_TEMPERATURE = "outletroomairtemperature";
@@ -186 +191 @@
         public boolean createsimulationstatistics = true;
         
-        public String [] resForEnergyChart;
-        public String [] resForAirflowChart;
-        public String [] resForTemperatureChart;
-        public String [] resForUtilizationChart;
+        public String [] compResForEnergyChart;
+        public String [] compResForAirflowChart;
+        public String [] compResForTemperatureChart;
+        public String [] compResForUtilizationChart;
+        
+        public String [] compResForEnergyText;
+        public String [] compResForAirflowText;
+        public String [] compResForTemperatureText;
+        public String [] compResForUtilizationText;
         
         public double pressureDrop;
@@ -311 +321 @@
 
                 try {
-                        co.resForUtilizationChart = bundle.getString(CREATEDIAGRAMS_UTILIZATION).split(";");
-                        if(co.resForUtilizationChart.length > 0){
+                        co.compResForUtilizationChart = bundle.getString(CREATEDIAGRAMS_UTILIZATION).split(";");
+                        if(co.compResForUtilizationChart.length > 0){
                                 co.creatediagrams_resutilization = true;
                         }
@@ -325 +335 @@
                 }
                 try {
-                        co.resForEnergyChart = bundle.getString(CREATEDIAGRAMS_ENERGYUSAGE).split(";");
-                        if(co.resForEnergyChart.length > 0){
+                        co.compResForEnergyChart = bundle.getString(CREATEDIAGRAMS_ENERGYUSAGE).split(";");
+                        if(co.compResForEnergyChart.length > 0){
                                 co.creatediagrams_respowerusage = true;
                         }
@@ -334 +344 @@
                 
                 try {
-                        co.resForAirflowChart = bundle.getString(CREATEDIAGRAMS_AIRFLOW).split(";");
-                        if(co.resForAirflowChart.length > 0){
+                        co.compResForAirflowChart = bundle.getString(CREATEDIAGRAMS_AIRFLOW).split(";");
+                        if(co.compResForAirflowChart.length > 0){
                                 co.creatediagrams_resairflow = true;
                         }
@@ -343 +353 @@
                 
                 try {
-                        co.resForTemperatureChart = bundle.getString(CREATEDIAGRAMS_TEMPERATURE).split(";");
-                        if(co.resForTemperatureChart.length > 0){
+                        co.compResForTemperatureChart = bundle.getString(CREATEDIAGRAMS_TEMPERATURE).split(";");
+                        if(co.compResForTemperatureChart.length > 0){
                                 co.creatediagrams_restemperature = true;
                         }
                 } catch(MissingResourceException e){
                         co.creatediagrams_restemperature = createDiagrams;
+                }
+                
+                try {
+                        co.compResForUtilizationText = bundle.getString(SIMULATION_UTILIZATION).split(";");
+                } catch(MissingResourceException e){
+                }
+                
+                try {
+                        co.compResForEnergyText = bundle.getString(SIMULATION_ENERGYUSAGE).split(";");
+                } catch(MissingResourceException e){
+                }
+                
+                try {
+                        co.compResForAirflowText = bundle.getString(SIMULATION_AIRFLOW).split(";");
+                } catch(MissingResourceException e){
+                }
+                
+                try {
+                        co.compResForTemperatureText = bundle.getString(SIMULATION_TEMPERATURE).split(";");
+                } catch(MissingResourceException e){
                 }