urbanopt-scenario 0.4.4 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +6 -0
  3. data/Gemfile +8 -12
  4. data/docs/package-lock.json +3 -3
  5. data/docs/package.json +1 -1
  6. data/lib/urbanopt/scenario/scenario_post_processor_default.rb +0 -2
  7. data/lib/urbanopt/scenario/scenario_post_processor_opendss.rb +0 -1
  8. data/lib/urbanopt/scenario/scenario_visualization.rb +1 -2
  9. data/lib/urbanopt/scenario/version.rb +1 -1
  10. data/urbanopt-scenario-gem.gemspec +14 -7
  11. metadata +39 -25
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4fb5d83f92069dd7961985923bf74b8efd932bc734cdc98d92b4cde8d92eefe1
4
- data.tar.gz: 8f6e9c44797b8c50699e7bf3ba8b008f6106c53639119687f3703ab7a3d9fdc6
3
+ metadata.gz: ce993cb2d0b84e9bdd3752f756f30ab4f7f76f1c1d131f22676bc7eff10e0c21
4
+ data.tar.gz: ed13f7ee0040f66731c329de9ffaaf14be1785cc0090df3dfd1f60d5e6a8bb28
5
5
  SHA512:
6
- metadata.gz: 6a7440b439fefc1278d2f33f9c3d1f9c3d15fc15dfc558400c7bda8b17657edc90e2081a52d9e5e4011483ee833f797038392ee4ddf363446c28e309f3045af6
7
- data.tar.gz: d5802f5f10fc3f46e96fa8df5aa94dc92c43ff0ad2b20e0e2c9b81ada78fcd3304ef1886bff820e0a1b0ce4c8cf00915b0cfab0449e0f274ee523c3d90d9d18d
6
+ metadata.gz: ea718d11c526798859af76a456c81e5bf91389a25fed90d48fde41ec16cae81799533c333abf9334c27f77f38a2d393224ab9780a67b642e4c3bc92f7e6e91f8
7
+ data.tar.gz: a498be996e7a602c7c011894cadb68544a327f28a7fd6bd46a7c38de91759c4a246228b858b7b097620eeb5fcdcd052462d6bff28c5fad1d9ee981f60e18c551
data/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # URBANopt Scenario Gem
2
2
 
3
+ ## Version 0.5.0
4
+ Date Range: 11/17/20 - 12/09/20
5
+
6
+ - Fixed [#177]( https://github.com/urbanopt/urbanopt-scenario-gem/issues/177 ), Fix bug in the method that saves the CSV report
7
+ - Fixed [#188]( https://github.com/urbanopt/urbanopt-scenario-gem/issues/188 ), support OpenStudio 3.1.0
8
+
3
9
  ## Version 0.4.4
4
10
  Date Range: 11/13/20 - 11/16/20
5
11
 
data/Gemfile CHANGED
@@ -20,10 +20,16 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
20
20
  # gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
21
21
  # end
22
22
 
23
+ # if allow_local && File.exist?('../urbanopt-core-gem')
24
+ # gem 'urbanopt-core', path: '../urbanopt-core-gem'
25
+ # elsif allow_local
26
+ # gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop'
27
+ # end
28
+
23
29
  # if allow_local && File.exist?('../openstudio-common-measures-gem')
24
30
  # gem 'openstudio-common-measures', path: '../openstudio-common-measures-gem'
25
31
  # elsif allow_local
26
- # gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
32
+ # gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
27
33
  # end
28
34
 
29
35
  # if allow_local && File.exist?('../openstudio-model-articulation-gem')
@@ -32,24 +38,14 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
32
38
  # gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop'
33
39
  # end
34
40
 
35
- # if allow_local && File.exist?('../urbanopt-core-gem')
36
- # gem 'urbanopt-core', path: '../urbanopt-core-gem'
37
- # elsif allow_local
38
- # gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop'
39
- # else
40
- # gem 'urbanopt-core', '~>0.4.0'
41
- # end
42
-
43
41
  # if allow_local && File.exist?('../urbanopt-reporting-gem')
44
42
  # gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
45
43
  # elsif allow_local
46
44
  # gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
47
- # else
48
- # gem 'urbanopt-reporting', '~> 0.2.1'
49
45
  # end
50
46
 
51
47
  # if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
52
48
  # gem 'openstudio-load-flexibility-measures', path: '../openstudio-load-flexibility-measures-gem'
53
49
  # elseif allow_local
54
- # gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'master'
50
+ # gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'develop'
55
51
  # end
data/docs/package-lock.json CHANGED
@@ -4801,9 +4801,9 @@
4801
4801
  "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
4802
4802
  },
4803
4803
  "highlight.js": {
4804
- "version": "10.2.1",
4805
- "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.2.1.tgz",
4806
- "integrity": "sha512-A+sckVPIb9zQTUydC9lpRX1qRFO/N0OKEh0NwIr65ckvWA/oMY8v9P3+kGRK3w2ULSh9E8v5MszXafodQ6039g=="
4804
+ "version": "10.4.1",
4805
+ "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz",
4806
+ "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg=="
4807
4807
  },
4808
4808
  "hmac-drbg": {
4809
4809
  "version": "1.0.1",
data/docs/package.json CHANGED
@@ -10,7 +10,7 @@
10
10
  },
11
11
  "author": "NREL",
12
12
  "dependencies": {
13
- "highlight.js": "^10.2.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.6.0",
data/lib/urbanopt/scenario/scenario_post_processor_default.rb CHANGED
@@ -32,8 +32,6 @@ require 'urbanopt/scenario/scenario_post_processor_base'
32
32
  require 'urbanopt/reporting/default_reports'
33
33
 
34
34
  require 'csv'
35
- require 'json'
36
- require 'fileutils'
37
35
  require 'sqlite3'
38
36
 
39
37
  module URBANopt
data/lib/urbanopt/scenario/scenario_post_processor_opendss.rb CHANGED
@@ -34,7 +34,6 @@ require 'urbanopt/reporting/default_reports'
34
34
  require 'csv'
35
35
  require 'json'
36
36
  require 'fileutils'
37
- require 'pathname'
38
37
 
39
38
  module URBANopt
40
39
  module Scenario
data/lib/urbanopt/scenario/scenario_visualization.rb CHANGED
@@ -31,7 +31,6 @@
31
31
  require 'csv'
32
32
  require 'date'
33
33
  require 'json'
34
- require 'fileutils'
35
34
 
36
35
  module URBANopt
37
36
  module Scenario
@@ -187,7 +186,7 @@ module URBANopt
187
186
 
188
187
  # sum up monthly values for annual aggregate
189
188
  annual_sum = monthly_sum_jan + monthly_sum_feb + monthly_sum_mar + monthly_sum_apr + monthly_sum_may + monthly_sum_jun + monthly_sum_jul + monthly_sum_aug + monthly_sum_sep + monthly_sum_oct + monthly_sum_nov + monthly_sum_dec
190
-
189
+
191
190
  # store headers as key and monthly sums as values for each header
192
191
  monthly_totals[headers_unitless[j]] = [monthly_sum_jan, monthly_sum_feb, monthly_sum_mar, monthly_sum_apr, monthly_sum_may, monthly_sum_jun, monthly_sum_jul, monthly_sum_aug, monthly_sum_sep, monthly_sum_oct, monthly_sum_nov, monthly_sum_dec]
193
192
 
data/lib/urbanopt/scenario/version.rb CHANGED
@@ -30,6 +30,6 @@
30
30
 
31
31
  module URBANopt
32
32
  module Scenario
33
- VERSION = '0.4.4'.freeze
33
+ VERSION = '0.5.0'.freeze
34
34
  end
35
35
  end
data/urbanopt-scenario-gem.gemspec CHANGED
@@ -1,4 +1,3 @@
1
-
2
1
  lib = File.expand_path('lib', __dir__)
3
2
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
3
  require 'urbanopt/scenario/version'
@@ -30,11 +29,19 @@ Gem::Specification.new do |spec|
30
29
 
31
30
  spec.add_runtime_dependency 'json-schema', '~> 2.8'
32
31
  spec.add_runtime_dependency 'json_pure', '~> 2.3'
33
- spec.add_runtime_dependency 'openstudio-common-measures', '0.2.0'
34
- spec.add_runtime_dependency 'openstudio-extension', '~> 0.2.5'
35
- spec.add_runtime_dependency 'openstudio-load-flexibility-measures', '~> 0.1.3'
36
- spec.add_runtime_dependency 'openstudio-model-articulation', '0.2.0'
32
+
37
33
  spec.add_runtime_dependency 'sqlite3', '1.4.2'
38
- spec.add_runtime_dependency 'urbanopt-core', '~> 0.4.0'
39
- spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.2.1'
34
+ spec.add_runtime_dependency 'urbanopt-core', '~> 0.5.1'
35
+ spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.3.2'
36
+
37
+ # extension gem is included in urbanopt-core so we shouldn't need to explicitly require it here
38
+ # spec.add_runtime_dependency 'openstudio-extension', '~> 0.3.1'
39
+
40
+ # need to include all measure gems listed in mappers in project gemfiles
41
+ # scenario_csv loads the mappers and need access to the extension gems when they are added to a mapper
42
+ spec.add_runtime_dependency 'openstudio-calibration', '~> 0.3.1'
43
+ spec.add_runtime_dependency 'openstudio-common-measures', '~> 0.3.2'
44
+ spec.add_runtime_dependency 'openstudio-ee', '~> 0.3.2'
45
+ spec.add_runtime_dependency 'openstudio-load-flexibility-measures', '~> 0.2.1'
46
+ spec.add_runtime_dependency 'openstudio-model-articulation', '~> 0.3.1'
40
47
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: urbanopt-scenario
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.4
4
+ version: 0.5.0
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-11-17 00:00:00.000000000 Z
12
+ date: 2020-12-11 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -82,91 +82,91 @@ dependencies:
82
82
  - !ruby/object:Gem::Version
83
83
  version: '2.3'
84
84
  - !ruby/object:Gem::Dependency
85
- name: openstudio-common-measures
85
+ name: sqlite3
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
88
  - - '='
89
89
  - !ruby/object:Gem::Version
90
- version: 0.2.0
90
+ version: 1.4.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.2.0
97
+ version: 1.4.2
98
98
  - !ruby/object:Gem::Dependency
99
- name: openstudio-extension
99
+ name: urbanopt-core
100
100
  requirement: !ruby/object:Gem::Requirement
101
101
  requirements:
102
102
  - - "~>"
103
103
  - !ruby/object:Gem::Version
104
- version: 0.2.5
104
+ version: 0.5.1
105
105
  type: :runtime
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
109
  - - "~>"
110
110
  - !ruby/object:Gem::Version
111
- version: 0.2.5
111
+ version: 0.5.1
112
112
  - !ruby/object:Gem::Dependency
113
- name: openstudio-load-flexibility-measures
113
+ name: urbanopt-reporting
114
114
  requirement: !ruby/object:Gem::Requirement
115
115
  requirements:
116
116
  - - "~>"
117
117
  - !ruby/object:Gem::Version
118
- version: 0.1.3
118
+ version: 0.3.2
119
119
  type: :runtime
120
120
  prerelease: false
121
121
  version_requirements: !ruby/object:Gem::Requirement
122
122
  requirements:
123
123
  - - "~>"
124
124
  - !ruby/object:Gem::Version
125
- version: 0.1.3
125
+ version: 0.3.2
126
126
  - !ruby/object:Gem::Dependency
127
- name: openstudio-model-articulation
127
+ name: openstudio-calibration
128
128
  requirement: !ruby/object:Gem::Requirement
129
129
  requirements:
130
- - - '='
130
+ - - "~>"
131
131
  - !ruby/object:Gem::Version
132
- version: 0.2.0
132
+ version: 0.3.1
133
133
  type: :runtime
134
134
  prerelease: false
135
135
  version_requirements: !ruby/object:Gem::Requirement
136
136
  requirements:
137
- - - '='
137
+ - - "~>"
138
138
  - !ruby/object:Gem::Version
139
- version: 0.2.0
139
+ version: 0.3.1
140
140
  - !ruby/object:Gem::Dependency
141
- name: sqlite3
141
+ name: openstudio-common-measures
142
142
  requirement: !ruby/object:Gem::Requirement
143
143
  requirements:
144
- - - '='
144
+ - - "~>"
145
145
  - !ruby/object:Gem::Version
146
- version: 1.4.2
146
+ version: 0.3.2
147
147
  type: :runtime
148
148
  prerelease: false
149
149
  version_requirements: !ruby/object:Gem::Requirement
150
150
  requirements:
151
- - - '='
151
+ - - "~>"
152
152
  - !ruby/object:Gem::Version
153
- version: 1.4.2
153
+ version: 0.3.2
154
154
  - !ruby/object:Gem::Dependency
155
- name: urbanopt-core
155
+ name: openstudio-ee
156
156
  requirement: !ruby/object:Gem::Requirement
157
157
  requirements:
158
158
  - - "~>"
159
159
  - !ruby/object:Gem::Version
160
- version: 0.4.0
160
+ version: 0.3.2
161
161
  type: :runtime
162
162
  prerelease: false
163
163
  version_requirements: !ruby/object:Gem::Requirement
164
164
  requirements:
165
165
  - - "~>"
166
166
  - !ruby/object:Gem::Version
167
- version: 0.4.0
167
+ version: 0.3.2
168
168
  - !ruby/object:Gem::Dependency
169
- name: urbanopt-reporting
169
+ name: openstudio-load-flexibility-measures
170
170
  requirement: !ruby/object:Gem::Requirement
171
171
  requirements:
172
172
  - - "~>"
@@ -179,6 +179,20 @@ dependencies:
179
179
  - - "~>"
180
180
  - !ruby/object:Gem::Version
181
181
  version: 0.2.1
182
+ - !ruby/object:Gem::Dependency
183
+ name: openstudio-model-articulation
184
+ requirement: !ruby/object:Gem::Requirement
185
+ requirements:
186
+ - - "~>"
187
+ - !ruby/object:Gem::Version
188
+ version: 0.3.1
189
+ type: :runtime
190
+ prerelease: false
191
+ version_requirements: !ruby/object:Gem::Requirement
192
+ requirements:
193
+ - - "~>"
194
+ - !ruby/object:Gem::Version
195
+ version: 0.3.1
182
196
  description: Library to export data point OSW files from URBANopt Scenario CSV
183
197
  email:
184
198
  - rawad.elkontar@nrel.gov