openstudio-model-articulation 0.8.0 → 0.10.0

data/lib/measures/replace_geometry_by_story/measure.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>replace_geometry_by_story</name>
   <uid>03b18912-0ceb-47e9-8f8b-417a3008e189</uid>
-  <version_id>d3524dcb-2b5f-4d2f-b850-3b28c1cd8003</version_id>
-  <version_modified>20230602T160042Z</version_modified>
+  <version_id>3be0bbb0-efb9-4e7f-8d43-3e758ee734da</version_id>
+  <version_modified>2024-05-20T07:54:33Z</version_modified>
   <xml_checksum>2AF3A68E</xml_checksum>
   <class_name>ReplaceGeometryByStory</class_name>
   <display_name>Replace Geometry By Story</display_name>
@@ -40,16 +40,10 @@
   </attributes>
   <files>
     <file>
-      <filename>README.md.erb</filename>
-      <filetype>erb</filetype>
-      <usage_type>readmeerb</usage_type>
-      <checksum>703C9964</checksum>
-    </file>
-    <file>
-      <filename>mixed_hotel_rest_by_story_test_output.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>B5DB5BF9</checksum>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>BFFB1AA6</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -58,21 +52,27 @@
       <checksum>97ED578F</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>BFFB1AA6</checksum>
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>703C9964</checksum>
     </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
         <identifier>2.9.0</identifier>
-        <min_compatible>2.9.0</min_compatible>
+        <min_compatible>3.8.0</min_compatible>
       </version>
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>C5ED0362</checksum>
+      <checksum>D475255D</checksum>
+    </file>
+    <file>
+      <filename>mixed_hotel_rest_by_story_test_output.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>B5DB5BF9</checksum>
     </file>
     <file>
       <filename>replace_geometry_by_story_test.rb</filename>

data/lib/measures/set_nist_infiltration_correlations/measure.rb

@@ -114,44 +114,53 @@ class SetNISTInfiltrationCorrelations < OpenStudio::Measure::ModelMeasure
     return results
   end
 
+  # method to invert a schedule day
+  def invert_schedule_day(old_schedule_day, new_schedule_day, new_schedule_name)
+    new_schedule_day.setName("#{new_schedule_name}")
+    for index in 0..old_schedule_day.times.size-1
+      old_value = old_schedule_day.values[index]
+      if old_value == 0
+        new_value = 1
+      else
+        new_value = 0
+      end
+      new_schedule_day.addValue(old_schedule_day.times[index], new_value)
+    end
+
+    return new_schedule_day
+  end
+
   # method to invert a schedule ruleset
   def invert_schedule_ruleset(schedule_ruleset, new_schedule_name)
     model = schedule_ruleset.model
     new_schedule = OpenStudio::Model::ScheduleRuleset.new(model, 0.0)
     new_schedule.setName(new_schedule_name)
 
+    # change summer design day
+    summer_design_day_schedule = schedule_ruleset.summerDesignDaySchedule
+    new_summer_design_day_schedule = OpenStudio::Model::ScheduleDay.new(model)
+    invert_schedule_day(summer_design_day_schedule, new_summer_design_day_schedule, "#{new_schedule_name} Summer Design Day Schedule")
+    new_schedule.setSummerDesignDaySchedule(new_summer_design_day_schedule)
+
+    # change winter design day
+    winter_design_day_schedule = schedule_ruleset.winterDesignDaySchedule
+    new_winter_design_day_schedule = OpenStudio::Model::ScheduleDay.new(model)
+    invert_schedule_day(winter_design_day_schedule, new_winter_design_day_schedule, "#{new_schedule_name} Winter Design Day Schedule")
+    new_schedule.setWinterDesignDaySchedule(new_winter_design_day_schedule)
+
     # change the default day values
     default_day_schedule = schedule_ruleset.defaultDaySchedule
     new_default_day_schedule = new_schedule.defaultDaySchedule
-    new_default_day_schedule.setName("#{new_schedule_name} Default Day Schedule")
-    for index in 0..default_day_schedule.times.size-1
-      old_value = default_day_schedule.values[index]
-      if old_value == 0
-        new_value = 1
-      else
-        new_value = 0
-      end
-      new_default_day_schedule.addValue(default_day_schedule.times[index], new_value)
-    end
+    invert_schedule_day(default_day_schedule, new_default_day_schedule, "#{new_schedule_name} Default Day Schedule")
 
     # change for schedule rules
     schedule_ruleset.scheduleRules.each_with_index do |rule, i|
-      old_day_schedule = rule.daySchedule
-      new_day_schedule = OpenStudio::Model::ScheduleDay.new(model)
-      new_day_schedule.setName("#{new_schedule_name} Schedule Day #{i}")
-      index = 0
-      for index in 0..old_day_schedule.times.size-1
-        old_value = old_day_schedule.values[index]
-        if old_value == 0
-          new_value = 1
-        else
-          new_value = 0
-        end
-        new_day_schedule.addValue(old_day_schedule.times[index], new_value)
-      end
+      old_schedule_day = rule.daySchedule
+      new_schedule_day = OpenStudio::Model::ScheduleDay.new(model)
+      invert_schedule_day(old_schedule_day, new_schedule_day, "#{new_schedule_name} Schedule Day #{i}")
   
-      new_rule = OpenStudio::Model::ScheduleRule.new(new_schedule, new_day_schedule)
-      new_rule.setName("#{new_day_schedule.name} Rule")
+      new_rule = OpenStudio::Model::ScheduleRule.new(new_schedule, new_schedule_day)
+      new_rule.setName("#{new_schedule_day.name} Rule")
       new_rule.setApplySunday(rule.applySunday)
       new_rule.setApplyMonday(rule.applyMonday)
       new_rule.setApplyTuesday(rule.applyTuesday)

data/lib/measures/set_nist_infiltration_correlations/measure.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>set_nist_infiltration_correlations</name>
   <uid>b74a4a45-8553-4e94-860f-35b217a04879</uid>
-  <version_id>835623bd-29ab-4caa-9a94-2607823cfc60</version_id>
-  <version_modified>20230602T160044Z</version_modified>
+  <version_id>5ce0e582-73aa-4ded-b121-9b9c1b0a3b17</version_id>
+  <version_modified>2024-07-11T21:47:23Z</version_modified>
   <xml_checksum>A54BB41C</xml_checksum>
   <class_name>SetNISTInfiltrationCorrelations</class_name>
   <display_name>SetNISTInfiltrationCorrelations</display_name>
@@ -262,18 +262,24 @@
     </attribute>
   </attributes>
   <files>
+    <file>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>BFFB1AA6</checksum>
+    </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>7B4E3347</checksum>
+    </file>
     <file>
       <filename>README.md.erb</filename>
       <filetype>erb</filetype>
       <usage_type>readmeerb</usage_type>
       <checksum>F1C26127</checksum>
     </file>
-    <file>
-      <filename>Data-NISTInfiltrationCorrelations.csv</filename>
-      <filetype>csv</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>FC1FA7E1</checksum>
-    </file>
     <file>
       <filename>Data-NISTInfiltrationCorrelations.xlsx</filename>
       <filetype>xlsx</filetype>
@@ -286,6 +292,23 @@
       <usage_type>doc</usage_type>
       <checksum>0B901E1A</checksum>
     </file>
+    <file>
+      <version>
+        <software_program>OpenStudio</software_program>
+        <identifier>3.4.0</identifier>
+        <min_compatible>3.4.0</min_compatible>
+      </version>
+      <filename>measure.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>script</usage_type>
+      <checksum>AB0F28A6</checksum>
+    </file>
+    <file>
+      <filename>Data-NISTInfiltrationCorrelations.csv</filename>
+      <filetype>csv</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>FC1FA7E1</checksum>
+    </file>
     <file>
       <filename>bldg0000003.osm</filename>
       <filetype>osm</filetype>
@@ -298,6 +321,12 @@
       <usage_type>test</usage_type>
       <checksum>6274AD32</checksum>
     </file>
+    <file>
+      <filename>bldg0000005.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>2174B2C9</checksum>
+    </file>
     <file>
       <filename>bldg0000025.osm</filename>
       <filetype>osm</filetype>
@@ -334,40 +363,11 @@
       <usage_type>test</usage_type>
       <checksum>761CC6B3</checksum>
     </file>
-    <file>
-      <filename>bldg0000005.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>2174B2C9</checksum>
-    </file>
-    <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>7B4E3347</checksum>
-    </file>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>BFFB1AA6</checksum>
-    </file>
     <file>
       <filename>nist_infiltration_correlations_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
       <checksum>BB86A4F3</checksum>
     </file>
-    <file>
-      <version>
-        <software_program>OpenStudio</software_program>
-        <identifier>3.4.0</identifier>
-        <min_compatible>3.4.0</min_compatible>
-      </version>
-      <filename>measure.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>script</usage_type>
-      <checksum>F5790FA9</checksum>
-    </file>
   </files>
 </measure>

data/lib/openstudio/model_articulation/version.rb

@@ -5,6 +5,6 @@
 
 module OpenStudio
   module ModelArticulation
-    VERSION = '0.8.0'
+    VERSION = '0.10.0'
   end
 end

data/openstudio-model-articulation.gemspec

@@ -26,12 +26,19 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.7.0'
+  spec.required_ruby_version = '~> 3.2.2'
 
-  spec.add_dependency 'bundler', '~> 2.1'
-  spec.add_dependency 'openstudio-extension', '~> 0.6.1'
-  spec.add_dependency 'openstudio-standards', '~> 0.4.0'
+  spec.add_dependency 'bundler', '~> 2.4.10'
+  spec.add_dependency 'openstudio-extension', '~> 0.8.0'
+  spec.add_dependency 'openstudio-standards', '0.6.1'
+
+  # if we need the following dependencies pinned, 
+  # let's set them in extension-gem for next release
+  spec.add_dependency 'multipart-post', '2.4.0'
+  spec.add_dependency 'regexp_parser', '2.9.0'
+  spec.add_dependency 'addressable', '2.8.1'
 
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'
+  spec.add_development_dependency 'octokit', '4.18.0' # for change logs
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-model-articulation
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - David Goldwasser
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2024-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.4.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.4.10
 - !ruby/object:Gem::Dependency
   name: openstudio-extension
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: openstudio-standards
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: regexp_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.18.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.18.0
 description: Library and measures for OpenStudio Model Articulation
 email:
 - david.goldwasser@nrel.gov
@@ -191,8 +247,6 @@ files:
 - lib/measures/SimplifyGeometryToSlicedBar/measure.rb
 - lib/measures/SimplifyGeometryToSlicedBar/measure.xml
 - lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_cofee.rb
-- lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_geometry.rb
-- lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_helper_methods.rb
 - lib/measures/SpaceTypeAndConstructionSetWizard/LICENSE.md
 - lib/measures/SpaceTypeAndConstructionSetWizard/README.md
 - lib/measures/SpaceTypeAndConstructionSetWizard/README.md.erb
@@ -368,7 +422,6 @@ files:
 - lib/measures/create_typical_building_from_model/README.md.erb
 - lib/measures/create_typical_building_from_model/measure.rb
 - lib/measures/create_typical_building_from_model/measure.xml
-- lib/measures/create_typical_building_from_model/resources/Model.hvac.rb
 - lib/measures/create_typical_deer_building_from_model/LICENSE.md
 - lib/measures/create_typical_deer_building_from_model/README.md
 - lib/measures/create_typical_deer_building_from_model/README.md.erb
@@ -446,7 +499,7 @@ licenses: []
 metadata:
   bug_tracker_uri: https://github.com/NREL/openstudio-model-articulation-gem/issues
   changelog_uri: https://github.com/NREL/openstudio-model-articulation-gem/blob/develop/CHANGELOG.md
-  source_code_uri: https://github.com/NREL/openstudio-model-articulation-gem/tree/v0.8.0
+  source_code_uri: https://github.com/NREL/openstudio-model-articulation-gem/tree/v0.10.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -455,14 +508,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Library and measures for OpenStudio Model Articulation