urbanopt-reporting 0.3.1 → 0.3.2

This diff has not been reviewed by any users.
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 29081aa7029141d2d9a0a8c5377cf2032933c84e2e9025636184c1cbc345c661
4
- data.tar.gz: 9a77ed54a8bf0a65e713cd0693e6eb1a3b0b6f26773c57ff2e234ac97d34ab4f
3
+ metadata.gz: 0adaa330d8958566edae263cedfd8a1bdee84769c881b98b86481ec4b0ee8bd5
4
+ data.tar.gz: ceb2145a16413bd4885a1ef81fc9e534d8ed96e49ba19aaff47980dfeaa4838a
5
5
  SHA512:
6
- metadata.gz: d8363915252d917051b1c7ed04001e8ec02e8087eb3ff8cfbc36dc6c7f1a10b9925e66e7a361a219ed76317e45f90fa2f857b7d8baadea243ce8913e62293d59
7
- data.tar.gz: 7275975a372494f5ec09ea29da191902c200aa449aab5f86cd04ab1487f0231c87a226f797e9003de6854f63c477b9c60336a344fb5eb43790760e035688055a
6
+ metadata.gz: d8b2234582c11610f1ad932566bc60e8006930b6038dc619d307955739b21b63b3493488fea25cb2c66d3bb8c70433aebdacd66739920c944d08f53052ac105c
7
+ data.tar.gz: 5be211005727f24581d0a2e2540db99b1aff5ac1003bdbaf61fafd0b6c4bbfbb2b293408afaac7cb45aa4f757cb153fb2c4aa420ca7bbcbc3e2e5ee40c1f5b3d
@@ -1,5 +1,13 @@
1
1
  # URBANopt Reporting Gem
2
2
 
3
+ ## Version 0.3.2
4
+
5
+ Date Range: 12/07/20 - 12/08/20
6
+
7
+ - Fixed [#27]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/27 ), reporting measure fails when there are no additional fuels in the model
8
+ - Fixed [#29]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/29 ), restore save_feature_report function for backward compatibility
9
+ - Fixed [#32]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/32 ), bump extension-gem dependency
10
+
3
11
  ## Version 0.3.1
4
12
 
5
13
  Date Range: 11/26/2020 - 12/07/2020
@@ -11,7 +19,7 @@ Date Range: 11/26/2020 - 12/07/2020
11
19
  ## Version 0.3.0
12
20
 
13
21
  Date Range: 11/12/2020 - 11/25/2020
14
-
22
+
15
23
  - Updating dependencies to support OpenStudio 3.1.0
16
24
 
17
25
  ## Version 0.2.1
@@ -43,4 +51,4 @@ Date Range: 08/27/2020 - 09/21/2020
43
51
 
44
52
  08/17/2020
45
53
 
46
- Initial release of the urbanopt-reporting gem.
54
+ Initial release of the urbanopt-reporting gem.
@@ -4814,9 +4814,9 @@
4814
4814
  "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
4815
4815
  },
4816
4816
  "highlight.js": {
4817
- "version": "10.3.1",
4818
- "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.1.tgz",
4819
- "integrity": "sha512-jeW8rdPdhshYKObedYg5XGbpVgb1/DT4AHvDFXhkU7UnGSIjy9kkJ7zHG7qplhFHMitTSzh5/iClKQk3Kb2RFQ=="
4817
+ "version": "10.4.1",
4818
+ "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz",
4819
+ "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg=="
4820
4820
  },
4821
4821
  "hmac-drbg": {
4822
4822
  "version": "1.0.1",
@@ -10,7 +10,7 @@
10
10
  },
11
11
  "author": "NREL",
12
12
  "dependencies": {
13
- "highlight.js": "^10.3.1",
13
+ "highlight.js": "^10.4.1",
14
14
  "json-schema-ref-parser": "^9.0.6",
15
15
  "json-schema-view-js": "git+https://git@github.com/bgschiller/json-schema-view-js.git",
16
16
  "vuepress": "^1.7.1",
@@ -165,9 +165,9 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
165
165
 
166
166
  # Request the output for each end use/fuel type combination
167
167
  end_uses.each do |end_use|
168
- end_use, _ = end_use
168
+ end_use, = end_use
169
169
  fuel_types.each do |fuel_type|
170
- fuel_type, _ = fuel_type
170
+ fuel_type, = fuel_type
171
171
  variable_name = if end_use == 'Facility'
172
172
  "#{fuel_type}:#{end_use}"
173
173
  else
@@ -178,17 +178,17 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
178
178
  end
179
179
 
180
180
  # OtherFuels
181
- other_fuels = ["FuelOil#1", "Diesel", "Gasoline", "Coal", "Steam"]
182
- other_fuel_uses = ["HeatRejection", "Heating", "WaterSystems", "InteriorEquipment"]
183
- custom_meter_facility = "Meter:Custom,OtherFuels:Facility,OtherFuel1"
181
+ other_fuels = ['FuelOil#1', 'Diesel', 'Gasoline', 'Coal', 'Steam']
182
+ other_fuel_uses = ['HeatRejection', 'Heating', 'WaterSystems', 'InteriorEquipment']
183
+ custom_meter_facility = 'Meter:Custom,OtherFuels:Facility,OtherFuel1'
184
184
  other_fuel_uses.each do |end_use|
185
185
  custom_meter = "Meter:Custom,#{end_use}:OtherFuels,OtherFuel1"
186
- other_fuels.each do |other_fuel|
186
+ other_fuels.each do |other_fuel|
187
187
  result << OpenStudio::IdfObject.load("Output:Meter,#{end_use}:#{other_fuel},#{reporting_frequency};").get
188
188
  custom_meter_facility += ",,#{end_use}:#{other_fuel}"
189
189
  custom_meter += ",,#{end_use}:#{other_fuel}"
190
190
  end
191
- custom_meter += ";"
191
+ custom_meter += ';'
192
192
  result << OpenStudio::IdfObject.load(custom_meter).get
193
193
  result << OpenStudio::IdfObject.load("Output:Meter,#{end_use}:OtherFuels,#{reporting_frequency};").get
194
194
  end
@@ -698,7 +698,7 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
698
698
  sql_r -= feature_report.reporting_periods[0].end_uses.fuel_oil_kwh.send(y)
699
699
  end
700
700
  building_types.each do |i|
701
- sql_r = 0.0 if (i[:building_type].include?('Single-Family Detached') && x_u.include?('district'))
701
+ sql_r = 0.0 if i[:building_type].include?('Single-Family Detached') && x_u.include?('district')
702
702
  end
703
703
  m.send("#{y}=", sql_r)
704
704
  end
@@ -850,7 +850,7 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
850
850
  puts " *********timeseries_name = #{timeseries_name}******************"
851
851
  runner.registerInfo("TIMESERIES: #{timeseries_name}")
852
852
 
853
- # get all the key values that this timeseries can be reported for (e.g. if PMV is requested for each zone)
853
+ # get all the key values that this timeseries can be reported for (e.g. if PMV is requested for each zone)
854
854
  if timeseries_name.include?('OtherFuels')
855
855
  key_values = sql_file.availableKeyValues('RUN PERIOD 1', 'Zone Timestep', timeseries_name.upcase)
856
856
  else
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>default_feature_reports</name>
5
5
  <uid>9ee3135a-8070-4408-bfa1-b75fecf9dd4f</uid>
6
- <version_id>f9af7bd8-e9ce-41b4-b892-df29f235a9bd</version_id>
7
- <version_modified>20201201T173130Z</version_modified>
6
+ <version_id>d4f5b2e2-f93d-4ce2-9c68-ed29714fdc0c</version_id>
7
+ <version_modified>20201208T230102Z</version_modified>
8
8
  <xml_checksum>FB304155</xml_checksum>
9
9
  <class_name>DefaultFeatureReports</class_name>
10
10
  <display_name>DefaultFeatureReports</display_name>
@@ -153,7 +153,7 @@
153
153
  <filename>measure.rb</filename>
154
154
  <filetype>rb</filetype>
155
155
  <usage_type>script</usage_type>
156
- <checksum>B1E43E26</checksum>
156
+ <checksum>48AEB753</checksum>
157
157
  </file>
158
158
  </files>
159
159
  </measure>
@@ -223,7 +223,7 @@ module URBANopt
223
223
  return result
224
224
  end
225
225
 
226
- ##
226
+ ##
227
227
  # Calls the individual functions to save 'default_feature_report.json' and 'default_feature_report.csv'
228
228
  # For backward compatibility and ease of use
229
229
  ##
@@ -263,7 +263,6 @@ module URBANopt
263
263
  f.flush
264
264
  end
265
265
  end
266
-
267
266
  end
268
267
 
269
268
  ##
@@ -286,11 +285,10 @@ module URBANopt
286
285
  # copy the CSV report to the new feature_reports folder
287
286
  directory_folders.each do |f|
288
287
  if f.include? '_default_feature_reports'
289
- FileUtils.cp(File.join(f, 'default_feature_reports.csv'), File.join(results_dir_path, @file_name +'.csv'))
288
+ FileUtils.cp(File.join(f, 'default_feature_reports.csv'), File.join(results_dir_path, @file_name + '.csv'))
290
289
  end
291
290
  end
292
291
  end
293
-
294
292
  end
295
293
  end
296
294
  end
@@ -30,6 +30,6 @@
30
30
 
31
31
  module URBANopt
32
32
  module Reporting
33
- VERSION = '0.3.1'.freeze
33
+ VERSION = '0.3.2'.freeze
34
34
  end
35
35
  end
@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
29
29
  spec.add_development_dependency 'rspec', '~> 3.7'
30
30
  spec.add_runtime_dependency 'json-schema', '~> 2.8'
31
31
  spec.add_runtime_dependency 'json_pure', '~> 2.3'
32
- spec.add_runtime_dependency 'openstudio-extension', '~> 0.3.1'
32
+ spec.add_runtime_dependency 'openstudio-extension', '~> 0.3.2'
33
33
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: urbanopt-reporting
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.1
4
+ version: 0.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rawad El Kontar
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2020-12-07 00:00:00.000000000 Z
12
+ date: 2020-12-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -87,14 +87,14 @@ dependencies:
87
87
  requirements:
88
88
  - - "~>"
89
89
  - !ruby/object:Gem::Version
90
- version: 0.3.1
90
+ version: 0.3.2
91
91
  type: :runtime
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
95
  - - "~>"
96
96
  - !ruby/object:Gem::Version
97
- version: 0.3.1
97
+ version: 0.3.2
98
98
  description: Library include scenario default reporting measure and scenario defaults
99
99
  reports schema and classes
100
100
  email: