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

Timestamp:

03/19/14 18:22:27 (11 years ago)

Author:

wojtekp

Message:

 

File:

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

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

@@ -8 +8 @@
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
+
+import test.CoolingModelData;
 
 /**
@@ -189 +191 @@
         public String [] resForUtilizationChart;
         
-        public static double pressureDrop;
-        public static double outletRoomAirTempeature;
-        public static double inletRoomAirTempeature;
-        public static double ambientAirTempeature;
-        public static double airFlowVolume;
-        public static double alpha
-        ;
+        public double pressureDrop;
+        public double outletRoomAirTempeature;
+        public double inletRoomAirTempeature;
+        public double ambientAirTempeature;
+        public double airFlowVolume;
+        public double alpha;
+        
+        public static CoolingModelData coolingData;
         /**
          * An empty constructor.
@@ -389 +392 @@
 
                 try {
-                        ConfigurationOptions.pressureDrop = Double.valueOf(bundle.getString(PRESSURE_DROP)).doubleValue();
-                } catch(MissingResourceException e){
-                        ConfigurationOptions.pressureDrop = 65;
-                }
-                
-                try {
-                        ConfigurationOptions.outletRoomAirTempeature = Double.valueOf(bundle.getString(OUTLET_ROOM_AIR_TEMPERATURE)).doubleValue();
-                } catch(MissingResourceException e){
-                        ConfigurationOptions.outletRoomAirTempeature = 23;
-                }
-                
-                try {
-                        ConfigurationOptions.inletRoomAirTempeature = Double.valueOf(bundle.getString(INLET_ROOM_AIR_TEMPERATURE)).doubleValue();
-                } catch(MissingResourceException e){
-                        ConfigurationOptions.inletRoomAirTempeature = 17;
-                }
-                
-                try {
-                        ConfigurationOptions.ambientAirTempeature = Double.valueOf(bundle.getString(AMBIENT_AIR_TEMPERATURE)).doubleValue();
-                } catch(MissingResourceException e){
-                        ConfigurationOptions.ambientAirTempeature = 17;
-                }
-                
-                try {
-                        ConfigurationOptions.airFlowVolume = Double.valueOf(bundle.getString(AIR_FLOW_VOLUME)).doubleValue();
-                } catch(MissingResourceException e){
-                        ConfigurationOptions.airFlowVolume = 4;
-                }
-                
-                try {
-                        ConfigurationOptions.alpha = Double.valueOf(bundle.getString(ALPHA)).doubleValue();
-                } catch(MissingResourceException e){
-                        ConfigurationOptions.alpha = 0.2;
-                }
-                
+                        co.pressureDrop = Double.valueOf(bundle.getString(PRESSURE_DROP)).doubleValue();
+                } catch(MissingResourceException e){
+                        co.pressureDrop = -1;
+                }
+                
+                try {
+                        co.outletRoomAirTempeature = Double.valueOf(bundle.getString(OUTLET_ROOM_AIR_TEMPERATURE)).doubleValue();
+                } catch(MissingResourceException e){
+                        co.outletRoomAirTempeature = -1;
+                }
+                
+                try {
+                        co.inletRoomAirTempeature = Double.valueOf(bundle.getString(INLET_ROOM_AIR_TEMPERATURE)).doubleValue();
+                } catch(MissingResourceException e){
+                        co.inletRoomAirTempeature = -1;
+                }
+                
+                try {
+                        co.ambientAirTempeature = Double.valueOf(bundle.getString(AMBIENT_AIR_TEMPERATURE)).doubleValue();
+                } catch(MissingResourceException e){
+                        co.ambientAirTempeature = -1;
+                }
+                
+                try {
+                        co.airFlowVolume = Double.valueOf(bundle.getString(AIR_FLOW_VOLUME)).doubleValue();
+                } catch(MissingResourceException e){
+                        co.airFlowVolume = -1;
+                }
+                
+                try {
+                        co.alpha = Double.valueOf(bundle.getString(ALPHA)).doubleValue();
+                } catch(MissingResourceException e){
+                        co.alpha = -1;
+                }
+                
+                ConfigurationOptions.coolingData = new CoolingModelData(co.pressureDrop, co.outletRoomAirTempeature, co.inletRoomAirTempeature, co.ambientAirTempeature, co.airFlowVolume, co.alpha);
                 return co;
         }