Remove system_mappings

Author: haneslinger

lib/buildingsync/model_articulation/facility.rb

@@ -76,16 +76,16 @@ def initialize(base_xml, ns)
 
       @measures = []
       @contacts = []
-      @systems_map = {}
 
       # TODO: Go under Report
       @utility_name = nil
       @utility_meter_numbers = []
       @metering_configuration = nil
       @spaces_excluded_from_gross_floor_area = nil
 
-      @load_system = nil
       @hvac_systems = nil
+      @lighting_systems = nil
+      @load_systems = nil
 
       # reading the xml
       read_xml
@@ -213,8 +213,7 @@ def read_and_create_initial_systems
 
       init_hvac_systems(systems_xml.elements["#{@ns}:HVACSystems"])
       init_lighting_systems(systems_xml.elements["#{@ns}:LightingSystem"])
-      # TODO: we aren't reading this from file... Which type of System is this? Plugloads? ProcessLoads?
-      @load_system = LoadsSystem.new
+      init_load_systems(systems_xml.elements["#{@ns}:PlugLoads"])  # PlugLoad, not ProcessLoad
 
     end
 
@@ -248,6 +247,21 @@ def init_lighting_systems(lighting_system_xmls)
       end
     end
 
+    def init_load_systems(loads_system_xmls)
+      # if theres no loads_system_xmls, use a default
+      if loads_system_xmls.nil? || !loads_system_xmls.has_elements?
+        loads_system_xml = @g.add_plug_load_to_facility(@base_xml)
+        @load_systems = [BuildingSync::LoadsSystem.new(loads_system_xml, @ns)]
+
+      # else, use the lighting_system_xmls
+      else
+        @load_systems = []
+        loads_system_xmls.elements.each do |lighting_system_xml|
+          @load_systems << BuildingSync::LoadsSystem.new(lighting_system_xml, @ns)
+        end
+      end
+    end
+
     # @see BuildingSync::Report.add_cb_modeled
     def add_cb_modeled(id = 'Scenario-Baseline')
       @report.add_cb_modeled(id)
@@ -264,13 +278,13 @@ def add_blank_lighting_system(premise_id, premise_type, lighting_system_id = 'Li
       @g.add_linked_premise(lighting_system_xml, premise_id, premise_type)
 
       # Create a new array if doesn't yet exist
-      if !@systems_map.key?('LightingSystems')
-        @systems_map['LightingSystems'] = []
+      if @lighting_systems.nil?
+        @lighting_systems = []
       end
 
       # Create new lighting system and add to array
       new_system = BuildingSync::LightingSystemType.new(lighting_system_xml, @ns)
-      @systems_map['LightingSystems'] << new_system
+      @lighting_systems << new_system
       return new_system
     end
 
@@ -324,13 +338,17 @@ def create_building_systems(main_output_dir:, zone_hash: nil, hvac_delivery_type
 
       # add internal loads to space types
       if add_space_type_loads
-        @load_system.add_internal_loads(model, open_studio_system_standard, template, @site.get_building_sections, remove_objects)
+        @load_systems.each do |load_system|
+          load_system.add_internal_loads(model, open_studio_system_standard, template, @site.get_building_sections, remove_objects)
+        end
         new_occupancy_peak = @site.get_peak_occupancy
         new_occupancy_peak.each do |id, occupancy_peak|
           floor_area = @site.get_floor_area[id]
           if occupancy_peak && floor_area && floor_area > 0.0
             puts "new peak occupancy value found: absolute occupancy: #{occupancy_peak} occupancy per area: #{occupancy_peak.to_f / floor_area.to_f} and area: #{floor_area} m2"
-            @load_system.adjust_occupancy_peak(model, occupancy_peak, floor_area, @site.get_space_types_from_hash(id))
+            @load_systems.each do |load_system|
+              load_system.adjust_occupancy_peak(model, occupancy_peak, floor_area, @site.get_space_types_from_hash(id))
+            end
           end
         end
       end
@@ -363,13 +381,15 @@ def create_building_systems(main_output_dir:, zone_hash: nil, hvac_delivery_type
 
       # add elevators (returns ElectricEquipment object)
       if add_elevators
-        @load_system.add_elevator(model, open_studio_system_standard)
+        @load_systems.each do |load_system|
+          load_system.add_elevator(model, open_studio_system_standard)
+        end
       end
 
       # add exterior lights (returns a hash where key is lighting type and value is exteriorLights object)
       if add_exterior_lights
-        if !@systems_map['LightingSystems'].nil?
-          @systems_map['LightingSystems'].each do |lighting_system|
+        if !@lighting_systems.nil?
+          @lighting_systems.each do |lighting_system|
             lighting_system.add_exterior_lights(model, open_studio_system_standard, onsite_parking_fraction, exterior_lighting_zone, remove_objects)
           end
         else
@@ -460,6 +480,6 @@ def prepare_final_xml
       @site.prepare_final_xml
     end
 
-    attr_reader :systems_map, :site, :report, :measures, :contacts
+    attr_reader :site, :report, :measures, :contacts, :hvac_systems, :lighting_systems, :load_systems
   end
 end

spec/tests/model_articulation_test/facility_spec.rb

@@ -166,7 +166,7 @@
   end
 end
 
-RSpec.describe 'Facility Systems Mapping' do
+RSpec.describe 'Facility Systems' do
   before(:all) do
     # -- Setup
     @ns = 'auc'
@@ -184,33 +184,20 @@
     @facility = BuildingSync::Facility.new(facility_xml, @ns)
   end
   describe 'with systems defined' do
-    it 'should be of the correct data structure' do
-      # -- Assert
-      expect(@facility.systems_map).to be_an_instance_of(Hash)
-    end
-    it 'should have the correct keys' do
-      # -- Assert correct keys get created
-      expected_keys = ['HVACSystems', 'LightingSystems', 'PlugLoads']
-      expected_keys.each do |k|
-        expect(@facility.systems_map.key?(k)).to be true
-      end
-    end
-
     it 'values should be of the correct type and size' do
       # -- Assert values of keys are correct type and size
-      expect(@facility.systems_map['HVACSystems']).to be_an_instance_of(Array)
-      expect(@facility.systems_map['LightingSystems']).to be_an_instance_of(Array)
-      expect(@facility.systems_map['PlugLoads']).to be_an_instance_of(Array)
-      expect(@facility.systems_map['HVACSystems'].size).to eq(2)
-      expect(@facility.systems_map['LightingSystems'].size).to eq(1)
-      expect(@facility.systems_map['PlugLoads'].size).to eq(1)
+      expect(@facility.hvac_systems).to be_an_instance_of(Array)
+      expect(@facility.lighting_systems).to be_an_instance_of(Array)
+      expect(@facility.load_systems).to be_an_instance_of(Array)
+      expect(@facility.hvac_systems.size).to eq(2)
+      expect(@facility.lighting_systems.size).to eq(1)
+      expect(@facility.load_systems.size).to eq(1)
     end
 
     it 'values in array should be of the correct type' do
-      # Only HVACSystem and LightingSystem should be typed as BSync element types (for now)
-      expect(@facility.systems_map['HVACSystems'][0]).to be_an_instance_of(BuildingSync::HVACSystem)
-      expect(@facility.systems_map['LightingSystems'][0]).to be_an_instance_of(BuildingSync::LightingSystemType)
-      expect(@facility.systems_map['PlugLoads'][0]).to be_an_instance_of(REXML::Element)
+      expect(@facility.hvac_systems[0]).to be_an_instance_of(BuildingSync::HVACSystem)
+      expect(@facility.lighting_systems[0]).to be_an_instance_of(BuildingSync::LightingSystemType)
+      expect(@facility.load_systems[0]).to be_an_instance_of(BuildingSync::LoadsSystem)
     end
   end
   describe 'with no systems defined' do

spec/tests/model_articulation_test/lighting_system_type_spec.rb

@@ -73,18 +73,15 @@
     @facility = BuildingSync::Facility.new(facility_xml, ns)
 
     # -- Assert - No systems have been added
-    expect(@facility.systems_map.empty?).to be true
     @facility.determine_open_studio_standard(@std)
 
     # Add a blank lighting system to the facility and link it to the building
     building_id = @facility.site.get_building.xget_id
     @lighting_system = @facility.add_blank_lighting_system(building_id, 'Building')
 
     # -- Assert Lighting System has been properly added
-    expect(@facility.systems_map.key?('LightingSystems')).to be true
-    expect(@facility.systems_map['LightingSystems'].size).to eq(1)
-    expect(@facility.systems_map['LightingSystems'][0]).to be @lighting_system
-    expect(@lighting_system.xget_linked_premises).to eq('Building' => ['Building1'])
+    expect(@facility.lighting_systems.size).to eq(1)
+    expect(@facility.lighting_systems[0].xget_linked_premises).to eq('Building' => ['Building1'])
 
     # we need to create a site and call the generate_baseline_osm method in order to set the space types in the model, why are those really needed?
     @facility.generate_baseline_osm(@epw_file_path, @output_path, @std)