openstudio-workflow 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9d68b3e07b560c00048d9804bc0b335616b4ff6
-  data.tar.gz: 48da479660bf59a3f06297a4b80917c9ad8fb534
+  metadata.gz: 532be0c06d55d26e5093d3ab50408d22a959ec5e
+  data.tar.gz: 2d1a4981f3064bb321a26adba13b865c4cf8fa7f
 SHA512:
-  metadata.gz: 4e2fd88631224d04ca0f347863ab5ed19817f08e3edf05c3a1109a3e54be82a71ae3d88040e3a7ff91d2507762a22adc919be436bd9c05744478127434543525
-  data.tar.gz: a9fa849f8c5d4e0534c25a223764486356eafb1d4ef9f10e7e8525c64ad38a5ea01556180e57ad9ab9c9d70ff0e7a28e0534f06b5b1587ae529be9924e7ce22f
+  metadata.gz: e993c121bd067a2ed62531e7fd53d49193fac78f50cb4965eae72346b799255935a076325aacb19bbd202150ca90b7eb4eebf7eaf532588d2e651c5fdf58465f
+  data.tar.gz: ca03998c2563d734ed1b975538f5b7375a270bfa79128d5142380b8e4ff51e32e90b876ae23d9afd89af829606936c6d64d0396f5aff784f7bc038cbb0619d2d

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

@@ -56,6 +56,11 @@ module OpenStudio
         #
         def communicate_energyplus_stdout(_ = nil, _ = nil)
         end
+        
+        # Do nothing on Measure result
+        #
+        def communicate_measure_result(_ = nil, _ = nil)
+        end
 
         # Write the measure attributes to the filesystem
         #

data/lib/openstudio/workflow/adapters/output/socket.rb

@@ -64,6 +64,27 @@ module OpenStudio
           super
           @socket.write(line)
         end
+        
+        def communicate_measure_result(result, options = {})
+          super
+          
+          step_result = result.stepResult
+          initial_condition = result.stepInitialCondition
+          final_condition = result.stepFinalCondition
+          errors = result.stepErrors
+          warnings = result.stepWarnings
+          infos = result.stepInfo
+
+          # Mirrors WorkflowStepResult::string
+          tab = '  '
+          @socket.write("#{tab}Result: #{step_result.get.valueName}\n") if !step_result.empty?
+          @socket.write("#{tab}Initial Condition: #{initial_condition.get}\n") if !initial_condition.empty?
+          @socket.write("#{tab}Final Condition: #{final_condition.get}\n") if !final_condition.empty?
+          errors.each {|error| @socket.write("#{tab}Error: #{error}\n") }
+          warnings.each {|warning| @socket.write("#{tab}Warn: #{warning}\n") }
+          infos.each {|info| @socket.write("#{tab}Info: #{info}\n") }
+        end
+        
       end
     end
   end

data/lib/openstudio/workflow/adapters/output/web.rb

@@ -56,6 +56,10 @@ module OpenStudio
         def communicate_energyplus_stdout(line, options = {})
           super
         end
+        
+        def communicate_measure_result(result, options = {})
+          super
+        end
       end
     end
   end

data/lib/openstudio/workflow/adapters/output_adapter.rb

@@ -39,6 +39,10 @@ module OpenStudio
         instance.communicate_energyplus_stdout line, options
       end
 
+      def communicate_measure_result(result, options = {})
+        instance.communicate_measure_result result, options
+      end
+      
       def communicate_measure_attributes(measure_attributes, options = {})
         instance.communicate_measure_attributes measure_attributes, options
       end

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

@@ -414,11 +414,15 @@ module OpenStudio
                 # add the error to the osw.out
                 runner.registerError("#{e.message}\n\t#{e.backtrace.join("\n\t")}")
                 
+                result = runner.result
+                
                 if !energyplus_output_requests
                   # incrementStep must be called after run
                   runner.incrementStep
                 end
                 
+                options[:output_adapter].communicate_measure_result(result) if options[:output_adapter]
+                
                 log_message = "Runner error #{__FILE__} failed with #{e.message}, #{e.backtrace.join("\n")}"
                 raise log_message
               end
@@ -435,9 +439,11 @@ module OpenStudio
                 
                 # incrementStep must be called after run
                 runner.incrementStep
+                
+                options[:output_adapter].communicate_measure_result(result) if options[:output_adapter]
 
                 errors = result.stepErrors
-
+                
                 fail "Measure #{measure_dir_name} reported an error with #{errors}" if errors.size != 0
                 logger.debug "Running of measure '#{measure_dir_name}' completed. Post-processing measure output"
                 

data/lib/openstudio/workflow/version.rb

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

data/lib/openstudio/workflow_json.rb

@@ -54,6 +54,13 @@ unless s.respond_to?(:to_VariantType)
     end
   end
 end
+unless s.respond_to?(:valueName)
+  class String
+    def valueName
+      self
+    end
+  end
+end
 
 # WorkflowStepResultValue_Shim provides a shim interface to the WorkflowStepResultValue class in OpenStudio 2.X when running in OpenStudio 1.X
 class WorkflowStepResultValue_Shim
@@ -94,6 +101,20 @@ class WorkflowStepResult_Shim
     @result = result
   end
 
+  def stepInitialCondition
+    if @result[:initial_condition]
+      return Optional_Shim.new(@result[:initial_condition])
+    end
+    return Optional_Shim.new(nil)
+  end
+  
+  def stepFinalCondition
+    if @result[:final_condition]
+      return Optional_Shim.new(@result[:final_condition])
+    end
+    return Optional_Shim.new(nil)
+  end
+  
   def stepErrors
     return @result[:step_errors]
   end
@@ -121,6 +142,7 @@ class WorkflowStepResult_Shim
    def setStepResult(step_result)
     @result[:step_result] = step_result
   end 
+   
 end
 
 # WorkflowStep_Shim provides a shim interface to the WorkflowStep class in OpenStudio 2.X when running in OpenStudio 1.X

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-workflow
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Nicholas Long
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler