openstudio-geb 0.0.1 → 0.0.3r

data/lib/measures/reduce_epd_by_percentage_for_peak_hours/measure.rb

@@ -51,14 +51,14 @@ class ReduceEPDByPercentageForPeakHours < OpenStudio::Measure::ModelMeasure
     start_date1 = OpenStudio::Ruleset::OSArgument.makeStringArgument('start_date1', false)
     start_date1.setDisplayName('First start date for the Reduction')
     start_date1.setDescription('In MM-DD format')
-    start_date1.setDefaultValue('03-01')
+    start_date1.setDefaultValue('07-01')
     args << start_date1
 
     # make an argument for the end date of the reduction
     end_date1 = OpenStudio::Ruleset::OSArgument.makeStringArgument('end_date1', false)
     end_date1.setDisplayName('First end date for the Reduction')
     end_date1.setDescription('In MM-DD format')
-    end_date1.setDefaultValue('05-01')
+    end_date1.setDefaultValue('08-31')
     args << end_date1
 
 
@@ -71,21 +71,21 @@ class ReduceEPDByPercentageForPeakHours < OpenStudio::Measure::ModelMeasure
 
     # make an argument for the second end date of the reduction
     end_date2 = OpenStudio::Ruleset::OSArgument.makeStringArgument('end_date2', false)
-    end_date2.setDisplayName('Second end date for the Reduction')
+    end_date2.setDisplayName('Second end date for the Reduction (optional)')
     end_date2.setDescription('Specify a date in MM-DD format if you want a second period of reduction; leave blank if not needed. If either the start or end date is blank, the period is considered not used.')
     end_date2.setDefaultValue('')
     args << end_date2
 
     # make an argument for the third start date of the reduction
     start_date3 = OpenStudio::Ruleset::OSArgument.makeStringArgument('start_date3', false)
-    start_date3.setDisplayName('Second start date for the Reduction (optional)')
+    start_date3.setDisplayName('Third start date for the Reduction (optional)')
     start_date3.setDescription('Specify a date in MM-DD format if you want a third period of reduction; leave blank if not needed.')
     start_date3.setDefaultValue('')
     args << start_date3
 
     # make an argument for the third end date of the reduction
     end_date3 = OpenStudio::Ruleset::OSArgument.makeStringArgument('end_date3', false)
-    end_date3.setDisplayName('Second end date for the Reduction')
+    end_date3.setDisplayName('Third end date for the Reduction')
     end_date3.setDescription('Specify a date in MM-DD format if you want a third period of reduction; leave blank if not needed. If either the start or end date is blank, the period is considered not used.')
     end_date3.setDefaultValue('')
     args << end_date3
@@ -333,110 +333,109 @@ class ReduceEPDByPercentageForPeakHours < OpenStudio::Measure::ModelMeasure
         if equip_schedules.key?(equip_sch.get.name.to_s)
           new_equip_sch = equip_schedules[equip_sch.get.name.to_s]
         else
-          new_equip_sch = equip_sch.get.clone(model)
-          new_equip_sch = new_equip_sch.to_Schedule.get
-          new_equip_sch.setName("#{equip_sch.get.name.to_s} adjusted #{epd_factor}")
-          # add to the hash
-          equip_schedules[equip_sch.get.name.to_s] = new_equip_sch
+          if equip_sch.get.to_ScheduleRuleset.empty?
+            runner.registerWarning("Schedule #{equip_sch.get.name} isn't a ScheduleRuleset object and won't be altered by this measure.")
+            next
+          else
+            new_equip_sch = equip_sch.get.clone(model)
+            new_equip_sch = new_equip_sch.to_Schedule.get
+            new_equip_sch.setName("#{equip_sch.get.name.to_s} adjusted #{epd_factor}")
+            # add to the hash
+            equip_schedules[equip_sch.get.name.to_s] = new_equip_sch
+          end
         end
         equip.setSchedule(new_equip_sch)
+        runner.registerInfo("Schedule #{equip_sch.get.name} of electric equipment #{equip.name} will be altered by this measure.")
       end
     end
 
     equip_schedules.each do |old_name, equip_sch|
-      if equip_sch.to_ScheduleRuleset.empty?
-        runner.registerWarning("Schedule #{old_name} isn't a ScheduleRuleset object and won't be altered by this measure.")
-        equip_sch.remove # remove un-used cloned schedule
-      else
-        schedule_set = equip_sch.to_ScheduleRuleset.get
-        default_rule = schedule_set.defaultDaySchedule
-        rules = schedule_set.scheduleRules
-        days_covered = Array.new(7, false)
-        original_rule_number = rules.length
-        if original_rule_number > 0
-          runner.registerInfo("------------ schedule rule set #{old_name} has #{original_rule_number} rules.")
-          current_index = 0
-          # rules are in order of priority
-          rules.each do |rule|
-            runner.registerInfo("------------ Rule #{rule.ruleIndex}: #{rule.daySchedule.name.to_s}")
-            rule_period1 = rule.clone(model).to_ScheduleRule.get # OpenStudio::Model::ScheduleRule.new(schedule_set, rule.daySchedule)
-            rule_period1.setStartDate(os_start_date1)
-            rule_period1.setEndDate(os_end_date1)
-            checkDaysCovered(rule_period1, days_covered)
-            runner.registerInfo("--------------- current days of week coverage: #{days_covered}")
-
-            # set the order of the new cloned schedule rule, to make sure the modified rule has a higher priority than the original one
-            # and different copies keep the same priority as their original orders
-            unless schedule_set.setScheduleRuleIndex(rule_period1, current_index)
-              runner.registerError("Fail to set rule index for #{day_rule_period1.name.to_s}.")
-            end
-            current_index += 1
-
-            day_rule_period1 = rule_period1.daySchedule
-            day_time_vector1 = day_rule_period1.times
-            day_value_vector1 = day_rule_period1.values
-            runner.registerInfo("    ------------ time: #{day_time_vector1.map {|os_time| os_time.toString}}")
-            runner.registerInfo("    ------------ values: #{day_value_vector1}")
-            unless day_value_vector1.empty?
-              applicable = true
-            end
-            day_rule_period1.clearValues
-            day_rule_period1 = updateDaySchedule(day_rule_period1, day_time_vector1, day_value_vector1, shift_time1, shift_time2, epd_factor)
-            runner.registerInfo("    ------------ updated time: #{day_rule_period1.times.map {|os_time| os_time.toString}}")
-            runner.registerInfo("    ------------ updated values: #{day_rule_period1.values}")
-            runner.registerInfo("--------------- schedule updated for #{rule_period1.startDate.get} to #{rule_period1.endDate.get}")
-
-            if os_start_date2 and os_end_date2
-              rule_period2 = copy_sch_rule_for_period(model, rule_period1, rule_period1.daySchedule, os_start_date2, os_end_date2)
-              unless schedule_set.setScheduleRuleIndex(rule_period2, 0)
-                runner.registerError("Fail to set rule index for #{rule_period2.daySchedule.name.to_s}.")
-              end
-              current_index += 1
-              runner.registerInfo("--------------- schedule updated for #{rule_period2.startDate.get} to #{rule_period2.endDate.get}")
-            end
+      schedule_set = equip_sch.to_ScheduleRuleset.get
+      default_rule = schedule_set.defaultDaySchedule
+      rules = schedule_set.scheduleRules
+      days_covered = Array.new(7, false)
+      original_rule_number = rules.length
+      if original_rule_number > 0
+        runner.registerInfo("------------ schedule rule set #{old_name} has #{original_rule_number} rules.")
+        current_index = 0
+        # rules are in order of priority
+        rules.each do |rule|
+          runner.registerInfo("------------ Rule #{rule.ruleIndex}: #{rule.daySchedule.name.to_s}")
+          rule_period1 = rule.clone(model).to_ScheduleRule.get # OpenStudio::Model::ScheduleRule.new(schedule_set, rule.daySchedule)
+          rule_period1.setStartDate(os_start_date1)
+          rule_period1.setEndDate(os_end_date1)
+          checkDaysCovered(rule_period1, days_covered)
+          runner.registerInfo("--------------- current days of week coverage: #{days_covered}")
+
+          # set the order of the new cloned schedule rule, to make sure the modified rule has a higher priority than the original one
+          # and different copies keep the same priority as their original orders
+          unless schedule_set.setScheduleRuleIndex(rule_period1, current_index)
+            runner.registerError("Fail to set rule index for #{day_rule_period1.name.to_s}.")
+          end
+          current_index += 1
+
+          day_rule_period1 = rule_period1.daySchedule
+          day_time_vector1 = day_rule_period1.times
+          day_value_vector1 = day_rule_period1.values
+          runner.registerInfo("    ------------ time: #{day_time_vector1.map {|os_time| os_time.toString}}")
+          runner.registerInfo("    ------------ values: #{day_value_vector1}")
+          unless day_value_vector1.empty?
+            applicable = true
+          end
+          day_rule_period1.clearValues
+          day_rule_period1 = updateDaySchedule(day_rule_period1, day_time_vector1, day_value_vector1, shift_time1, shift_time2, epd_factor)
+          runner.registerInfo("    ------------ updated time: #{day_rule_period1.times.map {|os_time| os_time.toString}}")
+          runner.registerInfo("    ------------ updated values: #{day_rule_period1.values}")
+          runner.registerInfo("--------------- schedule updated for #{rule_period1.startDate.get} to #{rule_period1.endDate.get}")
 
-            if os_start_date3 and os_end_date3
-              rule_period3 = copy_sch_rule_for_period(model, rule_period1, rule_period1.daySchedule, os_start_date3, os_end_date3)
-              unless schedule_set.setScheduleRuleIndex(rule_period3, 0)
-                runner.registerError("Fail to set rule index for #{rule_period3.daySchedule.name.to_s}.")
-              end
-              current_index += 1
-              runner.registerInfo("--------------- schedule updated for #{rule_period3.startDate.get} to #{rule_period3.endDate.get}")
+          if os_start_date2 and os_end_date2
+            rule_period2 = copy_sch_rule_for_period(model, rule_period1, rule_period1.daySchedule, os_start_date2, os_end_date2)
+            unless schedule_set.setScheduleRuleIndex(rule_period2, 0)
+              runner.registerError("Fail to set rule index for #{rule_period2.daySchedule.name.to_s}.")
             end
+            current_index += 1
+            runner.registerInfo("--------------- schedule updated for #{rule_period2.startDate.get} to #{rule_period2.endDate.get}")
+          end
 
-            # The original rule will be shifted to have the currently lowest priority
-            unless schedule_set.setScheduleRuleIndex(rule, original_rule_number + current_index - 1)
-              runner.registerError("Fail to set rule index for #{rule.daySchedule.name.to_s}.")
+          if os_start_date3 and os_end_date3
+            rule_period3 = copy_sch_rule_for_period(model, rule_period1, rule_period1.daySchedule, os_start_date3, os_end_date3)
+            unless schedule_set.setScheduleRuleIndex(rule_period3, 0)
+              runner.registerError("Fail to set rule index for #{rule_period3.daySchedule.name.to_s}.")
             end
-
-          end
-        else
-          runner.registerWarning("Electric equipment schedule #{old_name} is a ScheduleRuleSet, but has no ScheduleRules associated. It won't be altered by this measure.")
-        end
-        if days_covered.include?(false)
-          new_default_rule = OpenStudio::Model::ScheduleRule.new(schedule_set)
-          new_default_rule.setStartDate(os_start_date1)
-          new_default_rule.setEndDate(os_end_date1)
-          coverMissingDays(new_default_rule, days_covered)
-          checkDaysCovered(new_default_rule, days_covered)
-
-          cloned_default_day = default_rule.clone(model)
-          cloned_default_day.setParent(new_default_rule)
-
-          new_default_day = new_default_rule.daySchedule
-          day_time_vector = new_default_day.times
-          day_value_vector = new_default_day.values
-          new_default_day.clearValues
-          new_default_day = updateDaySchedule(new_default_day, day_time_vector, day_value_vector, shift_time1, shift_time2, epd_factor)
-          if os_start_date2 and os_end_date2
-            copy_sch_rule_for_period(model, new_default_rule, new_default_day, os_start_date2, os_end_date2)
+            current_index += 1
+            runner.registerInfo("--------------- schedule updated for #{rule_period3.startDate.get} to #{rule_period3.endDate.get}")
           end
-          if os_start_date3 and os_end_date3
-            copy_sch_rule_for_period(model, new_default_rule, new_default_day, os_start_date3, os_end_date3)
+
+          # The original rule will be shifted to have the currently lowest priority
+          unless schedule_set.setScheduleRuleIndex(rule, original_rule_number + current_index - 1)
+            runner.registerError("Fail to set rule index for #{rule.daySchedule.name.to_s}.")
           end
 
         end
-
+      else
+        runner.registerWarning("Electric equipment schedule #{old_name} is a ScheduleRuleSet, but has no ScheduleRules associated. It won't be altered by this measure.")
+      end
+      if days_covered.include?(false)
+        new_default_rule = OpenStudio::Model::ScheduleRule.new(schedule_set)
+        new_default_rule.setStartDate(os_start_date1)
+        new_default_rule.setEndDate(os_end_date1)
+        coverMissingDays(new_default_rule, days_covered)
+        checkDaysCovered(new_default_rule, days_covered)
+
+        cloned_default_day = default_rule.clone(model)
+        cloned_default_day.setParent(new_default_rule)
+
+        new_default_day = new_default_rule.daySchedule
+        day_time_vector = new_default_day.times
+        day_value_vector = new_default_day.values
+        new_default_day.clearValues
+        new_default_day = updateDaySchedule(new_default_day, day_time_vector, day_value_vector, shift_time1, shift_time2, epd_factor)
+        if os_start_date2 and os_end_date2
+          copy_sch_rule_for_period(model, new_default_rule, new_default_day, os_start_date2, os_end_date2)
+        end
+        if os_start_date3 and os_end_date3
+          copy_sch_rule_for_period(model, new_default_rule, new_default_day, os_start_date3, os_end_date3)
+        end
       end
 
     end

data/lib/openstudio/geb/utilities.rb

@@ -1,4 +1,4 @@
-require 'nokogiri'
+# require 'oga'
 require 'json'
 
 # load openstudio model
@@ -25,25 +25,53 @@ def list_all_geb_measures
   measure_list = {}
 
   # get the absolute path of measures folder
-  measures_path = File.expand_path("../../../measures/", __FILE__ )
+  measures_dir = File.expand_path("../../../measures/", __FILE__ )
+
+  # use partial codes from function list_measures in OS Extension Runner to get the list of measures
+  # this is a temporary solution for the geb gem to be adopted by URBANopt workflow due to gem complexity
+  # (previously use nokogiri/oga as dependency and it didn't work in the integration process)
+  if measures_dir.nil? || measures_dir.empty?
+    puts 'Measures dir is nil or empty'
+    return true
+  end
+
+  # this is to accommodate a single measures dir (like most gems)
+  # or a repo with multiple directories fo measures (like OpenStudio-measures)
+  measures = Dir.glob(File.join(measures_dir, '**/measure.rb'))
+  if measures.empty?
+    # also try nested 2-deep to support openstudio-measures
+    measures = Dir.glob(File.join(measures_dir, '**/**/measure.rb'))
+  end
+  puts "#{measures.length} MEASURES FOUND"
+  puts measures.inspect
+  measures.each do |measure|
+    measure_name = measure.split('/')[-2]
+    measure_list[measure_name] = {}
+    measure_list[measure_name]['measure_dir_name'] = File.dirname(measure)
+  end
+
+=begin
   measure_folders_name = Dir.entries(measures_path).select {|entry| File.directory? File.join(measures_path,entry) and !(entry =='.' || entry == '..') }
   measure_folders_name.each do |measure_folder|
     # read the measure.xml file, get measure's metadata
     measure_xml = File.join(measures_path,measure_folder,'measure.xml')
-    data = File.open(measure_xml) { |f| Nokogiri::XML(f) }
+    handle = File.open(measure_xml)
+    data = Oga.parse_xml(handle)
+
     # get measure's display name
-    measure_name = data.xpath("//display_name").first.content
+    measure_name = data.xpath("//display_name").first.text
     # get measure's ruby class name
-    class_name = data.xpath("//class_name").first.content
+    class_name = data.xpath("//class_name").first.text
     # get parameter name list
     para_names = []
-    data.xpath("measure//arguments//argument//name").each{|ele| para_names << ele.content}
+    data.xpath("measure//arguments//argument//name").each{|ele| para_names << ele.text}
     measure_list[measure_name] = {}
     measure_list[measure_name]['measure_dir_name'] = File.join(measures_path, measure_folder)
     measure_list[measure_name]['class_name'] = class_name
     measure_list[measure_name]['para_names'] = para_names
     # puts JSON.pretty_generate(measure_list)
   end
+=end
 
   return measure_list
 end

data/lib/openstudio/geb/version.rb

@@ -35,6 +35,6 @@
 
 module OpenStudio
   module Geb
-    VERSION = '0.0.1'.freeze
+    VERSION = '0.0.3r'.freeze
   end
 end

data/openstudio-geb.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '3.7.0'
   spec.add_development_dependency 'rubocop', '~> 1.15.0'
-  spec.add_dependency 'nokogiri', '~>1.10'
+  # spec.add_development_dependency 'oga', '~>3.4'
 
   spec.add_dependency 'openstudio-extension', '~> 0.5.1'
   spec.add_dependency 'openstudio-standards', '~> 0.2.9'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-geb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3r
 platform: ruby
 authors:
 - Kaiyu Sun
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,20 +67,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.15.0
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: openstudio-extension
   requirement: !ruby/object:Gem::Requirement
@@ -159,108 +145,6 @@ files:
 - lib/measures/Enable Demand Controlled Ventilation/tests/EnableDemandControlledVentilation_Test.rb
 - lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
   169-2013-5A_dcv.osm
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/files/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/files/USA_NY_Buffalo.Niagara.Intl.AP.725280_TMY3.epw
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Enable Demand Controlled Ventilation/LICENSE.md
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Enable Demand Controlled Ventilation/README.md
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Enable Demand Controlled Ventilation/README.md.erb
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Enable Demand Controlled Ventilation/measure.rb
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Enable Demand Controlled Ventilation/measure.xml
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Enable Demand Controlled Ventilation/tests/0320_ModelWithHVAC_01.osm
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Enable Demand Controlled Ventilation/tests/EnableDemandControlledVentilation_Test.rb
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/LICENSE.md
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/README.md
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/README.md.erb
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/measure.rb
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/measure.xml
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/tests/EnvelopeAndLoadTestModel_01.osm
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/tests/EnvelopeAndLoadTestModel_01_Costed.osm
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/tests/HasSpaceWithNoLightsOrElec.osm
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/measures/Set Electric Equipment loads by EPD/tests/ReplaceElectricEquipmentWithEPD_Test.rb
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/out.osw
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/reports/eplustbl.html
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/data_point.zip
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/data_point_out.json
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.audit
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.bnd
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.eio
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.end
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.err
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.eso
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.mdd
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.mtd
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.rdd
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.shd
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusout.sql
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplusssz.csv
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/eplustbl.htm
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/epluszsz.csv
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/finished.job
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/in.idf
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/in.osm
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/measure_attributes.json
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/objectives.json
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/pre-preprocess.idf
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/results.json
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/run.log
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/sqlite.err
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/started.job
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/stdout-energyplus
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/run/stdout-expandobject
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/stderr
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/stdout
-- lib/measures/Enable Demand Controlled Ventilation/tests/MediumOffice-90.1-2010-ASHRAE
-  169-2013-5A_dcv/workflow.osw
 - lib/measures/GEB Metrics Report/LICENSE.md
 - lib/measures/GEB Metrics Report/README.md
 - lib/measures/GEB Metrics Report/README.md.erb
@@ -282,6 +166,7 @@ files:
 - lib/measures/add_chilled_water_storage_tank/tests/CZ06RV2.epw
 - lib/measures/add_chilled_water_storage_tank/tests/add_chilled_water_storage_tank_test.rb
 - lib/measures/add_chilled_water_storage_tank/tests/example_model.osm
+- lib/measures/add_chilled_water_storage_tank/tests/restaurant.osm
 - lib/measures/add_electrochromic_window/LICENSE.md
 - lib/measures/add_electrochromic_window/README.md
 - lib/measures/add_electrochromic_window/README.md.erb
@@ -320,14 +205,14 @@ files:
 - lib/measures/add_interior_blinds_and_control/measure.xml
 - lib/measures/add_interior_blinds_and_control/tests/add_exterior_blinds_and_control_test.rb
 - lib/measures/add_interior_blinds_and_control/tests/example_model.osm
-- lib/measures/add_rooftop_pv/LICENSE.md
-- lib/measures/add_rooftop_pv/README.md
-- lib/measures/add_rooftop_pv/README.md.erb
-- lib/measures/add_rooftop_pv/measure.rb
-- lib/measures/add_rooftop_pv/measure.xml
-- lib/measures/add_rooftop_pv/tests/CZ06RV2.epw
-- lib/measures/add_rooftop_pv/tests/add_rooftop_pv_test.rb
-- lib/measures/add_rooftop_pv/tests/pv_test_input.osm
+- lib/measures/add_rooftop_pv_simple/LICENSE.md
+- lib/measures/add_rooftop_pv_simple/README.md
+- lib/measures/add_rooftop_pv_simple/README.md.erb
+- lib/measures/add_rooftop_pv_simple/measure.rb
+- lib/measures/add_rooftop_pv_simple/measure.xml
+- lib/measures/add_rooftop_pv_simple/tests/CZ06RV2.epw
+- lib/measures/add_rooftop_pv_simple/tests/add_rooftop_pv_test.rb
+- lib/measures/add_rooftop_pv_simple/tests/pv_test_input.osm
 - lib/measures/adjust_dhw_setpoint/LICENSE.md
 - lib/measures/adjust_dhw_setpoint/README.md
 - lib/measures/adjust_dhw_setpoint/README.md.erb
@@ -345,8 +230,9 @@ files:
 - lib/measures/average_ventilation_for_peak_hours/README.md.erb
 - lib/measures/average_ventilation_for_peak_hours/measure.rb
 - lib/measures/average_ventilation_for_peak_hours/measure.xml
+- lib/measures/average_ventilation_for_peak_hours/tests/LargeOffice-90.1-2013-ASHRAE
+  169-2013-5A.osm
 - lib/measures/average_ventilation_for_peak_hours/tests/average_ventilation_for_peak_hours_test.rb
-- lib/measures/average_ventilation_for_peak_hours/tests/example_model.osm
 - lib/measures/enable_occupancy_driven_lighting/LICENSE.md
 - lib/measures/enable_occupancy_driven_lighting/README.md
 - lib/measures/enable_occupancy_driven_lighting/README.md.erb
@@ -417,9 +303,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: