lib/openstudio/analysis/translator/datapoints.rb in openstudio-analysis-1.0.0.rc7 vs lib/openstudio/analysis/translator/datapoints.rb in openstudio-analysis-1.0.0.rc8

- old
+ new

@@ -163,11 +163,10 @@ # Use the programmatic interface to make the analysis # append the model name to the analysis name if requested (normally if there are more than 1 models in the spreadsheet) display_name = append_model_name ? @name + ' ' + seed_model[:display_name] : @name a = OpenStudio::Analysis.create(display_name) - a @variables.each do |measure| @measure_paths.each do |measure_path| measure_dir_to_add = "#{measure_path}/#{measure[:measure_data][:classname]}" if Dir.exist? measure_dir_to_add @@ -354,10 +353,11 @@ vars = measure_map[measure] # construct the list of variables vars.each do |var| var = var[0] + next if var.to_s == "None" var_hash = {} found_arg = nil measure_xml.xpath('/measure/arguments/argument').each do |arg| if arg.xpath('name').text == var.to_s found_arg = arg @@ -403,10 +403,9 @@ var_hash[:distribution][:enumerations] << false end data[measure_index][:vars] << var_hash end data[measure_index][:args] = [] - measure_xml.xpath('/measure/arguments/argument').each do |arg_xml| arg = {} arg[:value_type] = arg_xml.xpath('type').text.downcase arg[:name] = arg_xml.xpath('name').text.downcase