urbanopt-scenario 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83796097a5f686acd20742f96e200bf8aad68da3b75a9be322f05c51b18943fd
-  data.tar.gz: 4339b212379a76572caa58449834c7604efd3e0d24e350ad795220735586ca2e
+  metadata.gz: f430f39b9184f46050ae315d4498fcf7290df2fab93eb83e1639121abba7491a
+  data.tar.gz: 064f4da2695d4fe81f28515dce7e68da15590d470789903ce9d6a0f925f9cfcf
 SHA512:
-  metadata.gz: 340cbd98d6aa3bfac31ca64df64783d3458430b5b04eaac54418ddd2ef2eebfc14185a1a4cb7d033c3c188af8a61610fc27daf6fa939f39797aee0fcb53c9f32
-  data.tar.gz: 8ef58e7a6ad864289f70cc1e0617e2cc1c83850948fa20b8fdc8bb385393244ba3dc92a17231d56a812cdadbbaef35d484dc103c1c0f486e26bd18e87042177f
+  metadata.gz: b190ff1ed4016f43a9d226cc528294de0af82d3d8b181040a9c2f20ff88259d003d206d0bbd4ce983ca394a20c445bb9b85d924d87fab527f0a79f20187f2309
+  data.tar.gz: 4e6d4b70a1200fdad7d575b5f225a232fe1df4d2af3298f72f4b8194e5b7a5e6fc1d7428efca6ddab74e1cb51b4ed141f95c6fd81dd7af664db2e64b07d253e8

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # URBANopt Scenario Gem
 
+## Version 0.6.3
+Date Range: 07/01/21 - 10/15/21:
+
+- Fixed [#219]( https://github.com/urbanopt/urbanopt-scenario-gem/issues/219), Add support for REopt
+  results for Electricity Produced in Scenario and Feature visualization
+
 ## Version 0.6.2
 Date Range: 05/15/21 - 06/30/21:
 

data/Gemfile

@@ -39,8 +39,11 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # end
 
 # if allow_local && File.exist?('../urbanopt-reporting-gem')
-#  gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
+#   gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
 # elsif allow_local
+#   gem 'urbanopt-reporting', github: 'NREL/urbanopt-reporting', branch: 'develop'
+# end
+
 
 # if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
 #   gem 'openstudio-load-flexibility-measures', path: '../openstudio-load-flexibility-measures-gem'

data/docs/package-lock.json

@@ -24,7 +24,7 @@
         "node-forge": ">=0.10.0",
         "postcss": "^8.2.15",
         "serialize-javascript": "^5.0.1",
-        "set-value": "^3.0.2",
+        "set-value": "^4.0.1",
         "ssri": ">=8.0.1",
         "vuepress": "^1.8.2",
         "yargs-parser": "^20.2.1"
@@ -12728,15 +12728,20 @@
       "dev": true
     },
     "node_modules/set-value": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-3.0.2.tgz",
-      "integrity": "sha512-npjkVoz+ank0zjlV9F47Fdbjfj/PfXyVhZvGALWsyIYU/qrMzpi6avjKW3/7KeSU2Df3I46BrN1xOI1+6vW0hA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-4.0.1.tgz",
+      "integrity": "sha512-ayATicCYPVnlNpFmjq2/VmVwhoCQA9+13j8qWp044fmFE3IFphosPtRM+0CJ5xoIx5Uy52fCcwg3XeH2pHbbPQ==",
       "dev": true,
+      "funding": [
+        "https://github.com/sponsors/jonschlinkert",
+        "https://paypal.me/jonathanschlinkert",
+        "https://jonschlinkert.dev/sponsor"
+      ],
       "dependencies": {
         "is-plain-object": "^2.0.4"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">=11.0"
       }
     },
     "node_modules/setimmediate": {
@@ -16899,6 +16904,7 @@
       "integrity": "sha512-pM7CR3yXB6L8Gfn6EmX7FLNE3+V/15I3o33GkSNsWvgsMp6HVGXKkXgojrcfUUauyL1LZOdvTmu4enU2RePGHw==",
       "dev": true,
       "requires": {
+        "@babel/core": "^7.11.0",
         "@babel/helper-compilation-targets": "^7.9.6",
         "@babel/helper-module-imports": "^7.8.3",
         "@babel/plugin-proposal-class-properties": "^7.8.3",
@@ -16911,6 +16917,7 @@
         "@vue/babel-plugin-jsx": "^1.0.3",
         "@vue/babel-preset-jsx": "^1.2.4",
         "babel-plugin-dynamic-import-node": "^2.3.3",
+        "core-js": "^3.6.5",
         "core-js-compat": "^3.6.5",
         "semver": "^6.1.0"
       }
@@ -25942,9 +25949,9 @@
       "dev": true
     },
     "set-value": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-3.0.2.tgz",
-      "integrity": "sha512-npjkVoz+ank0zjlV9F47Fdbjfj/PfXyVhZvGALWsyIYU/qrMzpi6avjKW3/7KeSU2Df3I46BrN1xOI1+6vW0hA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-4.0.1.tgz",
+      "integrity": "sha512-ayATicCYPVnlNpFmjq2/VmVwhoCQA9+13j8qWp044fmFE3IFphosPtRM+0CJ5xoIx5Uy52fCcwg3XeH2pHbbPQ==",
       "dev": true,
       "requires": {
         "is-plain-object": "^2.0.4"

data/docs/package.json

@@ -26,7 +26,7 @@
     "node-forge": ">=0.10.0",
     "postcss": "^8.2.15",
     "serialize-javascript": "^5.0.1",
-    "set-value": "^3.0.2",
+    "set-value": "^4.0.1",
     "ssri": ">=8.0.1",
     "vuepress": "^1.8.2",
     "yargs-parser": "^20.2.1"

data/lib/urbanopt/scenario/scenario_visualization.rb

@@ -47,18 +47,19 @@ module URBANopt
     class ResultVisualization
       def self.create_visualization(run_dir, feature = true, feature_names = false)
         @all_results = []
-
+        name = nil
         run_dir.each do |folder|
           # create visualization for scenarios
           case feature
           when false
-            name = folder.split('/')[-1]
-            csv_dir = File.join(folder, 'default_scenario_report.csv')
+            name = folder.split('/')[-2]
+            csv_dir = folder
+
           # create visualization for features
           when true
             index = run_dir.index(folder)
-            name = "#{folder.split('/')[-1]}-#{feature_names[index]}"
-            csv_dir = File.join(folder, 'feature_reports/default_feature_report.csv')
+            name = "#{folder.split('/')[-3]}-#{feature_names[index]}"
+            csv_dir = folder
           end
 
           if File.exist?(csv_dir)
@@ -205,38 +206,45 @@ module URBANopt
               annual_values[headers_unitless[j]] = annual_sum
             end
 
-            @results = {}
-            @results['name'] = name
-            @results['monthly_values'] = {}
-            @results['annual_values'] = {}
+            results = {}
+            results['name'] = name
+            results['monthly_values'] = {}
+            results['annual_values'] = {}
 
             if @jan_next_year_index.nil? || @feb_index.nil? || @mar_index.nil? || @apr_index.nil? || @may_index.nil? || @jun_index.nil? || @jul_index.nil? || @aug_index.nil? || @sep_index.nil? || @oct_index.nil? || @nov_index.nil? || @dec_index.nil?
-              @results['complete_simulation'] = false
+              results['complete_simulation'] = false
               puts "#{name} did not contain an annual simulation…visualizations will not render for it."
             else
-              @results['complete_simulation'] = true
+              results['complete_simulation'] = true
             end
 
             monthly_totals&.each do |key, value|
               unless key == 'Datetime'
-                @results['monthly_values'][key] = value
+                results['monthly_values'][key] = value
               end
             end
 
             annual_values&.each do |key, value|
               unless key == 'Datetime'
-                @results['annual_values'][key] = value
+                results['annual_values'][key] = value
               end
             end
 
           end
 
-          unless @results.nil?
-            @all_results << @results
+          unless results.nil?
+            @all_results << results
           end
         end
+
         # create json with required data stored in a variable
-        results_path = File.join(run_dir[0], '../scenarioData.js')
+        if feature == false
+          # In case of scenario visualization store result at top of the run folder
+          results_path = File.expand_path('../../scenarioData.js', run_dir[0])
+        else
+          # In case of feature visualization store result at top of scenario folder folder
+          results_path = File.expand_path('../../../scenarioData.js', run_dir[0])
+        end
         File.open(results_path, 'w') do |file|
           file << "var scenarioData = #{JSON.pretty_generate(@all_results)};"
         end

data/lib/urbanopt/scenario/version.rb

@@ -40,6 +40,6 @@
 
 module URBANopt
   module Scenario
-    VERSION = '0.6.2'.freeze
+    VERSION = '0.6.3'.freeze
   end
 end

data/urbanopt-scenario-gem.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'sqlite3', '1.4.2'
   spec.add_runtime_dependency 'urbanopt-core', '~> 0.6.1'
-  spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.4.1'
+  spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.4.2'
 
   # no longer need the below
   # need to include all measure gems listed in mappers in project gemfiles

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-scenario
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Rawad El Kontar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 description: Library to export data point OSW files from URBANopt Scenario CSV
 email:
 - rawad.elkontar@nrel.gov