openstudio-workflow 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 532be0c06d55d26e5093d3ab50408d22a959ec5e
-  data.tar.gz: 2d1a4981f3064bb321a26adba13b865c4cf8fa7f
+  metadata.gz: 626a53f7a44fd8b5203559f9101767698477acbb
+  data.tar.gz: ae410305611dfe81e607f90e09fb4aab37d05e54
 SHA512:
-  metadata.gz: e993c121bd067a2ed62531e7fd53d49193fac78f50cb4965eae72346b799255935a076325aacb19bbd202150ca90b7eb4eebf7eaf532588d2e651c5fdf58465f
-  data.tar.gz: ca03998c2563d734ed1b975538f5b7375a270bfa79128d5142380b8e4ff51e32e90b876ae23d9afd89af829606936c6d64d0396f5aff784f7bc038cbb0619d2d
+  metadata.gz: 94d0f57c7490ae80cdb5f97942d3045309784478f0f97850d5ef7b04b1853c0dc19131e82a81bc8d1025010d655ceaaa2bcdf99fa2d6d9d261f1747c98825ce2
+  data.tar.gz: 44f91112022af27f4eadfc1319d88b74f73bbffc4ca70f2532774c6411ea6b4b01a7e7b73e4604a4c158fef9231b53f49d790f62092bb7b73af3f8d57df5dbf3

data/lib/openstudio/workflow/adapters/input/local.rb

@@ -228,7 +228,7 @@ module OpenStudio
         #
         def analysis
           # DLM: should this come from the OSW?  the osd id and checksum are specified there.
-          osa_abs_path = File.join(osw_dir, 'analysis.osa')
+          osa_abs_path = File.join(osw_dir, '../analysis.json')
           if File.exist? osa_abs_path
             ::JSON.parse(File.read(osa_abs_path), symbolize_names: true)
           end

data/lib/openstudio/workflow/util/post_process.rb

@@ -3,6 +3,7 @@ module OpenStudio
     module Util
       require 'openstudio/workflow/util/measure'
       require 'csv'
+      require 'rexml/document'
 
       # This module serves as a wrapper around various post-processing tasks used to manage outputs
       # @todo (rhorsey) ummmm. So some of this is pretty ugly. Since @dmacumber had ideas about this maybe he can figure
@@ -44,9 +45,9 @@ module OpenStudio
           if @registry[:analysis]
             logger.info 'Iterating over Analysis JSON Output Variables'
             # Save the objective functions to the object for sending back to the simulation executive
-
-            if @analysis_json[:analysis] && @analysis_json[:analysis][:output_variables]
-              @analysis_json[:analysis][:output_variables].each do |variable|
+            analysis_json = @registry[:analysis]
+            if analysis_json[:analysis] && analysis_json[:analysis][:output_variables]
+              analysis_json[:analysis][:output_variables].each do |variable|
                 # determine which ones are the objective functions (code smell: todo: use enumerator)
                 if variable[:objective_function]
                   logger.info "Looking for objective function #{variable[:name]}"
@@ -136,7 +137,12 @@ module OpenStudio
           # Also, find any "report*.*" files
           Dir["#{run_dir}/*/report*.*"].each do |report|
             # get the parent directory of the file and snake case it
-            measure_class_name = File.basename(File.dirname(report))
+            measure_dir_name = File.dirname(report).split('/').last.gsub(/[0-9][0-9][0-9]_/, '')
+            measure_xml_path = File.absolute_path(File.join(File.dirname(report), '../../..', 'measures',
+                                                            measure_dir_name, 'measure.xml'))
+            logger.info "measure_xml_path: #{measure_xml_path}"
+            measure_xml = REXML::Document.new File.read(measure_xml_path)
+            measure_class_name = OpenStudio.toUnderscoreCase(measure_xml.root.elements['class_name'].text)
             file_ext = File.extname(report)
             append_str = File.basename(report, '.*')
             new_file_name = "#{directory}/reports/#{measure_class_name}_#{append_str}#{file_ext}"

data/lib/openstudio/workflow/version.rb

@@ -19,6 +19,6 @@
 
 module OpenStudio
   module Workflow
-    VERSION = '1.1.1'.freeze # Suffixes must have periods (not dashes)
+    VERSION = '1.1.2'.freeze # Suffixes must have periods (not dashes)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-workflow
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Nicholas Long
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Run OpenStudio based measures and simulations using EnergyPlus
@@ -90,17 +90,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: OpenStudio Workflow Manager