ecms.rb in openstudio-standards-0.2.15.pre.rc1

- old
+ new

@@ -1,32 +1,31 @@
 class ECMS < NECB2011
-
-  @template = self.new.class.name
+  @template = new.class.name
   register_standard(@template)
 
   # Combine the data from the JSON files into a single hash
   # Load JSON files differently depending on whether loading from
   # the OpenStudio CLI embedded filesystem or from typical gem installation
-  def load_standards_database_new()
+  def load_standards_database_new
     @standards_data = {}
-    @standards_data["tables"] = {}
+    @standards_data['tables'] = {}
 
     if __dir__[0] == ':' # Running from OpenStudio CLI
       embedded_files_relative('data/', /.*\.json/).each do |file|
         data = JSON.parse(EmbeddedScripting.getFileAsString(file))
-        if not data["tables"].nil? and data["tables"].first["data_type"] == "table"
-          @standards_data["tables"] << data["tables"].first
+        if !data['tables'].nil? && data['tables'].first['data_type'] == 'table'
+          @standards_data['tables'] << data['tables'].first
         else
           @standards_data[data.keys.first] = data[data.keys.first]
         end
       end
     else
       files = Dir.glob("#{File.dirname(__FILE__)}/data/*.json").select { |e| File.file? e }
       files.each do |file|
         data = JSON.parse(File.read(file))
-        if not data["tables"].nil?
-          @standards_data["tables"] = [*@standards_data["tables"], *data["tables"]].to_h
+        if !data['tables'].nil?
+          @standards_data['tables'] = [*@standards_data['tables'], *data['tables']].to_h
         else
           @standards_data[data.keys.first] = data[data.keys.first]
         end
       end
     end
@@ -34,20 +33,19 @@
     return @standards_data
   end
 
   def initialize
     super()
-    @template = self.class.name
-    @standards_data = self.load_standards_database_new()
-    @standards_data['curves'] = standards_data['tables']["curves"]['table']
+    @standards_data = load_standards_database_new
+    @standards_data['curves'] = standards_data['tables']['curves']['table']
   end
 
   def apply_system_ecm(model:, ecm_system_name: nil, template_standard:, runner: nil, primary_heating_fuel: nil)
     # Do nothing if nil or other usual suspects.. covering all bases for now.
     return if ecm_system_name.nil? || ecm_system_name == 'none' || ecm_system_name == 'NECB_Default'
 
-    ecm_std = Standard.build("ECMS")
+    ecm_std = Standard.build('ECMS')
     systems = model.getAirLoopHVACs
     map_system_to_zones, system_doas_flags = ecm_std.get_map_systems_to_zones(systems)
     zone_clg_eqpt_type = ecm_std.get_zone_clg_eqpt_type(model)
     # when the ecm is associated with adding a new HVAC system, then remove existing system components and loops
     ecm_add_method_name = "add_ecm_#{ecm_system_name.downcase}"
@@ -60,41 +58,36 @@
     ecm_std.remove_chw_loops(model)
     ecm_std.remove_cw_loops(model)
 
     # Rather than go through every add_ecm class to add 'the primary_heating_fuel' argument I added this statement to
     # only include it when it is used (for now in the add_ecm_remove_airloops_add_zone_baseboards method).
-    unless (ecm_add_method_name == "add_ecm_remove_airloops_add_zone_baseboards")
+    if ecm_add_method_name == 'add_ecm_remove_airloops_add_zone_baseboards'
       ecm_std.send(ecm_add_method_name,
                    model: model,
                    system_zones_map: map_system_to_zones,
                    system_doas_flags: system_doas_flags,
                    zone_clg_eqpt_type: zone_clg_eqpt_type,
-                   standard: template_standard)
+                   standard: template_standard,
+                   primary_heating_fuel: primary_heating_fuel)
     else
       ecm_std.send(ecm_add_method_name,
                    model: model,
                    system_zones_map: map_system_to_zones,
-                   system_doas_flags: system_doas_flags,
-                   zone_clg_eqpt_type: zone_clg_eqpt_type,
-                   standard: template_standard,
-                   primary_heating_fuel: primary_heating_fuel)
+                   system_doas_flags: system_doas_flags)
     end
-    #ecm_std.add_ecm_hs09_ccashpsys(model:model,system_zones_map:,system_doas_flags:,zone_clg_eqpt_type: nil,standard:,baseboard_flag: true)
-
+    # ecm_std.add_ecm_hs09_ccashpsys(model:model,system_zones_map:,system_doas_flags:,zone_clg_eqpt_type: nil,standard:,baseboard_flag: true)
   end
 
   def apply_system_efficiencies_ecm(model:, ecm_system_name: nil)
     # Do nothing if nil.
     return if ecm_system_name.nil? || ecm_system_name == 'none' || ecm_system_name == 'NECB_Default' || ecm_system_name.to_s.downcase == 'remove_airloops_add_zone_baseboards'
-    ecm_std = Standard.build("ECMS")
+
+    ecm_std = Standard.build('ECMS')
     # Get method name that should be present in the ECM class.
     ecm_apply_eff_method_name = "apply_efficiency_ecm_#{ecm_system_name.downcase}"
     # Raise exception if method does not exists.
     raise("the method #{ecm_apply_eff_method_name} does not exist in the ECM class. Please verify that this should be called.") unless ecm_std.respond_to?(ecm_apply_eff_method_name)
 
     # apply system eff method.
-    ecm_std.send(ecm_apply_eff_method_name, model: model, ecm_name: ecm_system_name)
+    ecm_std.send(ecm_apply_eff_method_name, model)
   end
-
-
-
 end