honeybee-openstudio 2.23.0 → 2.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b1713bd43ce02933e6b62917cfd588f51b34474ab42cc964fac0707892ef6cb
-  data.tar.gz: 1b63c7e6ef5ef775b1c6312170fc11cb2117685141e6e6c00d39bc14a4dcb7e9
+  metadata.gz: f5b611d0b78befb14bd1968ad3bc09479295c7367265049523c28ef3b3e3feeb
+  data.tar.gz: 6630478417dcc8d8680339b3d673b857ac6e0593152310213a3dc9c6eb227914
 SHA512:
-  metadata.gz: b2ce15cb4c8761569e16fae90f1a378a34d4a662abe027458714ed2c11004e84d833dec91ab7795d14d019ada20803a96969ac08c9eb0e8b8f9f725d60911fd5
-  data.tar.gz: 2ed1a4870310d697989c9af03079522af38459cba61280b2053e8b2e59cade74318e5ec43380ca85512ec74258d02b2f13305206c2a3a24e97395de428a95266
+  metadata.gz: 549cb01585b8b2983b5d5014703325bf87a83db1cc600c4f4ed557a501d998cc5e2632970a7d58d0c75d7a34234a11befbe2eb27c49c085303d25708040c794a
+  data.tar.gz: 16c6ed67bb2a2a8a5e83fe63641dee6db8df13a855103149565a4d476e0746c02a7837d12307f45ad67fe77854d2c572fcd39323434be5338395e27bb98f36a5

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.0'
+  spec.version       = '2.23.1'
   spec.authors       = ['Tanushree Charan', 'Dan Macumber', 'Chris Mackey', 'Mostapha Sadeghipour Roudsari']
   spec.email         = ['tanushree.charan@nrel.gov', 'chris@ladybug.tools']
 

data/lib/from_openstudio/model.rb

@@ -128,14 +128,10 @@ module Honeybee
     def self.energy_properties_from_model(openstudio_model)
       hash = {}
       hash[:type] = 'ModelEnergyProperties'
-      hash[:constructions] = []
       hash[:constructions] = constructions_from_model(openstudio_model)
       hash[:materials] = materials_from_model(openstudio_model)
-      hash[:construction_sets] = []
       hash[:construction_sets] = constructionsets_from_model(openstudio_model)
-      hash[:schedule_type_limits] = []
       hash[:schedule_type_limits] = schedtypelimits_from_model(openstudio_model)
-      hash[:schedules] = []
       hash[:schedules] = scheduleruleset_from_model(openstudio_model)
 
       hash

data/lib/from_openstudio/schedule/ruleset.rb

@@ -39,23 +39,49 @@ module Honeybee
       # create an empty hash
       hash = {}
       hash[:type] = 'ScheduleRulesetAbridged'
-      # set hash values from OpenStudio Object
-      hash[:identifier] = schedule_ruleset.nameString
-      # check if boost optional object is empty
-      hash[:default_day_schedule] = schedule_ruleset.defaultDaySchedule.nameString 
-      hash[:summer_designday_schedule] = schedule_ruleset.summerDesignDaySchedule.nameString
-      hash[:winter_designday_schedule] = schedule_ruleset.winterDesignDaySchedule.nameString
-      hash[:holiday_schedule] = schedule_ruleset.holidaySchedule.nameString
+      # set the primary (required) day schedules of the object
+      hash[:identifier] = clean_name(schedule_ruleset.nameString)
+      hash[:default_day_schedule] = clean_name(schedule_ruleset.defaultDaySchedule.nameString)
+      hash[:summer_designday_schedule] = clean_name(schedule_ruleset.summerDesignDaySchedule.nameString)
+      hash[:winter_designday_schedule] = clean_name(schedule_ruleset.winterDesignDaySchedule.nameString)
+      hash[:holiday_schedule] = clean_name(schedule_ruleset.holidaySchedule.nameString)
 
-      schedule_days = [schedule_ruleset.defaultDaySchedule, schedule_ruleset.summerDesignDaySchedule, schedule_ruleset.winterDesignDaySchedule, schedule_ruleset.holidaySchedule]
-      hash[:day_schedules] = []
-      schedule_days.each do |schedule_day|
-        hash[:day_schedules] << ScheduleRulesetAbridged.from_day_schedule(schedule_day)
+      # create a list of all day schedules referenced in the Ruleset
+      schedule_days, day_ids = [], []
+      required_days = [
+        schedule_ruleset.defaultDaySchedule,
+        schedule_ruleset.summerDesignDaySchedule,
+        schedule_ruleset.winterDesignDaySchedule,
+        schedule_ruleset.holidaySchedule
+      ]
+      required_days.each do |day_sch|
+        unless day_ids.include? day_sch.nameString
+          schedule_days << day_sch
+          day_ids << day_sch.nameString
+        end
       end
 
+      # loop through the rules and add them along with their day schedules
       hash[:schedule_rules] = []
       schedule_ruleset.scheduleRules.each do |schedule_rule|
         hash[:schedule_rules] << ScheduleRulesetAbridged.from_schedule_rule(schedule_rule)
+        day_sch = schedule_rule.daySchedule
+        unless day_ids.include? day_sch.nameString
+          schedule_days << day_sch
+          day_ids << day_sch.nameString
+        end
+      end
+
+      # write all of the day schedule specifications into the hash
+      hash[:day_schedules] = []
+      schedule_days.each do |schedule_day|
+        hash[:day_schedules] << ScheduleRulesetAbridged.from_day_schedule(schedule_day)
+      end
+
+      # assing any schedule type limits if they exist
+      unless schedule_ruleset.scheduleTypeLimits.empty?
+        typ_lim = schedule_ruleset.scheduleTypeLimits.get
+        hash[:schedule_type_limit] = clean_name(typ_lim.nameString)
       end
 
       hash
@@ -64,7 +90,7 @@ module Honeybee
     def self.from_day_schedule(day_schedule)
       hash = {}
       hash[:type] = 'ScheduleDay'
-      hash[:identifier] = day_schedule.nameString
+      hash[:identifier] = clean_name(day_schedule.nameString)
       hash[:interpolate] = day_schedule.interpolatetoTimestep
       hash[:values] = day_schedule.values
       time_until = [[0,0]]
@@ -80,7 +106,7 @@ module Honeybee
     def self.from_schedule_rule(schedule_rule)
       hash = {}
       hash[:type] = 'ScheduleRuleAbridged'
-      hash[:schedule_day] = schedule_rule.daySchedule.nameString
+      hash[:schedule_day] = clean_name(schedule_rule.daySchedule.nameString)
       hash[:apply_sunday] = schedule_rule.applySunday
       hash[:apply_monday] = schedule_rule.applyMonday
       hash[:apply_tuesday] = schedule_rule.applyTuesday

data/lib/from_openstudio/schedule/type_limit.rb

@@ -40,7 +40,7 @@ module Honeybee
       hash = {}
       hash[:type] = 'ScheduleTypeLimit'
       # set hash values from OpenStudio Object
-      hash[:identifier] = schedule_type_limit.nameString
+      hash[:identifier] = clean_name(schedule_type_limit.nameString)
       # check if boost optional object is empty
       unless schedule_type_limit.lowerLimitValue.empty?
         hash[:lower_limit] = schedule_type_limit.lowerLimitValue.get
@@ -54,7 +54,19 @@ module Honeybee
         numeric_type = schedule_type_limit.numericType.get
         hash[:numeric_type] = numeric_type.titleize
       end
-      hash[:unit_type] = schedule_type_limit.unitType
+
+      # make sure unit type always follows the capitalization of the Honeybee Enumeration
+      unit_type = schedule_type_limit.unitType.titleize
+      if unit_type == 'Deltatemperature'
+        unit_type = 'DeltaTemperature'
+      elsif unit_type == 'Precipitationrate'
+        unit_type = 'PrecipitationRate'
+      elsif unit_type == 'Convectioncoefficient'
+        unit_type = 'ConvectionCoefficient'
+      elsif unit_type == 'Activitylevel'
+        unit_type = 'ActivityLevel'
+      end
+      hash[:unit_type] = unit_type
 
       hash
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybee-openstudio
 version: !ruby/object:Gem::Version
-  version: 2.23.0
+  version: 2.23.1
 platform: ruby
 authors:
 - Tanushree Charan