honeybee-openstudio 2.23.5 → 2.23.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ced01eda1ef2637e0f07892dc5498c63c7e7e424965ef9d458e0ce16daba7c2
-  data.tar.gz: b98a359da6cfbef7010b3b77b0a3513937015c571c0c27602d3c7e4c4de35ed3
+  metadata.gz: 779f0f0085d9d4651f48c715cb6c70813d687dce61a540c90766b2efa5d42e88
+  data.tar.gz: 8c71a2c98b1e041ee9589115e6e3cc88380b7a670ccca558a010d6059835f0dc
 SHA512:
-  metadata.gz: bbc8d2fde85273d8bed150e222671fee710f2c450591cf1dbf3b1f26e40c5b11ae1006f6ae865f2ae6250076a34518f120da7593e27f278d75aded811cae5957
-  data.tar.gz: 78cd389a850c7b326a6e461126e969bec2c8f14a673c8aa4058216a5c67156f070e41d72360aa68f198e36590c83c011357a6f7bf6fc632528ba3713d3307afb
+  metadata.gz: 6bb6241027111bfcd79562bb0e2cb489c6bb0ae4883191572938bc94015c46b1c81c9a1037db2a4886263f55a0a001e934dbb17e537eaa8669bdd1266d7da65c
+  data.tar.gz: '059d0b94c4f7ec99ec9f8c9ae6ce8c524e46be2a00ea5edf8d461dacb446d5e15592c5ab1427885a6bb6b89592e41dddfc98e24073711bd45575427cea2bf102'

data/.github/workflows/ci.yaml

@@ -33,7 +33,7 @@ jobs:
       - name: set up node  # we need node for for semantic release
         uses: actions/setup-node@v2.1.2
         with:
-          node-version: 14.2.0
+          node-version: 14.17.0
       - name: install semantic-release
         run:
           npm install @semantic-release/exec

data/honeybee-openstudio.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'honeybee-openstudio'
-  spec.version       = '2.23.5'
+  spec.version       = '2.23.6'
   spec.authors       = ['Tanushree Charan', 'Dan Macumber', 'Chris Mackey', 'Mostapha Sadeghipour Roudsari']
   spec.email         = ['tanushree.charan@nrel.gov', 'chris@ladybug.tools']
 

data/lib/from_openstudio/geometry/aperture.rb

@@ -72,7 +72,7 @@ module Honeybee
       unless sub_surface.isConstructionDefaulted
         construction = sub_surface.construction
         if !construction.empty?
-          constr_id = construction.get.nameString
+          constr_id = clean_identifier(construction.get.nameString)
           unless $window_constructions[constr_id].nil?
             hash[:construction] = constr_id
           end

data/lib/from_openstudio/geometry/door.rb

@@ -72,7 +72,7 @@ module Honeybee
       unless sub_surface.isConstructionDefaulted
         construction = sub_surface.construction
         if !construction.empty?
-          constr_id = construction.get.nameString
+          constr_id = clean_identifier(construction.get.nameString)
           if hash[:is_glass] && !$window_constructions[constr_id].nil?
             hash[:construction] = constr_id
           elsif !hash[:is_glass] && !$opaque_constructions[constr_id].nil?

data/lib/from_openstudio/geometry/face.rb

@@ -74,7 +74,7 @@ module Honeybee
       unless surface.isConstructionDefaulted
         construction = surface.construction
         if !construction.empty?
-          constr_id = construction.get.nameString
+          constr_id = clean_identifier(construction.get.nameString)
           unless $opaque_constructions[constr_id].nil?
             hash[:construction] = constr_id
           end

data/lib/from_openstudio/geometry/room.rb

@@ -112,7 +112,7 @@ module Honeybee
     def self.story_from_space(space)
       story = space.buildingStory
       if !story.empty?
-        return story.get.nameString
+        return clean_identifier(story.get.nameString)
       end
       nil
     end

data/lib/from_openstudio/geometry/shade.rb

@@ -62,7 +62,7 @@ module Honeybee
       unless shading_surface.isConstructionDefaulted
         construction = shading_surface.construction
         if !construction.empty?
-          const_name = construction.get.nameString
+          const_name = clean_identifier(construction.get.nameString)
           hash[:construction] = const_name
           unless $shade_constructions.has_key?(const_name)
             const_obj = construction.get
@@ -74,7 +74,10 @@ module Honeybee
 
       transmittance_schedule = shading_surface.transmittanceSchedule
       if !transmittance_schedule.empty?
-        hash[:transmittance_schedule] = transmittance_schedule.get.nameString
+        trans_sch_name = clean_identifier(transmittance_schedule.get.nameString)
+        unless $schedules[trans_sch_name].nil?
+          hash[:transmittance_schedule] = trans_sch_name
+        end
       end
 
       hash

data/lib/from_openstudio/model.rb

@@ -64,7 +64,8 @@ module Honeybee
       hash[:tolerance] = 0.01
       hash[:angle_tolerance] = 1.0
 
-      # Hashes for all constructions in the model
+      # Hashes for all shcedules and constructions in the model
+      $schedules = {}
       $opaque_constructions = {}
       $window_constructions = {}
       $shade_constructions = {}
@@ -282,7 +283,9 @@ module Honeybee
     def self.scheduleruleset_from_model(openstudio_model)
       result = []
       openstudio_model.getScheduleRulesets.each do |sch_ruleset|
-        result << ScheduleRulesetAbridged.from_schedule_ruleset(sch_ruleset)
+        sched_hash = ScheduleRulesetAbridged.from_schedule_ruleset(sch_ruleset)
+        $schedules[sched_hash[:identifier]] = sched_hash
+        result << sched_hash
       end
       result
     end

data/lib/from_openstudio/simulation/design_day.rb

@@ -37,7 +37,7 @@ module Honeybee
     def self.from_design_day(design_day)
       hash = {}
       hash[:type] = 'DesignDay'
-      hash[:name] = design_day.nameString
+      hash[:name] = clean_identifier(design_day.nameString)
       hash[:day_type] = day_type_from_design_day(design_day)
       hash[:dry_bulb_condition] = dry_bulb_condition_from_design_day(design_day)
       hash[:humidity_condition] = humidity_condition_from_design_day(design_day)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybee-openstudio
 version: !ruby/object:Gem::Version
-  version: 2.23.5
+  version: 2.23.6
 platform: ruby
 authors:
 - Tanushree Charan
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler