openstudio-standards 0.8.4 → 0.8.5.rc1

data/lib/openstudio-standards/btap/costing/btap_costing.rb

@@ -1,6 +1,5 @@
 require 'json'
-require_relative 'costing_database_wrapper.rb'
-require_relative 'common_paths.rb'
+require_relative 'costing_database_wrapper'
 
 class SimpleLinearRegression
   #https://gist.github.com/rweald/3516193#file-full-slr-class-snippet-rb
@@ -41,9 +40,10 @@ class BTAPCosting
   # May be initialized with custom databases:
   #   costs_csv:   Path to custom costing
   #   factors_csv: Path to custom localization factors
-  def initialize(costs_csv: nil, factors_csv: nil)
+  def initialize(costs_csv: nil, factors_csv: nil, attributes:)
     @cp               = CommonPaths.instance
     @costing_database = CostingDatabase.instance
+    @attributes       = attributes
 
     # If the path for custom costing is defined, use custom costing.
     if (not costs_csv.nil?) and File.exist?(costs_csv)
@@ -56,10 +56,6 @@ class BTAPCosting
     end
   end
 
-  def load_database()
-    @costing_database.load_database
-  end
-
   def validate_database()
     @costing_database.validate_database
   end

data/lib/openstudio-standards/btap/costing/costing_database_wrapper.rb

@@ -1,7 +1,6 @@
 require 'singleton'
 require 'json'
 require 'csv'
-require_relative 'common_paths.rb'
 
 # Singleton class to centralize all database operations
 class CostingDatabase
@@ -10,11 +9,8 @@ class CostingDatabase
   def initialize
     @cp = CommonPaths.instance # Stores paths
     @db = Hash.new             # Stores the costing database
-  end
-
-  # Load the database from the individual CSV files
-  def load_database
 
+    # Load the database from the individual CSV files
     # Load costing data
     @db['costs'] = []                # Costing data
     @db['localization_factors'] = [] # Local costing factors

data/lib/openstudio-standards/btap/costing/daylighting_sensor_control_costing.rb

@@ -5,7 +5,8 @@ class BTAPCosting
     # NOTE: Number of daylighting sensors is based on how many a daylighted space needs sensors as per Mike Lubun's costing spec, rather than daylighting sensor control measure.
     standards_template = model.building.get.standardsTemplate.to_s
     if standards_template.include?('NECB')
-      standards_template = standards_template.gsub(/(?<=\p{L})(?=\d)/, ' ') #insert a space between NECB and 2011/2015/2017
+      # insert a space between NECB and 2011/2015/2017
+      standards_template = standards_template.gsub(/NECB(\d)/, 'NECB \1')
     end
 
     #-------------------------------------------------------------------------------------------------------------------
@@ -13,7 +14,7 @@ class BTAPCosting
     all_tz_primary_sidelighted_quatity = 0.0
     all_tz_skylight_quatity = 0.0
     #-------------------------------------------------------------------------------------------------------------------
-    model.getThermalZones.sort.each do |tz|
+    model.getThermalZonesSorted.each do |tz|
       if tz.primaryDaylightingControl.is_initialized
         tz_cost_primary_sidelighted = 0.0
         tz_cost_skylight = 0.0
@@ -326,7 +327,7 @@ class BTAPCosting
         }
 
       end #tz.primaryDaylightingControl.is_initialized
-    end #model.getThermalZones.sort.each do |tz|
+    end #model.getThermalZonesSorted.each do |tz|
     #-------------------------------------------------------------------------------------------------------------------
 
     puts "\nDaylighting sensor controls costing data successfully generated. Total DSC costs: $#{dsc_cost_total.round(2)}"
@@ -350,4 +351,4 @@ class BTAPCosting
     return fixture_type[column_search]
   end
 
-end
+end

data/lib/openstudio-standards/btap/costing/dcv_costing.rb

@@ -311,4 +311,4 @@ class BTAPCosting
   end #cost_audit_dcv(model, prototype_creator)
 
 
-end
+end

data/lib/openstudio-standards/btap/costing/envelope_costing.rb

@@ -10,24 +10,7 @@ end
 
 class BTAPCosting
   def cost_audit_envelope(model, prototype_creator)
-    # These are the only envelope costing items we are considering for envelopes..
-    costed_surfaces = [
-        "ExteriorWall",
-        "ExteriorRoof",
-        "ExteriorFloor",
-        "ExteriorFixedWindow",
-        "ExteriorOperableWindow",
-        "ExteriorSkylight",
-        "ExteriorTubularDaylightDiffuser",
-        "ExteriorTubularDaylightDome",
-        "ExteriorDoor",
-        "ExteriorGlassDoor",
-        "ExteriorOverheadDoor",
-        "GroundContactWall",
-        "GroundContactRoof",
-        "GroundContactFloor"
-    ]
-    costed_surfaces.each do |surface_type|
+    @attributes.surface_types.each do |surface_type|
       @costing_report["envelope"]["#{surface_type.underscore}_cost"] = 0.00
       @costing_report["envelope"]["#{surface_type.underscore}_area_m2"] = 0.0
       @costing_report["envelope"]["#{surface_type.underscore}_cost_per_m2"] = 0.00
@@ -35,192 +18,140 @@ class BTAPCosting
 
     @costing_report["envelope"]["construction_costs"] = []
 
-    # Store number of stories. Required for envelope costing logic.
-    num_of_above_ground_stories = model.getBuilding.standardsNumberOfAboveGroundStories.to_i
-
-    template_type = prototype_creator.template
-
-    closest_loc = get_closest_cost_location(model.getWeatherFile.latitude, model.getWeatherFile.longitude)
     generate_construction_cost_database_for_city(@costing_report["city"], @costing_report["province_state"])
 
     totEnvCost = 0
 
-    # Iterate through the thermal zones.
-    model.getThermalZones.sort.each do |zone|
-      # Iterate through spaces.
-      zone.spaces.sort.each do |space|
-        # Get SpaceType defined for space.. if not defined it will skip the spacetype. May have to deal with Attic spaces.
-        if space.spaceType.empty? or space.spaceType.get.standardsSpaceType.empty? or space.spaceType.get.standardsBuildingType.empty?
-          raise ("standards Space type and building type is not defined for space:#{space.name.get}. Skipping this space for costing.")
+    @attributes.spaces.each do |space|
+      # Get SpaceType defined for space.. if not defined it will skip the spacetype. May have to deal with Attic spaces.
+      if space.spaceType.empty? or space.spaceType.get.standardsSpaceType.empty? or space.spaceType.get.standardsBuildingType.empty?
+        raise ("standards Space type and building type is not defined for space:#{space.name.get}. Skipping this space for costing.")
+      end
+
+      @attributes.surface_types.each do |surface_type|
+        # Get Costs for this construction type. This will get the cost for the particular construction type
+        # for all rsi levels for this location. This has been collected by the API costs data. Note that a space_type
+        # of "- undefined -" will create a nil construction_set!
+
+        if space.construction_set.nil?
+          cost_range_hash = {}
+        else
+          cost_range_hash = @costing_database['constructions_costs'].select { |construction|
+            construction['construction_type_name'] == space.construction_set[surface_type] &&
+            construction['province_state']         == @costing_report["province_state"]    &&
+            construction['city']                   == @costing_report["city"]
+          }
         end
 
-        # Get space type standard names.
-        space_type = space.spaceType.get.standardsSpaceType
-        building_type = space.spaceType.get.standardsBuildingType
+        # We don't need all the information, just the rsi and cost. However, for windows rsi = 1/u_w_per_m2_k
+        surfaceIsGlazing = (
+          surface_type == 'ExteriorFixedWindow'         || surface_type == 'ExteriorOperableWindow'          ||
+          surface_type == 'ExteriorSkylight'            || surface_type == 'ExteriorTubularDaylightDiffuser' ||
+          surface_type == 'ExteriorTubularDaylightDome' || surface_type == 'ExteriorGlassDoor')
+        if surfaceIsGlazing
+          cost_range_array = cost_range_hash.map { |cost|
+            [
+              (1.0 / cost['u_w_per_m2_k'].to_f),
+              cost['total_cost_with_op']
+            ]
+          }
+        else
+          cost_range_array = cost_range_hash.map { |cost|
+            [
+              cost['rsi_k_m2_per_w'],
+              cost['total_cost_with_op']
+            ]
+          }
+        end
+        # Sorted based on rsi.
+        cost_range_array.sort! { |a, b| a[0] <=> b[0] }
 
-        # Get standard constructions based on collected information (spacetype, no of stories, etc..)
-        # This is a standard way to search a hash.
-        construction_set = @costing_database['raw']['construction_sets'].select { |data|
-          data['template'].to_s.gsub(/\s*/, '') == template_type and
-              data['building_type'].to_s.downcase == building_type.to_s.downcase and
-              data['space_type'].to_s.downcase == space_type.to_s.downcase and
-              data['min_stories'].to_i <= num_of_above_ground_stories and
-              data['max_stories'].to_i >= num_of_above_ground_stories
-        }.first
+        # Iterate through actual surfaces in the model of surface_type.
+        numSurfType = 0
+        space.surfaces_hash[surface_type].each do |surface|
+          numSurfType = numSurfType + 1
 
+          # Get RSI of existing model surface (actually returns rsi for glazings too!).
+          # Make an array of constructions to use with surfaces_get_conductance method which replaces the get_rsi
+          # method
+          rsi = 1 / (OpenstudioStandards::Constructions.construction_get_conductance(OpenStudio::Model::getConstructionByName(surface.model, surface.construction.get.name.to_s).get))
 
-        # Create Hash to store surfaces for this space by surface type
-        surfaces = {}
-        #Exterior
-        exterior_surfaces = BTAP::Geometry::Surfaces::filter_by_boundary_condition(space.surfaces, "Outdoors")
-        surfaces["ExteriorWall"] = BTAP::Geometry::Surfaces::filter_by_surface_types(exterior_surfaces, "Wall")
-        surfaces["ExteriorRoof"] = BTAP::Geometry::Surfaces::filter_by_surface_types(exterior_surfaces, "RoofCeiling")
-        surfaces["ExteriorFloor"] = BTAP::Geometry::Surfaces::filter_by_surface_types(exterior_surfaces, "Floor")
-        # Exterior Subsurface
-        exterior_subsurfaces = exterior_surfaces.flat_map(&:subSurfaces)
-        surfaces["ExteriorFixedWindow"] = BTAP::Geometry::Surfaces::filter_subsurfaces_by_types(exterior_subsurfaces, ["FixedWindow"])
-        surfaces["ExteriorOperableWindow"] = BTAP::Geometry::Surfaces::filter_subsurfaces_by_types(exterior_subsurfaces, ["OperableWindow"])
-        surfaces["ExteriorSkylight"] = BTAP::Geometry::Surfaces::filter_subsurfaces_by_types(exterior_subsurfaces, ["Skylight"])
-        surfaces["ExteriorTubularDaylightDiffuser"] = BTAP::Geometry::Surfaces::filter_subsurfaces_by_types(exterior_subsurfaces, ["TubularDaylightDiffuser"])
-        surfaces["ExteriorTubularDaylightDome"] = BTAP::Geometry::Surfaces::filter_subsurfaces_by_types(exterior_subsurfaces, ["TubularDaylightDome"])
-        surfaces["ExteriorDoor"] = BTAP::Geometry::Surfaces::filter_subsurfaces_by_types(exterior_subsurfaces, ["Door"])
-        surfaces["ExteriorGlassDoor"] = BTAP::Geometry::Surfaces::filter_subsurfaces_by_types(exterior_subsurfaces, ["GlassDoor"])
-        surfaces["ExteriorOverheadDoor"] = BTAP::Geometry::Surfaces::filter_subsurfaces_by_types(exterior_subsurfaces, ["OverheadDoor"])
 
-        # Ground Surfaces
-        ground_surfaces = BTAP::Geometry::Surfaces::filter_by_boundary_condition(space.surfaces, "Ground")
-        ground_surfaces += BTAP::Geometry::Surfaces::filter_by_boundary_condition(space.surfaces, "Foundation")
-        surfaces["GroundContactWall"] = BTAP::Geometry::Surfaces::filter_by_surface_types(ground_surfaces, "Wall")
-        surfaces["GroundContactRoof"] = BTAP::Geometry::Surfaces::filter_by_surface_types(ground_surfaces, "RoofCeiling")
-        surfaces["GroundContactFloor"] = BTAP::Geometry::Surfaces::filter_by_surface_types(ground_surfaces, "Floor")
+          #Check to see if it is in range
 
 
-        # Iterate through
-        costed_surfaces.each do |surface_type|
-          # Get Costs for this construction type. This will get the cost for the particular construction type
-          # for all rsi levels for this location. This has been collected by the API costs data. Note that a space_type
-          # of "- undefined -" will create a nil construction_set!
+          # Use the cost_range_array to interpolate the estimated cost for the given rsi.
+          # Note that window costs in the API data use U-value, which was converted to rsi for cost_range_array above
+          exterpolate_percentage_range = 30.0
+          cost = interpolate(x_y_array: cost_range_array, x2: rsi, exterpolate_percentage_range: exterpolate_percentage_range)
 
 
-          if construction_set.nil?
-            cost_range_hash = {}
+          # If the cost is nil, that means the rsi is out of range. Flag in the report.
+          if cost.nil?
+            if !cost_range_array.empty?
+              notes = "Warning! RSI out of the range (#{'%.2f' % rsi}) or cost is 0!. Range for #{space.construction_set[surface_type]} is #{'%.2f' % cost_range_array.first[0]}-#{'%.2f' % cost_range_array.last[0]}."
+              cost = 0.0
+            else
+              notes = "No cost found for this! So Cost is set to 0.0!"
+              cost = 0.0
+            end
+          elsif cost.nan?
+            raise("the values for cost and conductance for #{space.construction_set[surface_type]} cannot be interpolated...cannot create an equation of a line from #{cost_range_array.sort.uniq}. Check construction database and either eliminate the errant row, or set the x value to an appropriate number. ")
           else
-            cost_range_hash = @costing_database['constructions_costs'].select { |construction|
-              construction['construction_type_name'] == construction_set[surface_type] &&
-                  construction['province_state'] == @costing_report["province_state"] &&
-                  construction['city'] == @costing_report["city"]
-            }
+            #Tell user if we are extrapolating outside of library.
+            array = cost_range_array.sort { |a, b| a[0] <=> b[0] }
+            if rsi < (array.first[0].to_f) || rsi > (array.last[0].to_f)
+              notes = "RSI out of the range (#{'%.2f' % rsi}). Range for #{space.construction_set[surface_type]} is #{'%.2f' % cost_range_array.first[0]}-#{'%.2f' % cost_range_array.last[0]}.Using extrapolation up to +/-30% of library boundaries. "
+            else
+              notes = "OK"
+            end
           end
 
-          # We don't need all the information, just the rsi and cost. However, for windows rsi = 1/u_w_per_m2_k
-          surfaceIsGlazing = (surface_type == 'ExteriorFixedWindow' || surface_type == 'ExteriorOperableWindow' ||
-              surface_type == 'ExteriorSkylight' || surface_type == 'ExteriorTubularDaylightDiffuser' ||
-              surface_type == 'ExteriorTubularDaylightDome' || surface_type == 'ExteriorGlassDoor')
+          # Calculate SHGC/film cost
+          film_cost = 0.0
           if surfaceIsGlazing
-            cost_range_array = cost_range_hash.map { |cost|
-              [
-                  (1.0 / cost['u_w_per_m2_k'].to_f),
-                  cost['total_cost_with_op']
-              ]
-            }
-          else
-            cost_range_array = cost_range_hash.map { |cost|
-              [
-                  cost['rsi_k_m2_per_w'],
-                  cost['total_cost_with_op']
-              ]
-            }
+            #Get SHGC from surface.
+            shgc = OpenstudioStandards::Constructions.construction_get_solar_transmittance(surface.construction.get.to_Construction.get)
+            # Get the closest value in materials_glazing sheet of SolarFilms.
+            material_row = @costing_database["raw"]["materials_glazing"].select{ |row| row['material_type'] == 'Solarfilms' }.min_by {|row| (shgc.to_f - row['solar_heat_gain_coefficient'].to_f).abs}
+            standard_film_cost = getCost(material_row['description'], material_row, 1.0)
+            regional_factors = get_regional_cost_factors(@costing_report['province_state'], @costing_report['city'], material_row)
+            # mult regional cost and sum costs. Zip adds the arrays together, map multiplies each row and divides by 100.0 since the regional factor is in percents.
+            film_cost = standard_film_cost.zip(regional_factors).map{|cost,region_factor| cost * region_factor / 100.0}.inject(0, :+)
           end
-          # Sorted based on rsi.
-          cost_range_array.sort! { |a, b| a[0] <=> b[0] }
-
-          # Iterate through actual surfaces in the model of surface_type.
-          numSurfType = 0
-          surfaces[surface_type].sort.each do |surface|
-            numSurfType = numSurfType + 1
-
-            # Get RSI of existing model surface (actually returns rsi for glazings too!).
-            # Make an array of constructions to use with surfaces_get_conductance method which replaces the get_rsi
-            # method
-            rsi = 1 / (OpenstudioStandards::Constructions.construction_get_conductance(OpenStudio::Model::getConstructionByName(surface.model, surface.construction.get.name.to_s).get))
-
-
-            #Check to see if it is in range
 
 
-            # Use the cost_range_array to interpolate the estimated cost for the given rsi.
-            # Note that window costs in the API data use U-value, which was converted to rsi for cost_range_array above
-            exterpolate_percentage_range = 30.0
-            cost = interpolate(x_y_array: cost_range_array, x2: rsi, exterpolate_percentage_range: exterpolate_percentage_range)
+          testSurfName = surface.name.to_s
+          testSpaceName = space.name.to_s
+          surfArea = surface.netArea * space.thermalZone.get.multiplier
+          surfAreaft = (OpenStudio.convert(surfArea, "m^2", "ft^2").get).to_f
+          surfCost = (cost + film_cost) * surfAreaft
+          totEnvCost = totEnvCost + surfCost
+          name = ""
 
-
-            # If the cost is nil, that means the rsi is out of range. Flag in the report.
-            if cost.nil?
-              if !cost_range_array.empty?
-                notes = "Warning! RSI out of the range (#{'%.2f' % rsi}) or cost is 0!. Range for #{construction_set[surface_type]} is #{'%.2f' % cost_range_array.first[0]}-#{'%.2f' % cost_range_array.last[0]}."
-                cost = 0.0
-              else
-                notes = "No cost found for this! So Cost is set to 0.0!"
-                cost = 0.0
-              end
-            elsif cost.nan?
-              raise("the values for cost and conductance for #{construction_set[surface_type]} cannot be interpolated...cannot create an equation of a line from #{cost_range_array.sort.uniq}. Check construction database and either eliminate the errant row, or set the x value to an appropriate number. ")
-            else
-              #Tell user if we are extrapolating outside of library.
-              array = cost_range_array.sort { |a, b| a[0] <=> b[0] }
-              if rsi < (array.first[0].to_f) || rsi > (array.last[0].to_f)
-                notes = "RSI out of the range (#{'%.2f' % rsi}). Range for #{construction_set[surface_type]} is #{'%.2f' % cost_range_array.first[0]}-#{'%.2f' % cost_range_array.last[0]}.Using extrapolation up to +/-30% of library boundaries. "
-              else
-                notes = "OK"
-              end
-            end
-
-            # Calculate SHGC/film cost
-            film_cost = 0.0
-            if surfaceIsGlazing
-              #Get SHGC from surface.
-              shgc = OpenstudioStandards::Constructions.construction_get_solar_transmittance(surface.construction.get.to_Construction.get)
-              # Get the closest value in materials_glazing sheet of SolarFilms.
-              material_row = @costing_database["raw"]["materials_glazing"].select{ |row| row['material_type'] == 'Solarfilms' }.min_by {|row| (shgc.to_f - row['solar_heat_gain_coefficient'].to_f).abs}
-              standard_film_cost = getCost(material_row['description'], material_row, 1.0)
-              regional_factors = get_regional_cost_factors(@costing_report['province_state'], @costing_report['city'], material_row)
-              # mult regional cost and sum costs. Zip adds the arrays together, map multiplies each row and divides by 100.0 since the regional factor is in percents.
-              film_cost = standard_film_cost.zip(regional_factors).map{|cost,region_factor| cost * region_factor / 100.0}.inject(0, :+)
-            end
-
-
-            testSurfName = surface.name.to_s
-            testSpaceName = space.name.to_s
-            surfArea = surface.netArea * zone.multiplier
-            surfAreaft = (OpenStudio.convert(surfArea, "m^2", "ft^2").get).to_f
-            surfCost = (cost + film_cost) * surfAreaft
-            totEnvCost = totEnvCost + surfCost
-            name = ""
-
-            # Bin the costing by construction standard type and rsi
-            if construction_set.nil?
-              name = "undefined space type_#{(1.0 / rsi).round(3)}"
-            else
-              name = "#{construction_set[surface_type]}"
-            end
-            row = @costing_report["envelope"]["construction_costs"].detect { |row| (row['name'] == name) && (row['conductance'].round(3) == ((1.0 / rsi).round(3))) }
-            if row.nil?
-              @costing_report["envelope"]["construction_costs"] << {'name' => name, 'conductance' => ((1.0 / rsi).round(3)), 'area' => (surfArea.round(2)), 'cost' => (surfCost.round(2)), 'cost_per_area' => (surfCost / surfArea).round(2), 'note' => "Surf ##{numSurfType}: #{notes}"}
-            else
-              # Not using += for @costing_report additions so that output can be properly rounded
-              row['area'] = (row['area'] + surfArea).round(2)
-              row['cost'] = (row['cost'] + surfCost).round(2)
-              row['cost_per_area'] = ((row['cost'] / row['area']).to_f.round(2))
-              row['note'] += " / #{numSurfType}: #{notes}"
-            end
+          # Bin the costing by construction standard type and rsi
+          if space.construction_set.nil?
+            name = "undefined space type_#{(1.0 / rsi).round(3)}"
+          else
+            name = "#{space.construction_set[surface_type]}"
+          end
+          row = @costing_report["envelope"]["construction_costs"].detect { |row| (row['name'] == name) && (row['conductance'].round(3) == ((1.0 / rsi).round(3))) }
+          if row.nil?
+            @costing_report["envelope"]["construction_costs"] << {'name' => name, 'conductance' => ((1.0 / rsi).round(3)), 'area' => (surfArea.round(2)), 'cost' => (surfCost.round(2)), 'cost_per_area' => (surfCost / surfArea).round(2), 'note' => "Surf ##{numSurfType}: #{notes}"}
+          else
             # Not using += for @costing_report additions so that output can be properly rounded
-            @costing_report["envelope"]["#{surface_type.underscore}_cost"] = (@costing_report["envelope"]["#{surface_type.underscore}_cost"] + surfCost).round(2)
-            @costing_report["envelope"]["#{surface_type.underscore}_area_m2"] = (@costing_report["envelope"]["#{surface_type.underscore}_area_m2"] + surfArea).round(2)
-            @costing_report["envelope"]["#{surface_type.underscore}_cost_per_m2"] = (@costing_report["envelope"]["#{surface_type.underscore}_cost"] / @costing_report["envelope"]["#{surface_type.underscore}_area_m2"]).round(2)
-          end # surfaces of surface type
-        end # surface_type
-      end # spaces
-    end # thermalzone
+            row['area'] = (row['area'] + surfArea).round(2)
+            row['cost'] = (row['cost'] + surfCost).round(2)
+            row['cost_per_area'] = ((row['cost'] / row['area']).to_f.round(2))
+            row['note'] += " / #{numSurfType}: #{notes}"
+          end
+          # Not using += for @costing_report additions so that output can be properly rounded
+          @costing_report["envelope"]["#{surface_type.underscore}_cost"] = (@costing_report["envelope"]["#{surface_type.underscore}_cost"] + surfCost).round(2)
+          @costing_report["envelope"]["#{surface_type.underscore}_area_m2"] = (@costing_report["envelope"]["#{surface_type.underscore}_area_m2"] + surfArea).round(2)
+          @costing_report["envelope"]["#{surface_type.underscore}_cost_per_m2"] = (@costing_report["envelope"]["#{surface_type.underscore}_cost"] / @costing_report["envelope"]["#{surface_type.underscore}_area_m2"]).round(2)
+        end # surfaces of surface type
+      end # surface_type
+    end # spaces
 
     @costing_report["envelope"]['total_envelope_cost'] = totEnvCost.to_f.round(2)
     puts "\nEnvelope costing data successfully generated. Total envelope cost is $#{totEnvCost.to_f.round(2)}"

data/lib/openstudio-standards/btap/costing/heating_cooling_costing.rb

@@ -1147,7 +1147,7 @@ class BTAPCosting
       volume = model.building.get.airVolume()
       flrArea = 0.0
       if model.building.get.conditionedFloorArea.empty?
-        model.getThermalZones.sort.each do |tz|
+        model.getThermalZonesSorted.each do |tz|
           tz.spaces.sort.each do |tz_space|
             flrArea += tz_space.floorArea.to_f if ( (space_mod.space_cooled?(tz_space)) || (space_mod.space_heated?(tz_space)) )
           end
@@ -1244,7 +1244,7 @@ class BTAPCosting
       vrfFloors: []
     }
 
-    model.getThermalZones.sort.each do |zone|
+    model.getThermalZonesSorted.each do |zone|
       numZones += 1
       zone.equipment.each do |equipment|
         obj_type = equipment.iddObjectType.valueName.to_s
@@ -1810,7 +1810,7 @@ class BTAPCosting
     # Get perimeter distribution piping cost
     extWallArea = 0.0
     perimPipingCost = 0.0
-    zone.spaces.sort.each do |space|
+    zone.getSpacesSorted.each do |space|
       if space.spaceType.empty? or space.spaceType.get.standardsSpaceType.empty? or space.spaceType.get.standardsBuildingType.empty?
         raise ("standards Space type and building type is not defined for space:#{space.name.get}. Skipping this space for costing.")
       end
@@ -1833,7 +1833,7 @@ class BTAPCosting
     # Get perimeter distribution wiring cost
     extWallArea = 0.0
     perimWiringCost = 0.0
-    zone.spaces.sort.each do |space|
+    zone.getSpacesSorted.each do |space|
       if space.spaceType.empty? or space.spaceType.get.standardsSpaceType.empty? or space.spaceType.get.standardsBuildingType.empty?
         raise ("standards Space type and building type is not defined for space:#{space.name.get}. Skipping this space for costing.")
       end

data/lib/openstudio-standards/btap/costing/led_lighting_costing.rb

@@ -4,7 +4,8 @@ class BTAPCosting
     a = 0 # This is for reporting purposes.
     standards_template = model.building.get.standardsTemplate.to_s
     if standards_template.include?('NECB')
-      standards_template = standards_template.gsub(/(?<=\p{L})(?=\d)/, ' ') #insert a space between NECB and 2011/2015/2017
+      # insert a space between NECB and 2011/2015/2017
+      standards_template = standards_template.gsub(/NECB(\d)/, 'NECB \1')
     end
     # puts standards_template
 

data/lib/openstudio-standards/btap/costing/lighting_costing.rb

@@ -24,11 +24,11 @@ class BTAPCosting
     #Create Zonal report.
     @costing_report["lighting"]["fixture_report"] = []
     @costing_report["lighting"]["space_report"] = []
-    model.getThermalZones.sort.each do |zone|
+    model.getThermalZonesSorted.each do |zone|
       # Iterate through spaces.
       spaceNum = 0  # Counting number of spaces for reporting
       total_with_region = 0
-      zone.spaces.sort.each do |space|
+      zone.getSpacesSorted.each do |space|
         spaceNum += 1  # Counting number of spaces for reporting
         # Get SpaceType defined for space.. if not defined it will skip the spacetype. May have to deal with Attic spaces.
         if space.spaceType.empty? or space.spaceType.get.standardsSpaceType.empty? or space.spaceType.get.standardsBuildingType.empty?
@@ -206,4 +206,4 @@ class BTAPCosting
 
     return totLgtCost
   end
-end
+end

data/lib/openstudio-standards/btap/costing/test_list.txt

@@ -1,17 +1,15 @@
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResultsVintage_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_daylighting_sensor_control_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_dcv_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_led_lighting_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_pv_ground_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_CCASHP_Baseboard_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_DX_Adv_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_nv_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_CCASHP_VRF_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_SHW_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_vsd_chiller_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_insuite_central_doas_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_shw_scaling_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_HS08_CCASHP_VRF_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_HS09_CCASHP_Baseboard_Test.rb
-lib/openstudio-standards/btap/costing/btap_results/tests/BtapResults_HS14_CGSHP_FanCoils_Test.rb
+test/btap_costing/tests/BtapResults_daylighting_sensor_control_Test.rb
+test/btap_costing/tests/BtapResults_dcv_Test.rb
+test/btap_costing/tests/BtapResults_DX_Adv_Test.rb
+test/btap_costing/tests/BtapResults_HS08_CCASHP_VRF_Test.rb
+test/btap_costing/tests/BtapResults_HS09_CCASHP_Baseboard_Test.rb
+test/btap_costing/tests/BtapResults_HS14_CGSHP_FanCoils_Test.rb
+test/btap_costing/tests/BtapResults_insuite_central_doas_Test.rb
+test/btap_costing/tests/BtapResults_led_lighting_Test.rb
+test/btap_costing/tests/BtapResults_nv_Test.rb
+test/btap_costing/tests/BtapResults_pv_ground_Test.rb
+test/btap_costing/tests/BtapResults_shw_scaling_Test.rb
+test/btap_costing/tests/BtapResults_SHW_Test.rb
+test/btap_costing/tests/BtapResults_Test.rb
+test/btap_costing/tests/BtapResultsVintage_Test.rb
+test/btap_costing/tests/BtapResults_vsd_chiller_Test.rb

data/lib/openstudio-standards/btap/costing/test_run_all_test_locally.rb

@@ -1,26 +1,27 @@
-
 require 'fileutils'
 require 'parallel'
 require 'open3'
 require 'minitest/autorun'
 require 'json'
 require_relative './parallel_tests'
-TestListFile = File.join(File.dirname(__FILE__), 'test_list.txt')
+require_relative '../btap_test_helper' # Required for the cached switch
 
 class RunAllTests < Minitest::Test
   def test_all()
     full_file_list = nil
-    if File.exist?(TestListFile)
-      puts TestListFile
+    test_list_file = File.expand_path(File.join(__dir__, 'test_list.txt'))
+    root_dir       = File.expand_path("../../../../", __dir__)
+    if File.exist?(test_list_file)
+      puts test_list_file
       # load test files from file.
-      full_file_list = File.readlines(TestListFile).shuffle
+      full_file_list = File.readlines(test_list_file).shuffle
+      full_file_list.map! {|file| "#{root_dir}/#{file.strip}"}
       # Select only .rb files that exist
-      full_file_list.select! {|item| item.include?('rb') && File.exist?(File.absolute_path("#{item.strip}"))}
-      full_file_list.map! {|item| File.absolute_path("#{item.strip}")}
+      full_file_list.select! {|file| file.include?('rb') && File.exist?(file)}
     else
-      puts "Could not find list of files to test at #{TestListFile}"
+      puts "Could not find list of files to test at #{test_list_file}"
       return false
     end
     assert(ParallelTests.new.run(full_file_list), "Some tests failed please ensure all test pass and tests have been updated to reflect the changes you expect before issuing a pull request")
   end
-end
+end