openstudio-geb 0.4.0 → 0.6.0

data/lib/openstudio/geb/run.rb

@@ -74,6 +74,8 @@ module OpenStudio
       def apply_measures(osw_result_folder)
         # create osw_file
         osw_path = File.join(osw_result_folder, "geb.osw")
+        # get the folder of measures
+        measures_path = File.expand_path("../../../measures/", __FILE__ )
 
         steps = []
         # measure_dict: hash of measures and their arguments => {measure_name: arguments}
@@ -82,7 +84,8 @@ module OpenStudio
         report_measures = {}
         @measure_dict.each_pair do |m_name, para_dict|
           # get all EnergyPlus and Reporting measures out and remove original ones
-          File.open("#{para_dict['measure_dir_name']}/measure.rb", 'r') do |file|
+          # now measure_dir_name uses folder name rather than absolute path, adding "measure_paths" to the osw file
+          File.open("#{measures_path}/#{para_dict['measure_dir_name']}/measure.rb", 'r') do |file|
             file.each_line do |line|
               if line =~ /class.+EnergyPlusMeasure/
                 energyplus_measures[m_name] = @measure_dict[m_name]
@@ -119,6 +122,7 @@ module OpenStudio
         end
 
         osw = {}
+        osw["measure_paths"] = [measures_path]
         osw["weather_file"] = @weather_file_path
         osw["seed_file"] = @baseline_dir_str
         osw["steps"] = steps

data/lib/openstudio/geb/utilities.rb

@@ -52,7 +52,8 @@ def list_all_geb_measures
   measures.each do |measure|
     measure_name = measure.split('/')[-2]
     measure_list[measure_name] = {}
-    measure_list[measure_name]['measure_dir_name'] = File.dirname(measure)
+    # now measure_dir_name uses folder name rather than absolute path, adding "measure_paths" to the osw file
+    measure_list[measure_name]['measure_dir_name'] = File.basename(File.dirname(measure))  # get just this folder name
   end
 
 =begin
@@ -114,7 +115,7 @@ end
 def postprocess_out_osw(outdir)
 
   out_osw = File.join(outdir, 'out.osw')
-  raise "Cannot find file #{out_osw}" if !File.exists?(out_osw)
+  raise "Cannot find file #{out_osw}" if !File.exist?(out_osw)
 
   result_osw = nil
   File.open(out_osw, 'r') do |f|

data/lib/openstudio/geb/version.rb

@@ -5,6 +5,6 @@
 
 module OpenStudio
   module Geb
-    VERSION = '0.4.0'.freeze
+    VERSION = '0.6.0'.freeze
   end
 end

data/openstudio-geb.gemspec

@@ -22,11 +22,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2.1'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '3.7.0'
-  spec.add_development_dependency 'rubocop', '~> 1.15.0'
+  spec.required_ruby_version = '3.2.2'
+
+  spec.add_dependency 'openstudio-extension', '~> 0.8.3'
+  spec.add_dependency 'openstudio-standards', '~> 0.7.1'
+  spec.add_dependency 'simplecov', '0.22.0'
+
+  spec.add_development_dependency 'rspec', '~> 3.9'
 
-  spec.add_dependency 'openstudio-extension', '~> 0.7.0'
-  spec.add_dependency 'openstudio-standards', '~> 0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-geb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Kaiyu Sun
@@ -9,92 +9,64 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-15 00:00:00.000000000 Z
+date: 2025-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: openstudio-extension
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
+        version: 0.8.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: openstudio-standards
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
+        version: 0.7.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
-  type: :development
+        version: 0.22.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
-- !ruby/object:Gem::Dependency
-  name: openstudio-extension
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: openstudio-standards
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '3.9'
 description: This is a Ruby gem that implemented a series of OpenStudio measures for
   grid-interactive efficient buildings as well as a measure for reporting and visualization.
 email:
@@ -115,6 +87,9 @@ files:
 - doc_templates/copyright_js.txt
 - doc_templates/copyright_ruby.txt
 - files/8760.csv
+- files/seasonal_shedding_peak_hours.json
+- files/seasonal_shifting_peak_hours.json
+- files/seasonal_shifting_take_hours.json
 - lib/measures/Add Output Variable/LICENSE.md
 - lib/measures/Add Output Variable/README.md
 - lib/measures/Add Output Variable/README.md.erb
@@ -127,6 +102,7 @@ files:
 - lib/measures/AddElectricVehicleChargingLoad/docs/.gitkeep
 - lib/measures/AddElectricVehicleChargingLoad/measure.rb
 - lib/measures/AddElectricVehicleChargingLoad/measure.xml
+- lib/measures/AddElectricVehicleChargingLoad/tests/CZ06RV2.epw
 - lib/measures/AddElectricVehicleChargingLoad/tests/add_electric_vehicle_charging_load_test.rb
 - lib/measures/AddElectricVehicleChargingLoad/tests/example_model.osm
 - lib/measures/AddElectricVehicleChargingLoad/tests/test.osm
@@ -353,16 +329,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '='
     - !ruby/object:Gem::Version
-      version: '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.0.9
 signing_key:
 specification_version: 4
 summary: OpenStudio measures for grid-interactive efficient buildings