urbanopt-reporting 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a5d25f304c691b6de042fecc1b03cdbcda6e6cb175609532cf0926116dbce94
-  data.tar.gz: d805ec996625d83bcc9aff79f9d98edf0cc0618ec94b1c799ed8532f7ce47cf5
+  metadata.gz: 29081aa7029141d2d9a0a8c5377cf2032933c84e2e9025636184c1cbc345c661
+  data.tar.gz: 9a77ed54a8bf0a65e713cd0693e6eb1a3b0b6f26773c57ff2e234ac97d34ab4f
 SHA512:
-  metadata.gz: 5a6cc2110c6ba387e9a9fb23b1dcd9d5bcd56cd342a6448097cce382003caa79aabd2bab83360896c764d888dd41408390c350b5eb25943209c8932f22790c52
-  data.tar.gz: 0c57334221a85295fde20dae7f7ae4ad23145c6baf82d17398c32efa4fc80acf71d5b2c6eb806780d67eba137a98e653a9e930cf5d4fb27ffd8f8bad40a5435f
+  metadata.gz: d8363915252d917051b1c7ed04001e8ec02e8087eb3ff8cfbc36dc6c7f1a10b9925e66e7a361a219ed76317e45f90fa2f857b7d8baadea243ce8913e62293d59
+  data.tar.gz: 7275975a372494f5ec09ea29da191902c200aa449aab5f86cd04ab1487f0231c87a226f797e9003de6854f63c477b9c60336a344fb5eb43790760e035688055a

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # URBANopt Reporting Gem
 
+## Version 0.3.1
+
+Date Range: 11/26/2020 - 12/07/2020
+
+- Fixed [#19]( https://github.com/urbanopt/urbanopt-reporting-gem/pull/19 ), check for nil values to avoid crashing unit conversion
+- Fixed [#24]( https://github.com/urbanopt/urbanopt-reporting-gem/pull/24 ), Support reporting of other fuels
+- Fixed [#28]( https://github.com/urbanopt/urbanopt-reporting-gem/pull/28 ), fix for other_fuels being nil and restore save_feature_report function
+
 ## Version 0.3.0
 
 Date Range: 11/12/2020 - 11/25/2020

data/lib/measures/default_feature_reports/measure.rb

@@ -609,7 +609,9 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
 
     # other_fuels
     additional_fuel = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='Additional Fuel'")
-    feature_report.reporting_periods[0].other_fuels_kwh = convert_units(additional_fuel, 'GJ', 'kWh')
+    # ensure additional fuel is not nil
+    feature_report.reporting_periods[0].other_fuels_kwh = 0.0
+    feature_report.reporting_periods[0].other_fuels_kwh = convert_units(additional_fuel, 'GJ', 'kWh') unless additional_fuel.nil?
     feature_report.reporting_periods[0].other_fuels_kwh -= feature_report.reporting_periods[0].propane_kwh
     feature_report.reporting_periods[0].other_fuels_kwh -= feature_report.reporting_periods[0].fuel_oil_kwh
 
@@ -686,6 +688,10 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
         m = feature_report.reporting_periods[0].end_uses.send(x_u)
 
         y = eu.tr(' ', '_').downcase
+        # ensure not nil so the equations below don't error out
+        if sql_r.nil?
+          sql_r = 0.0
+        end
         sql_r = convert_units(sql_r, 'GJ', 'kWh')
         if x_u == 'other_fuels_kwh'
           sql_r -= feature_report.reporting_periods[0].end_uses.propane_kwh.send(y)

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

@@ -223,6 +223,17 @@ 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
+        ##
+        # [parameters]:
+        # +file_name+ - _String_ - Assign a name to the saved feature report file without an extension
+        def save_feature_report(file_name = 'default_feature_report')
+          save_json_report(file_name)
+          save_csv_report(file_name)
+        end
+
         ##
         # Saves the 'default_feature_report.json' file to the results directory
         ##
@@ -279,9 +290,7 @@ module URBANopt
             end
           end
         end
-
-
-
+        
       end
     end
   end

data/lib/urbanopt/reporting/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-reporting
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Rawad El Kontar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler