openstudio-analysis 1.0.0.pre.rc4 → 1.0.0.pre.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54391b81c2f65e4be2f21d880318705e49482bc0
-  data.tar.gz: 0e107eced77ba5b34747b26b73b125d65619d8c1
+  metadata.gz: b0a3a63a518cbb50ad16dd16675b391428071e8d
+  data.tar.gz: 671e584af25a239fa8b5f68133cbcc1f9806ee29
 SHA512:
-  metadata.gz: 85902d52a7300052efc0914aaa6d40355a5eadb8bf4adbe479dce69505cfddf54d41759104f348aef3dc8f513f142883ea67061106f1d88350f4d3179de4b030
-  data.tar.gz: b25fc97d234143affac537fb34288c7467c2c1afaf465c94bea48c69680d0c3efb2f2ecefe70b75cab99a1914a64f635fa46af8b762d24d41670a0a92eec2470
+  metadata.gz: a2fecd9ae6e279325741be2873eec19823dbbf5542594a1ea1d22c49626946d11eba749863000881ecbfeb7141464ce9c3e65b7cb4a19ce153ee608f418f8540
+  data.tar.gz: 528d9501c81e8d6891ce299a628a0d53f24efecf0163661f2da0e8a676454263961b48eaa728c80e5996d815f9065361dbf3cba9dfada7628dac08308385fd42

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 OpenStudio Analysis Gem Change Log
 ==================================
 
+Version 1.0.0.pre.rc5
+---------------------
+* fix get_datapoint method. show_full is no longer a valid endpoint in the new server code 
+
 Version 1.0.0.pre.rc4
 ---------------------
 * Change seed_model to seed_file in OSWs generated from the translator

data/lib/openstudio/analysis/server_api.rb

@@ -716,7 +716,7 @@ module OpenStudio
       def get_datapoint(data_point_id)
         data_point = nil
 
-        resp = @conn.get "/data_points/#{data_point_id}/show_full.json"
+        resp = @conn.get "/data_points/#{data_point_id}.json"
         if resp.status == 200
           data_point = JSON.parse resp.body, symbolize_names: true
         end

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

@@ -48,6 +48,13 @@ module OpenStudio
                 step_hash[:arguments][arg[:name].to_sym] = arg[:value]
               end
             end
+            step_hash[:name] = step[:name] if step[:name]
+            step_hash[:measure_id] = step[:uuid] if step[:uuid]
+            step_hash[:version_id] = step[:version_uuid] if step[:version_uuid]
+            step_hash[:description] = step[:description] if step[:description]
+            step_hash[:taxonomy] = step[:taxonomy] if step[:taxonomy]
+            step_hash[:measure_type] = step[:measure_type]
+            step_hash[:measure_type] = 'ModelMeasure' if step_hash[:measure_type] == 'RubyMeasure'
             @steps << step_hash
           end
         end
@@ -90,6 +97,8 @@ module OpenStudio
           osw[:file_paths] = @file_paths
           osw[:run_directory] = './'
           osw[:steps] = osw_steps_instance
+          osw[:name] = osd[:name] if osd[:name]
+          osw[:description] = osd[:description] if osd[:description]
           return osw
         end
 

data/lib/openstudio/analysis/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Analysis
-    VERSION = '1.0.0-rc4'
+    VERSION = '1.0.0-rc5'
   end
 end

data/spec/schema/osa.json

@@ -17,7 +17,7 @@
 			"type": "object",
 			"properties": {
 				"units": {
-					"description": "Haystack complient unit string, or empty string if not applicable",
+					"description": "Haystack compliant unit string, or empty string if not applicable",
 					"type": "string"
 				},
 				"objective_function": {
@@ -25,7 +25,7 @@
 					"type": "boolean"
 				},
 				"objective_function_index": {
-					"description": "Key used to define multi-objective functions, null if not applicale",
+					"description": "Key used to define multi-objective functions, null if not applicable",
 					"type": "number"
 				},
 				"objective_function_target": {
@@ -48,7 +48,7 @@
 					"type": "string"
 				},
 				"display_name_short": {
-					"description": "User facing name less that 20 chareters",
+					"description": "User facing name less that 20 characters",
 					"type": "string"
 				},
 				"metadata_id": {
@@ -89,15 +89,15 @@
 		},
 		"Algorithm Attributes": {
 			"title": "algorithm",
-			"description": "Hash of ttributes associated with the analysis_type",
+			"description": "Hash of attributes associated with the analysis_type",
 			"type": "object",
 			"additionalProperties": {
-				"description": "Attibutes defined by analysis type"
+				"description": "Attributes defined by analysis type"
 			}
 		},
 		"Argument": {
 			"title": "argument",
-			"description": "Indivigual argument instance",
+			"description": "Individual argument instance",
 			"type": "object",
 			"properties": {
 				"display_name": {
@@ -105,11 +105,11 @@
 					"type": "string"
 				},
 				"display_name_short": {
-					"description": "Optional user-facing display name under 20 charecters",
+					"description": "Optional user-facing display name under 20 characters",
 					"type": "string"
 				},
 				"name": {
-					"description": "Machine readable snake-cased name of agrument as defined in the measure.xml",
+					"description": "Machine readable snake-cased name of argument as defined in the measure.xml",
 					"type": "string"
 				},
 				"value_type": {
@@ -156,7 +156,7 @@
 			"additionalProperties": false
 		},
 		"Workflow Step": {
-			"description": "Indivigual measure definition",
+			"description": "Individual measure definition",
 			"type": "object",
 			"properties": {
 				"name": {
@@ -164,13 +164,21 @@
 					"type": "string"
 				},
 				"display_name": {
-					"description": "User facing measure name whcih must also be unique",
+					"description": "User facing measure name which must also be unique",
 					"type": "string"
 				},
 				"measure_type": {
 					"description": "Accepts values of 'Ruby' 'EnergyPlus' and 'Reporting'",
 					"type": "string"
 				},
+				"description": {
+					"description": "Measure description",
+					"type": "string"
+				},
+				"taxonomy": {
+					"description": "Measure taxonomy tag",
+					"type": "string"
+				},
 				"measure_definition_class_name": {
 					"description": "Class name of measure.rb file",
 					"type": "string"
@@ -245,7 +253,7 @@
 		},
 		"Uncertainty Definition": {
 			"title": "uncertainty_description",
-			"description": "Set of attributes defining the variablity of the input",
+			"description": "Set of attributes defining the variability of the input",
 			"type": "object",
 			"properties": {
 				"type": {
@@ -268,8 +276,27 @@
 			],
 			"additionalProperties": false
 		},
+		"Design Alternative": {
+			"description": "Individual design alternative instance",
+			"type": "object",
+			"properties": {
+				"name": {
+					"description": "Name of design alternative",
+					"type": "string"
+				},
+				"description" : {
+					"description": "Description of design alternative",
+					"type": "string"
+				}
+			},
+			"required": [
+				"name",
+				"description"
+			],
+			"additionalProperties": false
+		},
 		"Variable": {
-			"description": "Inidivigual variable instance",
+			"description": "Individual variable instance",
 			"type": "object",
 			"properties": {
 				"argument": {
@@ -280,7 +307,7 @@
 					"type": "string"
 				},
 				"display_name_short": {
-					"description": "Optional user-facing name under 20 charecters",
+					"description": "Optional user-facing name under 20 characters",
 					"type": "string"
 				},
 				"variable_type": {
@@ -292,7 +319,7 @@
 					]
 				},
 				"units": {
-					"description": "Haystack complient units with an empty string if not defined.",
+					"description": "Haystack compliant units with an empty string if not defined.",
 					"type": "null"
 				},
 				"minimum": {
@@ -308,7 +335,7 @@
 					"type": "null"
 				},
 				"static_value": {
-					"description": "Value to defalut to in the case of this variable not being perturbed in a datapoint",
+					"description": "Value to default to in the case of this variable not being perturbed in a datapoint",
 					"type": "number"
 				},
 				"uuid": {
@@ -368,7 +395,7 @@
 						"doe",
 						"repeat_run",
 						"optim",
-						"baseline_purturbation",
+						"baseline_perturbation",
 						"preflight"
 					]
 				},
@@ -385,6 +412,13 @@
 				"name": {
 					"description": "??????",
 					"type": "string"
+				},
+				"Design Alternative Array": { 
+					"description": "Array of design alternative names and descriptions",
+					"type": "array",
+					"items": {
+						"$ref": "#/definitions/Design Alternative"
+					}
 				}
 			},
 			"required": [
@@ -403,7 +437,7 @@
 			}
 		},
 		"Workflow": {
-			"description": "Definintion of measures to be applied in the analysis",
+			"description": "Definition of measures to be applied in the analysis",
 			"type": "array",
 			"items": {
 				"$ref": "#/definitions/Workflow Step"
@@ -506,7 +540,7 @@
 			"additionalProperties": false
 		},
 		"Argument Array": {
-			"description": "Array of fixed inputs for the masure",
+			"description": "Array of fixed inputs for the measure",
 			"type": "array",
 			"items": {
 				"$ref": "#/definitions/Argument"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-analysis
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc4
+  version: 1.0.0.pre.rc5
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday