urbanopt-reporting 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29081aa7029141d2d9a0a8c5377cf2032933c84e2e9025636184c1cbc345c661
-  data.tar.gz: 9a77ed54a8bf0a65e713cd0693e6eb1a3b0b6f26773c57ff2e234ac97d34ab4f
+  metadata.gz: 0adaa330d8958566edae263cedfd8a1bdee84769c881b98b86481ec4b0ee8bd5
+  data.tar.gz: ceb2145a16413bd4885a1ef81fc9e534d8ed96e49ba19aaff47980dfeaa4838a
 SHA512:
-  metadata.gz: d8363915252d917051b1c7ed04001e8ec02e8087eb3ff8cfbc36dc6c7f1a10b9925e66e7a361a219ed76317e45f90fa2f857b7d8baadea243ce8913e62293d59
-  data.tar.gz: 7275975a372494f5ec09ea29da191902c200aa449aab5f86cd04ab1487f0231c87a226f797e9003de6854f63c477b9c60336a344fb5eb43790760e035688055a
+  metadata.gz: d8b2234582c11610f1ad932566bc60e8006930b6038dc619d307955739b21b63b3493488fea25cb2c66d3bb8c70433aebdacd66739920c944d08f53052ac105c
+  data.tar.gz: 5be211005727f24581d0a2e2540db99b1aff5ac1003bdbaf61fafd0b6c4bbfbb2b293408afaac7cb45aa4f757cb153fb2c4aa420ca7bbcbc3e2e5ee40c1f5b3d

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # URBANopt Reporting Gem
 
+## Version 0.3.2
+
+Date Range: 12/07/20 - 12/08/20
+
+- Fixed [#27]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/27 ), reporting measure fails when there are no additional fuels in the model
+- Fixed [#29]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/29 ), restore save_feature_report function for backward compatibility
+- Fixed [#32]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/32 ), bump extension-gem dependency
+
 ## Version 0.3.1
 
 Date Range: 11/26/2020 - 12/07/2020
@@ -11,7 +19,7 @@ Date Range: 11/26/2020 - 12/07/2020
 ## Version 0.3.0
 
 Date Range: 11/12/2020 - 11/25/2020
- 
+
 - Updating dependencies to support OpenStudio 3.1.0
 
 ## Version 0.2.1
@@ -43,4 +51,4 @@ Date Range: 08/27/2020 - 09/21/2020
 
 08/17/2020
 
-Initial release of the urbanopt-reporting gem.
+Initial release of the urbanopt-reporting gem.

data/docs/package-lock.json

@@ -4814,9 +4814,9 @@
       "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
     },
     "highlight.js": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.1.tgz",
-      "integrity": "sha512-jeW8rdPdhshYKObedYg5XGbpVgb1/DT4AHvDFXhkU7UnGSIjy9kkJ7zHG7qplhFHMitTSzh5/iClKQk3Kb2RFQ=="
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz",
+      "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg=="
     },
     "hmac-drbg": {
       "version": "1.0.1",

data/docs/package.json

@@ -10,7 +10,7 @@
   },
   "author": "NREL",
   "dependencies": {
-    "highlight.js": "^10.3.1",
+    "highlight.js": "^10.4.1",
     "json-schema-ref-parser": "^9.0.6",
     "json-schema-view-js": "git+https://git@github.com/bgschiller/json-schema-view-js.git",
     "vuepress": "^1.7.1",

data/lib/measures/default_feature_reports/measure.rb

@@ -165,9 +165,9 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
 
     # Request the output for each end use/fuel type combination
     end_uses.each do |end_use|
-      end_use, _ = end_use
+      end_use, = end_use
       fuel_types.each do |fuel_type|
-        fuel_type, _ = fuel_type
+        fuel_type, = fuel_type
         variable_name = if end_use == 'Facility'
                           "#{fuel_type}:#{end_use}"
                         else
@@ -178,17 +178,17 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     end
 
     # OtherFuels
-    other_fuels = ["FuelOil#1", "Diesel", "Gasoline", "Coal", "Steam"]
-    other_fuel_uses = ["HeatRejection", "Heating", "WaterSystems", "InteriorEquipment"]
-    custom_meter_facility = "Meter:Custom,OtherFuels:Facility,OtherFuel1"
+    other_fuels = ['FuelOil#1', 'Diesel', 'Gasoline', 'Coal', 'Steam']
+    other_fuel_uses = ['HeatRejection', 'Heating', 'WaterSystems', 'InteriorEquipment']
+    custom_meter_facility = 'Meter:Custom,OtherFuels:Facility,OtherFuel1'
     other_fuel_uses.each do |end_use|
       custom_meter = "Meter:Custom,#{end_use}:OtherFuels,OtherFuel1"
-      other_fuels.each do |other_fuel|  
+      other_fuels.each do |other_fuel|
         result << OpenStudio::IdfObject.load("Output:Meter,#{end_use}:#{other_fuel},#{reporting_frequency};").get
         custom_meter_facility += ",,#{end_use}:#{other_fuel}"
         custom_meter += ",,#{end_use}:#{other_fuel}"
       end
-      custom_meter += ";"
+      custom_meter += ';'
       result << OpenStudio::IdfObject.load(custom_meter).get
       result << OpenStudio::IdfObject.load("Output:Meter,#{end_use}:OtherFuels,#{reporting_frequency};").get
     end
@@ -698,7 +698,7 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
           sql_r -= feature_report.reporting_periods[0].end_uses.fuel_oil_kwh.send(y)
         end
         building_types.each do |i|
-          sql_r = 0.0 if (i[:building_type].include?('Single-Family Detached') && x_u.include?('district'))
+          sql_r = 0.0 if i[:building_type].include?('Single-Family Detached') && x_u.include?('district')
         end
         m.send("#{y}=", sql_r)
       end
@@ -850,7 +850,7 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
       puts " *********timeseries_name = #{timeseries_name}******************"
       runner.registerInfo("TIMESERIES: #{timeseries_name}")
 
-      # get all the key values that this timeseries can be reported for (e.g. if PMV is requested for each zone)      
+      # get all the key values that this timeseries can be reported for (e.g. if PMV is requested for each zone)
       if timeseries_name.include?('OtherFuels')
         key_values = sql_file.availableKeyValues('RUN PERIOD 1', 'Zone Timestep', timeseries_name.upcase)
       else

data/lib/measures/default_feature_reports/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>default_feature_reports</name>
   <uid>9ee3135a-8070-4408-bfa1-b75fecf9dd4f</uid>
-  <version_id>f9af7bd8-e9ce-41b4-b892-df29f235a9bd</version_id>
-  <version_modified>20201201T173130Z</version_modified>
+  <version_id>d4f5b2e2-f93d-4ce2-9c68-ed29714fdc0c</version_id>
+  <version_modified>20201208T230102Z</version_modified>
   <xml_checksum>FB304155</xml_checksum>
   <class_name>DefaultFeatureReports</class_name>
   <display_name>DefaultFeatureReports</display_name>
@@ -153,7 +153,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>B1E43E26</checksum>
+      <checksum>48AEB753</checksum>
     </file>
   </files>
 </measure>

data/lib/urbanopt/reporting/default_reports/feature_report.rb

@@ -223,7 +223,7 @@ module URBANopt
           return result
         end
 
-        ## 
+        ##
         # Calls the individual functions to save 'default_feature_report.json' and 'default_feature_report.csv'
         # For backward compatibility and ease of use
         ##
@@ -263,7 +263,6 @@ module URBANopt
               f.flush
             end
           end
-
         end
 
         ##
@@ -286,11 +285,10 @@ module URBANopt
           # copy the CSV report to the new feature_reports folder
           directory_folders.each do |f|
             if f.include? '_default_feature_reports'
-              FileUtils.cp(File.join(f, 'default_feature_reports.csv'), File.join(results_dir_path, @file_name +'.csv'))
+              FileUtils.cp(File.join(f, 'default_feature_reports.csv'), File.join(results_dir_path, @file_name + '.csv'))
             end
           end
         end
-        
       end
     end
   end

data/lib/urbanopt/reporting/version.rb

@@ -30,6 +30,6 @@
 
 module URBANopt
   module Reporting
-    VERSION = '0.3.1'.freeze
+    VERSION = '0.3.2'.freeze
   end
 end

data/urbanopt-reporting-gem.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.7'
   spec.add_runtime_dependency 'json-schema', '~> 2.8'
   spec.add_runtime_dependency 'json_pure', '~> 2.3'
-  spec.add_runtime_dependency 'openstudio-extension', '~> 0.3.1'
+  spec.add_runtime_dependency 'openstudio-extension', '~> 0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-reporting
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Rawad El Kontar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 description: Library include scenario default reporting measure and scenario defaults
   reports schema and classes
 email: