honeybee-openstudio 2.34.6 → 2.34.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c23eea2c9a30bbdb29eac4e1510577dce8a459386bff13afdab121a33aa2b2d
-  data.tar.gz: afeb68c0834f50351752b6ae061beafa7fb57c5140986e0d86e6a76e4e6cd0a7
+  metadata.gz: badea0be05124c62097e7732560433b8a1d8941aecc21af3e9ab8f2e7b19b837
+  data.tar.gz: 53ddac62aaffe8a76f01ac3f8bf02f0b167dca4fc0aa3b509c6b11e3d6181fec
 SHA512:
-  metadata.gz: 5d606d121fceef4a970bb0c9afb59403ae774dcdcd4cf536aad148acbcbd5b61bb64bb3652b87f155c9638e1f59d92bfa8706051906b5e5e1bccaf7c1109b7d4
-  data.tar.gz: af6974feb3c3697a3ec0f1a3653b366eef9066bec4f94a95d1e1701995902e79a98699b10a7c87075528233773a5058040bccacd7efd439aee168527967a933b
+  metadata.gz: 98558f65b918299e64548cb37ff75d2a9042970ccf64cb9ece29a7b772645e06d59a1e3ba212948ef312873c72d7a721d9066212d0947248905285e9bf5cb34d
+  data.tar.gz: 901a6c78784757090e5873f282bdfc870de96c4cbe96d061ac8c80831431f51432fb79f3c8f5ae8e258b5c0904b878312e443a0a8d28eb41e2bd290dc09fbf02

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 if File.exist?('../OpenStudio-extension-gem')  # local development copy
   gem 'openstudio-extension', path: '../OpenStudio-extension-gem'
 else  # get it from rubygems.org
-  gem 'openstudio-extension', '0.6.0'
+  gem 'openstudio-extension', '0.6.1'
 end
 
 # coveralls gem is used to generate coverage reports through CI

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.34.6'
+  spec.version       = '2.34.8'
   spec.authors       = ['Tanushree Charan', 'Dan Macumber', 'Chris Mackey', 'Mostapha Sadeghipour Roudsari']
   spec.email         = ['tanushree.charan@nrel.gov', 'chris@ladybug.tools']
 
@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_dependency 'json_pure'
-  spec.add_dependency 'openstudio-extension', '0.6.0'
+  spec.add_dependency 'openstudio-extension', '0.6.1'
   spec.add_dependency 'openstudio-standards', '~> 0.3.0'
 end

data/lib/files/urbanopt_Gemfile

@@ -2,43 +2,60 @@ source 'http://rubygems.org'
 
 ruby '~> 2.7.0'
 
-allow_local = ENV['FAVOR_LOCAL_GEMS']
-
-# pin this dependency to avoid unicode_normalize error
+# pin these dependencies to prevent releases of gems from breaking URBANopt
 gem 'addressable', '2.8.1'
+gem 'ansi', '1.5.0'
+gem 'ast', '2.4.2'
+gem 'bcl', '0.7.1'
+gem 'builder', '3.2.4'
+gem 'docile', '1.4.0'
+gem 'faraday', '1.0.1'
+gem 'git', '1.12.0'
+gem 'json-schema', '2.8.1'
+gem 'json_pure', '2.6.3'
+gem 'macaddr', '1.7.2'
+gem 'minitar', '0.9'
+gem 'multipart-post', '2.3.0'
+gem 'octokit', '4.18.0'
+gem 'openstudio-calibration', '0.7.0'
+gem 'openstudio-common-measures', '0.7.0'
+gem 'openstudio-ee', '0.7.0'
+gem 'openstudio-extension', '0.6.0'
+gem 'openstudio-geb', '0.2.1'
+gem 'openstudio-load-flexibility-measures', '0.6.1'
+gem 'openstudio_measure_tester', '0.3.2'
+gem 'openstudio-model-articulation', '0.7.0'
+gem 'openstudio-standards', '0.3.0'
+gem 'openstudio-workflow', '2.3.1'
+gem 'parallel', '1.19.2'
 gem 'parser', '3.2.2.2'
-
-if allow_local && File.exist?('../openstudio-common-measures-gem')
-  gem 'openstudio-common-measures', path: '../openstudio-common-measures-gem'
-elsif allow_local
-  gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
-else
-  gem 'openstudio-common-measures', '~> 0.7.0'
-end
-
-if allow_local && File.exist?('../openstudio-model-articulation-gem')
-  gem 'openstudio-model-articulation', path: '../openstudio-model-articulation-gem'
-elsif allow_local
-  gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop'
-else
-  gem 'openstudio-model-articulation', '0.7.0'
-end
-
-if allow_local && File.exist?('../urbanopt-geojson-gem')
-  gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem'
-elsif allow_local
-  gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
-else
-  gem 'urbanopt-geojson', '~> 0.9.0'
-end
-
-if allow_local && File.exist?('../urbanopt-reporting-gem')
-  gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
-elsif allow_local
-  gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
-else
-  gem 'urbanopt-reporting', '~> 0.7.0'
-end
+gem 'public_suffix', '5.0.1'
+gem 'minitest', '5.14.4'
+gem 'minitest-reporters', '1.4.3'
+gem 'rchardet', '1.8.0'
+gem 'rake', '13.0.6'
+gem 'rainbow', '3.1.1'
+gem 'regexp_parser', '2.8.1'
+gem 'rexml', '3.2.5'
+gem 'rubocop', '1.15.0'
+gem 'rubocop-ast', '1.29.0'
+gem 'rubocop-checkstyle_formatter', '0.4.0'
+gem 'rubocop-performance', '1.11.5'
+gem 'ruby-ole', '1.2.12.2'
+gem 'ruby-progressbar', '1.13.0'
+gem 'rubyzip', '2.3.2'
+gem 'sawyer', '0.8.2'
+gem 'simplecov', '0.18.5'
+gem 'simplecov-html', '0.12.3'
+gem 'spreadsheet', '1.2.9'
+gem 'systemu', '2.6.5'
+gem 'unicode-display_width', '2.4.2'
+gem 'urbanopt-core', '0.9.0'
+gem 'urbanopt-geojson', '0.9.0'
+gem 'urbanopt-reporting', '0.7.0'
+gem 'uuid', '2.3.9'
+gem 'yamler', '0.1.0'
+gem 'zliby', '0.0.5'
 
 # include the honeybee-openstudio-gem
 gem 'honeybee-openstudio', '2.33.4'

data/lib/to_openstudio/construction/windowshade.rb

@@ -45,19 +45,20 @@ module Honeybee
     end
 
     def to_openstudio(openstudio_model)
-      # write the shaded and unsaded versions of the construction into the model
-      # reverse the shaded and unshaded identifiers so unshaded one is assigned to apertures
+      # set the unshaded ID to be the whole construction ID so unshaded one is assigned to apertures
       unshd_id = @hash[:identifier]
-      shd_id = @hash[:window_construction][:identifier]
       @hash[:window_construction][:identifier] = unshd_id
+      # derive a new ID for the shaded construction that will not conflict with any bare versions of the construction
+      shd_id = @hash[:identifier]  + '_Shaded'
       @hash[:identifier] = shd_id
+
       # create the unshaded construction
       unshd_constr_obj = WindowConstructionAbridged.new(@hash[:window_construction])
       @construction = unshd_constr_obj.to_openstudio(openstudio_model)
 
       # create the shaded construction
       @shade_construction = OpenStudio::Model::Construction.new(openstudio_model)
-      @shade_construction.setName(shd_id)
+      @shade_construction.setName(@hash[:identifier])
       unless @hash[:display_name].nil?
         @shade_construction.setDisplayName(@hash[:display_name])
       end

data/lib/to_openstudio/model.rb

@@ -99,8 +99,14 @@ module Honeybee
 
     # create OpenStudio objects in the OpenStudio model
     def create_openstudio_objects(log_report=true)
-      # assign a standards building type so that David's measures can run
+      # assign the building name and a default standards building type so measures can run
       building = @openstudio_model.getBuilding
+      if @hash[:display_name]
+        clean_name = @hash[:display_name].to_s.gsub(/[^.A-Za-z0-9_-] /, " ")
+        building.setName(clean_name)
+      else
+        building.setName(@hash[:identifier])
+      end
       if building.standardsBuildingType.empty?
         building.setStandardsBuildingType('MediumOffice')
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybee-openstudio
 version: !ruby/object:Gem::Version
-  version: 2.34.6
+  version: 2.34.8
 platform: ruby
 authors:
 - Tanushree Charan
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: openstudio-standards
   requirement: !ruby/object:Gem::Requirement