openstudio-analysis 1.0.0.rc11 → 1.0.0.rc12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69b6efe3f7d39b16404e283429ad3939f553f940
-  data.tar.gz: b53c9ff9fbd921a9a378dee5cc7e942d243111ea
+  metadata.gz: 5a151c816b9480e43b65c9ab71704a09ad91a22e
+  data.tar.gz: 11f8ce9704c05baa7ac522ceea2c5f2b3ec47fac
 SHA512:
-  metadata.gz: aa11be16247530bf66ae49746553f8fc333b3a40bf1eb5463b5594223b51180ae2875caa4656a3b0b7d598906f5a952e69148018e47762c5ed1bbfa72607e8e2
-  data.tar.gz: 3df5b63325a9e636c5793aca233601ea5c9d2dcb05df88cbdf15d898aae34503cd9493993992381155080261748a182fca360a1dcce323258039024b499d3c8b
+  metadata.gz: e860f6aeaaa62ad341ce59f8adf55a6643cc9b6740d7de10dda78c0f721947cbe52ca6b37e3de0f3a8fa12ed403c787b0a27d31988cd3de1fd11741ba5cdc8d2
+  data.tar.gz: 2f84b7eac4387072384db1519272a4cfdc338597f772b7cce5d8f2ff1928f698f13dba628e6093cfbcf206842c0bc8d75fe9eff7a7d6221bcce25e6622a25c0a

data/lib/openstudio/analysis/translator/workflow.rb

@@ -34,6 +34,9 @@ module OpenStudio
 
           # Initialize static inputs from the OSA
           @seed_file = File.basename @osa[:seed][:path]
+          if @options[:seed]
+            @seed_file = @options[:seed]
+          end
           @weather_file = File.basename @osa[:weather_file][:path]
           @osa_id = @osa[:_id]
           @steps = []
@@ -72,7 +75,6 @@ module OpenStudio
 
           # Parse the osd hash based off of the osa hash. First check that the analysis id matches
           raise "File #{osd_filename} does not reference #{@osa_id}." unless @osa_id == osd[:analysis_id]
-          # @todo (rhorsey) Fix the spec so this line can be uncommented
           osw_steps_instance = @steps
           osw_steps_instance.each_with_index do |step, i|
             next unless @osa[:problem][:workflow][i][:variables]
@@ -99,7 +101,7 @@ module OpenStudio
           osw[:steps] = osw_steps_instance
           osw[:name] = osd[:name] if osd[:name]
           osw[:description] = osd[:description] if osd[:description]
-          return osw
+          osw
         end
 
         # Runs an array of OSD files
@@ -114,7 +116,7 @@ module OpenStudio
             end
           end
 
-          return r
+          r
         end
       end
     end

data/lib/openstudio/analysis/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Analysis
-    VERSION = '1.0.0.rc11'.freeze
+    VERSION = '1.0.0.rc12'.freeze
   end
 end

data/spec/schema/osa.json

@@ -290,6 +290,32 @@
         },
         "seed": {
           "$ref": "#/definitions/Seed Object"
+        },
+        "options": {
+          "description": "Each option corresponds to one WorkflowStep (i.e. Measure).  Options are listed in order",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "measure_name": {
+                "description": "Name of the measure in this workflow",
+                "type": "string"
+              },
+              "workflow_index": {
+                "description": "Index of the measure in the workflow",
+                "type": "number"
+              },
+              "name": {
+                "description": "Name of the user specified option",
+                "type": "string"
+              },
+              "description": {
+                "description": "Description of the user specified option",
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
         }
       },
       "required": [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-analysis
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc11
+  version: 1.0.0.rc12
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Create JSON, ZIP to communicate with OpenStudio Distributed Analysis in the