urbanopt-scenario 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad7bee4d19e55b9e3642d7378b412c28507d6a25f41f65d6ca3bed9e8db03983
-  data.tar.gz: fa81be8958d3c63d07c0ac0fc71cdecb939090c8bdb54f0418c20d0b9a38ab57
+  metadata.gz: a8cb63dabcc5a248580c0f5941030e985d95aa03f5cf6e9ecaeead96b5879d3a
+  data.tar.gz: ba1fba337a0c9daf1ef6f699bb44864fc663a604bc2d6806919b44947326d7c6
 SHA512:
-  metadata.gz: 7f4f0be9908f1f5410d08c6d98613f1a15c907945ee3a980a716a2f4da6c9888946bb90d73b09b6ab8cd58332ba8b7fde0baaf9dd7f54ad81157e251df355725
-  data.tar.gz: f1ef917f1c094d62439ea616b87fe895a572472ee1089d34044a236afad7bc9cb88eb4388f2aba3c6340823c36040d1073e5e48efb273d8e75c679d647bc79d1
+  metadata.gz: 81d7ecde2901d1f8cef37c69ab4052cad2a70e9e87654724d09374cb6646eb9ef61393451e0215ac784534dde74647ca2719d1cb943306a7bf0d45fb1d0d16bf
+  data.tar.gz: d9c810fb5d2bda25f6b9910b4e49e6ab7c9a1c065e3570319e85a4d58cd4f047f7d30e1a651bf7c4a6ed867b3f418255d5c7dd1aa4cf342c11a3c369680ed8fb

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # URBANopt Scenario Gem
 
+## Version 0.4.1
+Date Range: 09/22/20 - 09/28/20
+
+- Fixed [#156] (https://github.com/urbanopt/urbanopt-scenario-gem/issues/156), Ignore non-datapoint directories in scenario dir when creating scenario sqlite file
+
 ## Version 0.4.0
 Date Range: 06/05/20 - 09/21/20
 

data/lib/urbanopt/scenario/scenario_post_processor_default.rb

@@ -47,7 +47,7 @@ module URBANopt
       def initialize(scenario_base)
         super(scenario_base)
 
-        @initialization_hash = { directory_name: scenario_base.run_dir, name: scenario_base.name, id: scenario_base.name }
+        @initialization_hash = { directory_name: scenario_base.run_dir, name: scenario_base.name, id: scenario_base.name, root_dir: scenario_base.root_dir }
         @scenario_result = URBANopt::Reporting::DefaultReports::ScenarioReport.new(@initialization_hash)
         @default_save_name = 'default_scenario_report'
 
@@ -97,6 +97,24 @@ module URBANopt
 
         values_arr = []
         feature_list = Pathname.new(@initialization_hash[:directory_name]).children.select(&:directory?) # Folders in the run/scenario directory
+        
+        # get scenario CSV
+        scenario_csv = File.join(@initialization_hash[:root_dir], @initialization_hash[:name] + '.csv')
+        if File.exist?(scenario_csv)
+          # csv found
+          feature_ids = CSV.read(scenario_csv, :headers => true)
+          feature_list = []
+          # loop through building feature ids from scenario csv
+          feature_ids["Feature Id"].each do |feature|
+            if Dir.exist?(File.join(@initialization_hash[:directory_name], feature))
+              feature_list << File.join(@initialization_hash[:directory_name], feature)
+            else
+              puts "warning: did not find a directory for datapoint #{feature}...skipping"
+            end
+          end
+        else
+          raise "Couldn't find scenario CSV: #{scenario_csv}"
+        end
         feature_1_name = File.basename(feature_list[0]) # Get name of first feature, so we can read eplusout.sql from there
         uo_output_sql_file = File.join(@initialization_hash[:directory_name], feature_1_name, 'eplusout.sql')
         feature_list.each do |feature| # Loop through each feature in the scenario

data/lib/urbanopt/scenario/version.rb

@@ -30,6 +30,6 @@
 
 module URBANopt
   module Scenario
-    VERSION = '0.4.0'.freeze
+    VERSION = '0.4.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-scenario
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Rawad El Kontar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler