urbanopt-scenario 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb5d83f92069dd7961985923bf74b8efd932bc734cdc98d92b4cde8d92eefe1
-  data.tar.gz: 8f6e9c44797b8c50699e7bf3ba8b008f6106c53639119687f3703ab7a3d9fdc6
+  metadata.gz: ce993cb2d0b84e9bdd3752f756f30ab4f7f76f1c1d131f22676bc7eff10e0c21
+  data.tar.gz: ed13f7ee0040f66731c329de9ffaaf14be1785cc0090df3dfd1f60d5e6a8bb28
 SHA512:
-  metadata.gz: 6a7440b439fefc1278d2f33f9c3d1f9c3d15fc15dfc558400c7bda8b17657edc90e2081a52d9e5e4011483ee833f797038392ee4ddf363446c28e309f3045af6
-  data.tar.gz: d5802f5f10fc3f46e96fa8df5aa94dc92c43ff0ad2b20e0e2c9b81ada78fcd3304ef1886bff820e0a1b0ce4c8cf00915b0cfab0449e0f274ee523c3d90d9d18d
+  metadata.gz: ea718d11c526798859af76a456c81e5bf91389a25fed90d48fde41ec16cae81799533c333abf9334c27f77f38a2d393224ab9780a67b642e4c3bc92f7e6e91f8
+  data.tar.gz: a498be996e7a602c7c011894cadb68544a327f28a7fd6bd46a7c38de91759c4a246228b858b7b097620eeb5fcdcd052462d6bff28c5fad1d9ee981f60e18c551

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # URBANopt Scenario Gem
 
+## Version 0.5.0
+Date Range: 11/17/20 - 12/09/20
+
+- Fixed [#177]( https://github.com/urbanopt/urbanopt-scenario-gem/issues/177 ), Fix bug in the method that saves the CSV report
+- Fixed [#188]( https://github.com/urbanopt/urbanopt-scenario-gem/issues/188 ), support OpenStudio 3.1.0
+
 ## Version 0.4.4
 Date Range: 11/13/20 - 11/16/20
 

data/Gemfile

@@ -20,10 +20,16 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 #   gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
 # end
 
+# if allow_local && File.exist?('../urbanopt-core-gem')
+#  gem 'urbanopt-core', path: '../urbanopt-core-gem'
+# elsif allow_local
+#  gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop'
+# end
+
 # if allow_local && File.exist?('../openstudio-common-measures-gem')
 #   gem 'openstudio-common-measures', path: '../openstudio-common-measures-gem'
 # elsif allow_local
-#   gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
+#    gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
 # end
 
 # if allow_local && File.exist?('../openstudio-model-articulation-gem')
@@ -32,24 +38,14 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 #   gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop'
 # end
 
-# if allow_local && File.exist?('../urbanopt-core-gem')
-#  gem 'urbanopt-core', path: '../urbanopt-core-gem'
-# elsif allow_local
-#  gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop'
-# else
-#  gem 'urbanopt-core', '~>0.4.0'
-# end
-
 # if allow_local && File.exist?('../urbanopt-reporting-gem')
 #  gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
 # elsif allow_local
 #  gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
-# else
-#  gem 'urbanopt-reporting', '~> 0.2.1'
 # end
 
 # if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
 #   gem 'openstudio-load-flexibility-measures', path: '../openstudio-load-flexibility-measures-gem'
 # elseif allow_local
-#   gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'master'
+#   gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'develop'
 # end

data/docs/package-lock.json

@@ -4801,9 +4801,9 @@
       "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
     },
     "highlight.js": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.2.1.tgz",
-      "integrity": "sha512-A+sckVPIb9zQTUydC9lpRX1qRFO/N0OKEh0NwIr65ckvWA/oMY8v9P3+kGRK3w2ULSh9E8v5MszXafodQ6039g=="
+      "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.2.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.6.0",

data/lib/urbanopt/scenario/scenario_post_processor_default.rb

@@ -32,8 +32,6 @@ require 'urbanopt/scenario/scenario_post_processor_base'
 require 'urbanopt/reporting/default_reports'
 
 require 'csv'
-require 'json'
-require 'fileutils'
 require 'sqlite3'
 
 module URBANopt

data/lib/urbanopt/scenario/scenario_post_processor_opendss.rb

@@ -34,7 +34,6 @@ require 'urbanopt/reporting/default_reports'
 require 'csv'
 require 'json'
 require 'fileutils'
-require 'pathname'
 
 module URBANopt
   module Scenario

data/lib/urbanopt/scenario/scenario_visualization.rb

@@ -31,7 +31,6 @@
 require 'csv'
 require 'date'
 require 'json'
-require 'fileutils'
 
 module URBANopt
   module Scenario
@@ -187,7 +186,7 @@ module URBANopt
 
               # sum up monthly values for annual aggregate
               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
-              
+
               # store headers as key and monthly sums as values for each header
               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]
 

data/lib/urbanopt/scenario/version.rb

@@ -30,6 +30,6 @@
 
 module URBANopt
   module Scenario
-    VERSION = '0.4.4'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

data/urbanopt-scenario-gem.gemspec

@@ -1,4 +1,3 @@
-
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'urbanopt/scenario/version'
@@ -30,11 +29,19 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'json-schema', '~> 2.8'
   spec.add_runtime_dependency 'json_pure', '~> 2.3'
-  spec.add_runtime_dependency 'openstudio-common-measures', '0.2.0'
-  spec.add_runtime_dependency 'openstudio-extension', '~> 0.2.5'
-  spec.add_runtime_dependency 'openstudio-load-flexibility-measures', '~> 0.1.3'
-  spec.add_runtime_dependency 'openstudio-model-articulation', '0.2.0'
+
   spec.add_runtime_dependency 'sqlite3', '1.4.2'
-  spec.add_runtime_dependency 'urbanopt-core', '~> 0.4.0'
-  spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.2.1'
+  spec.add_runtime_dependency 'urbanopt-core', '~> 0.5.1'
+  spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.3.2'
+
+  # extension gem is included in urbanopt-core so we shouldn't need to explicitly require it here
+  # spec.add_runtime_dependency 'openstudio-extension', '~> 0.3.1'
+
+  # need to include all measure gems listed in mappers in project gemfiles
+  # scenario_csv loads the mappers and need access to the extension gems when they are added to a mapper
+  spec.add_runtime_dependency 'openstudio-calibration', '~> 0.3.1'
+  spec.add_runtime_dependency 'openstudio-common-measures', '~> 0.3.2'
+  spec.add_runtime_dependency 'openstudio-ee', '~> 0.3.2'
+  spec.add_runtime_dependency 'openstudio-load-flexibility-measures', '~> 0.2.1'
+  spec.add_runtime_dependency 'openstudio-model-articulation', '~> 0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-scenario
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Rawad El Kontar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,91 +82,91 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: openstudio-common-measures
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
-  name: openstudio-extension
+  name: urbanopt-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: openstudio-load-flexibility-measures
+  name: urbanopt-reporting
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
-  name: openstudio-model-articulation
+  name: openstudio-calibration
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: openstudio-common-measures
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
-  name: urbanopt-core
+  name: openstudio-ee
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
-  name: urbanopt-reporting
+  name: openstudio-load-flexibility-measures
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -179,6 +179,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: openstudio-model-articulation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 description: Library to export data point OSW files from URBANopt Scenario CSV
 email:
 - rawad.elkontar@nrel.gov