openstudio-analysis 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b375c6d43937f29e209710d135a528922a6ef091
-  data.tar.gz: b075c4886fe35caf999e7a2e7275df418a7e3efa
+  metadata.gz: 64b711bc6dd71fed0572358ab94477f37adc4fd4
+  data.tar.gz: 406a7c55aa84200df93e4cb28760baf6e4223b27
 SHA512:
-  metadata.gz: a730b5829fca946e4bfef3a42d26f85b9d163c1d3709c5f10162d37407d1e8b35987fa2418b1c2235ed8b2a438b50a175b58bff6b73b80b210c6ff8b90a14f7c
-  data.tar.gz: b8a1b254c5f20680010a7cee0cc5638ddd82e06c1f0a069ab855bb9b3ef4e4b4db189c755a285e0a9643e5e1513fed9f991a0df490a2edb6db06283f00547671
+  metadata.gz: 38020c7b813e88564ff15b2e4eb3e8a721aa129ed602b193f0f0debd3a073f794ea3100c86cd5c8890e31f68b3c1f3ca69423d2b5d9cf952b678b40f407056e1
+  data.tar.gz: e1cbce6ac68b8b275f368560c27d39a2c76058ae65a399799723d26796172e7d26aa13fb5389c27db890a8d283a7c6b1c9c1a3c6e326e20459f74f2e0f4f317a

data/CHANGELOG.md

@@ -4,6 +4,13 @@ OpenStudio Analysis Gem Change Log
 Unreleased
 --------------
 
+Version 0.3.0 (not yet on RubyGems)
+--------------
+* Remove the column for Sampling Method. That is now part of the analysis config.
+* All variables need static values now
+* Updated output tab to add more information about the outputs if available
+* Remove hardcoded baseline exception
+
 Version 0.2.3
 --------------
 

data/README.md

@@ -6,7 +6,7 @@ The OpenStudio Analysis Gem is used to communicate files to the OpenStudio Distr
 The purpose of this gem is to generate the analysis.json file, analysis.zip, and communicate with the server to upload 
 the simulations.
 
-The gem does not create the cluster (not launch it). Currently the only supported Cloud platform is
+The gem does not create the cluster. Currently the only supported Cloud platform is
 Amazon AWS using either [OpenStudio's PAT](https://openstudio.nrel.gov) the [openstudio-aws gem](https://rubygems.org/gems/openstudio-aws) or using [vagrant](http://www.vagrantup.com/).
 
 Instructions

data/lib/openstudio-analysis.rb

@@ -5,8 +5,10 @@ require 'roo'
 require 'erb'
 require 'zip'
 require 'semantic'
+require 'semantic/core_ext'
 require 'logger'
 require 'pp'
+require 'pathname'
 
 # core
 require 'openstudio/analysis/server_api'

data/lib/openstudio/analysis/server_api.rb

@@ -109,13 +109,31 @@ module OpenStudio
         analysis_ids
       end
 
+      def download_dataframe(analysis_id, save_directory=".")
+        response = @conn.get "/analyses/#{analysis_id}/download_data.rdata"
+        if response.status == 200
+          filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
+          puts "File #{filename} already exists, overwriting" if File.exist?("#{save_directory}/#{filename}")
+          File.open("#{save_directory}/#{filename}",'w') {|f| f << response.body}
+        end
+      end
+
+      def download_variables(analysis_id, save_directory=".")
+        response = @conn.get "/analyses/#{analysis_id}/download_variables.rdata"
+        if response.status == 200
+          filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
+          puts "File #{filename} already exists, overwriting" if File.exist?("#{save_directory}/#{filename}")
+          File.open("#{save_directory}/#{filename}",'w') {|f| f << response.body}
+        end
+      end
+
       def new_analysis(project_id, options)
         defaults = { analysis_name: nil, reset_uuids: false }
         options = defaults.merge(options)
 
         fail 'No project id passed' if project_id.nil?
         fail 'no formulation passed to new_analysis' unless options[:formulation_file]
-        fail "No formation exists #{options[:formulation_file]}" unless File.exist?(options[:formulation_file])
+        fail "No formulation exists #{options[:formulation_file]}" unless File.exist?(options[:formulation_file])
 
         formulation_json = JSON.parse(File.read(options[:formulation_file]), symbolize_names: true)
 

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

@@ -17,7 +17,7 @@ module OpenStudio
         attr_reader :run_setup
 
         # remove these once we have classes to construct the JSON file
-        attr_reader :name
+        attr_accessor :name
         attr_reader :machine_name
         attr_reader :template_json
 
@@ -103,47 +103,48 @@ module OpenStudio
           # verify that all continuous variables have all the data needed and create a name maps
           variable_names = []
           @variables['data'].each do |measure|
-            if measure['enabled'] && measure['name'] != 'baseline'
+            if measure['enabled']
               measure['variables'].each do |variable|
                 # Determine if row is suppose to be an argument or a variable to be perturbed.
                 if variable['variable_type'] == 'variable'
                   variable_names << variable['display_name']
-                  if variable['method'] == 'static'
-                    # add this as an argument
+
+                  # make sure that the variable has a static value
+                  if variable['distribution']['static_value'].nil? || variable['distribution']['static_value'] == ''
+                    fail "Variable #{measure['name']}:#{variable['name']} needs a static value"
+                  end
+
+                  if variable['type'] == 'enum' || variable['type'] == 'Choice'
                     # check something
-                  elsif variable['method'] == 'lhs'
-                    if variable['type'] == 'enum' || variable['type'] == 'Choice'
-                      # check something
-                    else # must be an integer or double
-                      if variable['distribution']['type'] == 'discrete_uncertain'
-                        if variable['distribution']['discrete_values'].nil? || variable['distribution']['discrete_values'] == ''
-                          fail "Variable #{measure['name']}:#{variable['name']} needs discrete values"
-                        end
-                      else
-                        if variable['distribution']['mean'].nil? || variable['distribution']['mean'] == ''
-                          fail "Variable #{measure['name']}:#{variable['name']} must have a mean"
-                        end
-                        if variable['distribution']['stddev'].nil? || variable['distribution']['stddev'] == ''
-                          fail "Variable #{measure['name']}:#{variable['name']} must have a stddev"
-                        end
+                  else # must be an integer or double
+                    if variable['distribution']['type'] == 'discrete_uncertain'
+                      if variable['distribution']['discrete_values'].nil? || variable['distribution']['discrete_values'] == ''
+                        fail "Variable #{measure['name']}:#{variable['name']} needs discrete values"
                       end
-
+                    else
                       if variable['distribution']['mean'].nil? || variable['distribution']['mean'] == ''
-                        fail "Variable #{measure['name']}:#{variable['name']} must have a mean/mode"
-                      end
-                      if variable['distribution']['min'].nil? || variable['distribution']['min'] == ''
-                        fail "Variable #{measure['name']}:#{variable['name']} must have a minimum"
+                        fail "Variable #{measure['name']}:#{variable['name']} must have a mean"
                       end
-                      if variable['distribution']['max'].nil? || variable['distribution']['max'] == ''
-                        fail "Variable #{measure['name']}:#{variable['name']} must have a maximum"
+                      if variable['distribution']['stddev'].nil? || variable['distribution']['stddev'] == ''
+                        fail "Variable #{measure['name']}:#{variable['name']} must have a stddev"
                       end
+                    end
+
+                    if variable['distribution']['mean'].nil? || variable['distribution']['mean'] == ''
+                      fail "Variable #{measure['name']}:#{variable['name']} must have a mean/mode"
+                    end
+                    if variable['distribution']['min'].nil? || variable['distribution']['min'] == ''
+                      fail "Variable #{measure['name']}:#{variable['name']} must have a minimum"
+                    end
+                    if variable['distribution']['max'].nil? || variable['distribution']['max'] == ''
+                      fail "Variable #{measure['name']}:#{variable['name']} must have a maximum"
+                    end
+                    unless variable['type'] == 'string'
                       if variable['distribution']['min'] > variable['distribution']['max']
                         fail "Variable min is greater than variable max for #{measure['name']}:#{variable['name']}"
                       end
-
                     end
-                  elsif variable['method'] == 'pivot'
-                    # check something
+
                   end
                 end
               end
@@ -189,7 +190,6 @@ module OpenStudio
           workflow_template = ERB.new(File.open("#{template_root}/workflow_item.json.erb", 'r').read)
           uncertain_variable_template = ERB.new(File.open("#{template_root}/uncertain_variable.json.erb", 'r').read)
           discrete_uncertain_variable_template = ERB.new(File.open("#{template_root}/discrete_uncertain_variable.json.erb", 'r').read)
-          static_variable_template = ERB.new(File.open("#{template_root}/static_variable.json.erb", 'r').read)
           pivot_variable_template = ERB.new(File.open("#{template_root}/pivot_variable.json.erb", 'r').read)
           argument_template = ERB.new(File.open("#{template_root}/argument.json.erb", 'r').read)
 
@@ -204,7 +204,7 @@ module OpenStudio
           @measure_index = -1
           @variables['data'].each do |measure|
             # With OpenStudio server we need to create the workflow with all the measure instances
-            if measure['enabled'] && measure['name'] != 'baseline'
+            if measure['enabled']
               @measure_index += 1
 
               puts "  Adding measure item '#{measure['name']}'"
@@ -217,21 +217,16 @@ module OpenStudio
               # add in the variables
               measure['variables'].each do |variable|
                 @variable = variable
-
                 # Determine if row is suppose to be an argument or a variable to be perturbed.
                 if @variable['variable_type'] == 'argument'
                   ag = nil
-                  if @variable['method'] == 'static'
-                    if @variable['distribution']['static_value'].nil? || @variable['distribution']['static_value'] == 'null'
-                      puts "    Warning: '#{measure['name']}:#{@variable['name']}' static value was empty or null, assuming optional and skipping"
-                      next
-                    end
-                    # unless @variable['distribution']['static_value']
-                    #   fail 'Cannot have an argument that is not a static value defined in which to set the argument'
-                    # end
+                  if @variable['distribution']['static_value'].nil? || @variable['distribution']['static_value'] == 'null'
+                    puts "    Warning: '#{measure['name']}:#{@variable['name']}' static value was empty or null, assuming optional and skipping"
+                    next
+                  end
 
-                    # add this as an argument
-                    case @variable['type'].downcase
+                  # add this as an argument
+                  case @variable['type'].downcase
                     when 'double'
                       @static_value = @variable['distribution']['static_value'].to_f
                     when 'integer'
@@ -247,54 +242,69 @@ module OpenStudio
                       end
                     else
                       fail "Unknown variable type of '#{@variable['type']}'"
-                    end
-                    ag = JSON.parse(argument_template.result(get_binding))
                   end
+                  ag = JSON.parse(argument_template.result(get_binding))
                   fail "Argument '#{@variable['name']}' did not process.  Most likely it did not have all parameters defined." if ag.nil?
                   wf['arguments'] << ag
                 else # must be a variable [either pivot or normal variable]
                   vr = nil
-                  if @variable['method'] == 'static'
-                    # add this as an argument
-                    vr = JSON.parse(static_variable_template.result(get_binding))
-                  elsif @variable['method'] == 'lhs'
-                    # TODO: remove enum and choice as this is not the variable type
-                    if @variable['type'] == 'enum' || @variable['type'].downcase == 'choice'
-                      @values_and_weights = @variable['distribution']['enumerations'].map { |v| { value: v } }.to_json
-                      vr = JSON.parse(discrete_uncertain_variable_template.result(get_binding))
-                    elsif @variable['distribution']['type'] == 'discrete_uncertain'
-                      # puts @variable.inspect
-                      weights = nil
-                      if @variable['distribution']['discrete_weights'] && @variable['distribution']['discrete_weights'] != ''
-                        weights = eval(@variable['distribution']['discrete_weights'])
-                      end
-
-                      values = nil
-                      if variable['type'].downcase == 'bool'
-                        values = eval(@variable['distribution']['discrete_values'])
-                        values.map! { |v| v.downcase == 'true' }
+                  # add this as an argument
+                  case @variable['type'].downcase
+                    when 'double'
+                      @static_value = @variable['distribution']['static_value'].to_f
+                    when 'integer'
+                      @static_value = @variable['distribution']['static_value'].to_i
+                    # TODO: update openstudio export to write only Strings
+                    when 'string', 'choice'
+                      @static_value = @variable['distribution']['static_value'].inspect
+                    when 'bool'
+                      if @variable['distribution']['static_value'].downcase == 'true'
+                        @static_value = true
                       else
-                        values = eval(@variable['distribution']['discrete_values'])
+                        @static_value = false
                       end
+                    else
+                      fail "Unknown variable type of '#{@variable['type']}'"
+                  end
 
-                      if weights
-                        fail "Discrete variable '#{@variable['name']}' does not have equal length of values and weights" if values.size != weights.size
-                        @values_and_weights = values.zip(weights).map { |v, w| { value: v, weight: w } }.to_json
-                      else
-                        @values_and_weights = values.map { |v| { value: v } }.to_json
-                      end
+                  # TODO: remove enum and choice as this is not the variable type
+                  if @variable['type'] == 'enum' || @variable['type'].downcase == 'choice'
+                    @values_and_weights = @variable['distribution']['enumerations'].map { |v| {value: v} }.to_json
+                    vr = JSON.parse(discrete_uncertain_variable_template.result(get_binding))
+                  elsif @variable['distribution']['type'] == 'discrete_uncertain'
+                    # puts @variable.inspect
+                    weights = nil
+                    if @variable['distribution']['discrete_weights'] && @variable['distribution']['discrete_weights'] != ''
+                      weights = eval(@variable['distribution']['discrete_weights'])
+                    end
 
-                      if @variable['variable_type'] == 'pivot'
-                        vr = JSON.parse(pivot_variable_template.result(get_binding))
-                      else
-                        vr = JSON.parse(discrete_uncertain_variable_template.result(get_binding))
-                      end
+                    values = nil
+                    if variable['type'].downcase == 'bool'
+                      values = eval(@variable['distribution']['discrete_values'])
+                      values.map! { |v| v.to_s == 'true' }
                     else
-                      if @variable['variable_type'] == 'pivot'
-                        fail 'Currently unable to pivot on continuous variables... stay tuned.'
-                      else
-                        vr = JSON.parse(uncertain_variable_template.result(get_binding))
-                      end
+                      values = eval(@variable['distribution']['discrete_values'])
+                    end
+
+                    if weights
+                      fail "Discrete variable '#{@variable['name']}' does not have equal length of values and weights" if values.size != weights.size
+                      @values_and_weights = values.zip(weights).map { |v, w| {value: v, weight: w} }.to_json
+                    else
+                      @values_and_weights = values.map { |v| {value: v} }.to_json
+                    end
+
+
+                    if @variable['variable_type'] == 'pivot'
+
+                      vr = JSON.parse(pivot_variable_template.result(get_binding))
+                    else
+                      vr = JSON.parse(discrete_uncertain_variable_template.result(get_binding))
+                    end
+                  else
+                    if @variable['variable_type'] == 'pivot'
+                      fail 'Currently unable to pivot on continuous variables... stay tuned.'
+                    else
+                      vr = JSON.parse(uncertain_variable_template.result(get_binding))
                     end
                   end
                   fail 'variable was nil after processing' if vr.nil?
@@ -352,11 +362,6 @@ module OpenStudio
                 end
               end
 
-              if v['measure_file_name_directory'] =~ /baseline/i
-                puts '  Skipping baseline measure'
-                next
-              end
-
               if measure_to_save && !added_measures.include?(measure_to_save)
                 # pp "Attempting to add measure #{measure_to_save}"
                 if File.exist?(measure_to_save)
@@ -397,6 +402,7 @@ module OpenStudio
           def deep_copy(o)
             Marshal.load(Marshal.dump(o))
           end
+
           # append the model name to the analysis name if requested (normally if there are more than
           # 1 models in the spreadsheet)
           new_analysis_json = deep_copy(analysis_json)
@@ -510,11 +516,23 @@ module OpenStudio
               # type some of the values that we know
               @settings['proxy_port'] = @settings['proxy_port'].to_i if @settings['proxy_port']
             elsif b_run_setup
-              @name = row[1].chomp if row[0] == 'Analysis Name'
-              @machine_name = @name.snake_case
+              if row[0] == 'Analysis Name'
+                if row[1]
+                  @name = row[1]
+                else
+                  @name = UUID.new.generate
+                end
+                @machine_name = @name.snake_case
+              end
               @export_path = File.expand_path(File.join(@root_path, row[1])) if row[0] == 'Export Directory'
-              @measure_path = File.expand_path(File.join(@root_path, row[1])) if row[0] == 'Measure Directory'
-
+              if row[0] == 'Measure Directory'
+                tmp_filepath = row[1]
+                if (Pathname.new tmp_filepath).absolute?
+                  @measure_path = tmp_filepath
+                else
+                  @measure_path = File.expand_path(File.join(@root_path, tmp_filepath))
+                end
+              end
               @run_setup["#{row[0].snake_case}"] = row[1] if row[0]
 
               # type cast
@@ -539,9 +557,14 @@ module OpenStudio
                 @weather_files += Dir.glob(File.expand_path(File.join(@root_path, row[1])))
               end
             elsif b_models
-              @models << { name: row[1].snake_case, display_name: row[1], type: row[2], path: File.expand_path(File.join(@root_path, row[3])) }
+              if row[1]
+                tmp_m_name = row[1]
+              else
+                tmp_m_name = UUID.new.generate
+              end
+              @models << {name: tmp_m_name.snake_case, display_name: tmp_m_name, type: row[2], path: File.expand_path(File.join(@root_path, row[3]))}
             elsif b_other_libs
-              @other_files << { lib_zip_name: row[1], path: row[2] }
+              @other_files << {lib_zip_name: row[1], path: row[2]}
             end
           end
         end
@@ -557,7 +580,30 @@ module OpenStudio
           # puts rows.inspect
           rows = nil
           begin
-            if @version >= '0.2.0'
+            if @version >= '0.3.0'.to_version
+              rows = @xls.sheet('Variables').parse(enabled: '# variable',
+                                                   measure_name_or_var_type: 'type',
+                                                   measure_file_name_or_var_display_name: 'parameter display name.*',
+                                                   measure_file_name_directory: 'measure directory',
+                                                   measure_type_or_parameter_name_in_measure: 'parameter name in measure',
+                                                   #sampling_method: 'sampling method',
+                                                   variable_type: 'Variable Type',
+                                                   units: 'units',
+                                                   default_value: 'static.default value',
+                                                   enums: 'enumerations',
+                                                   min: 'min',
+                                                   max: 'max',
+                                                   mode: 'mean|mode',
+                                                   stddev: 'std dev',
+                                                   delta_x: 'delta.x',
+                                                   discrete_values: 'discrete values',
+                                                   discrete_weights: 'discrete weights',
+                                                   distribution: 'distribution',
+                                                   source: 'data source',
+                                                   notes: 'notes',
+                                                   relation_to_eui: 'typical var to eui relationship',
+                                                   clean: true)
+            elsif @version >= '0.2.0'.to_version
               rows = @xls.sheet('Variables').parse(enabled: '# variable',
                                                    measure_name_or_var_type: 'type',
                                                    measure_file_name_or_var_display_name: 'parameter display name.*',
@@ -580,7 +626,7 @@ module OpenStudio
                                                    notes: 'notes',
                                                    relation_to_eui: 'typical var to eui relationship',
                                                    clean: true)
-            elsif @version >= '0.1.12' # add delta x
+            elsif @version >= '0.1.12'.to_version
               rows = @xls.sheet('Variables').parse(enabled: '# variable',
                                                    measure_name_or_var_type: 'type',
                                                    measure_file_name_or_var_display_name: 'parameter display name.*',
@@ -602,7 +648,7 @@ module OpenStudio
                                                    notes: 'notes',
                                                    relation_to_eui: 'typical var to eui relationship',
                                                    clean: true)
-            elsif @version >= '0.1.11' # add discrete variables
+            elsif @version >= '0.1.11'.to_version
               rows = @xls.sheet('Variables').parse(enabled: '# variable',
                                                    measure_name_or_var_type: 'type',
                                                    measure_file_name_or_var_display_name: 'parameter display name.*',
@@ -657,13 +703,11 @@ module OpenStudio
           data = {}
           data['data'] = []
 
-          icnt = 0
           measure_index = -1
           variable_index = -1
           measure_name = nil
-          rows.each do |row|
-            icnt += 1
-            next if icnt <= 1 # skip the first line after the header
+          rows.each_with_index do |row, icnt|
+            next if icnt < 1 # skip the first line after the header
             # puts "Parsing line: #{icnt}:#{row}"
 
             # check if we are a measure - nil means that the cell was blank
@@ -678,7 +722,6 @@ module OpenStudio
                 var['name'] = row[:measure_type_or_parameter_name_in_measure]
                 var['index'] = variable_index # order of the variable (not sure of its need)
 
-                var['method'] = row[:sampling_method]
                 var['type'] = row[:variable_type] ? row[:variable_type].downcase : row[:variable_type]
                 var['units'] = row[:units]
 
@@ -693,17 +736,14 @@ module OpenStudio
                   var['distribution']['enumerations'] << 'false'
                 end
 
-                if var['method'] == 'lhs'
-                  var['distribution']['min'] = row[:min]
-                  var['distribution']['max'] = row[:max]
-                  var['distribution']['mean'] = row[:mode]
-                  var['distribution']['stddev'] = row[:stddev]
-                  var['distribution']['discrete_values'] = row[:discrete_values]
-                  var['distribution']['discrete_weights'] = row[:discrete_weights]
-                  var['distribution']['type'] = row[:distribution]
-                elsif var['method'] == 'static'
-                  var['distribution']['static_value'] = row[:default_value]
-                end
+                var['distribution']['min'] = row[:min]
+                var['distribution']['max'] = row[:max]
+                var['distribution']['mean'] = row[:mode]
+                var['distribution']['stddev'] = row[:stddev]
+                var['distribution']['discrete_values'] = row[:discrete_values]
+                var['distribution']['discrete_weights'] = row[:discrete_weights]
+                var['distribution']['type'] = row[:distribution]
+                var['distribution']['static_value'] = row[:default_value]
 
                 var['distribution']['source'] = row[:source]
                 var['notes'] = row[:notes]
@@ -724,7 +764,7 @@ module OpenStudio
               data['data'][measure_index]['name'] = measure_name
               data['data'][measure_index]['enabled'] = row[:enabled] == 'TRUE' ? true : false
               data['data'][measure_index]['measure_file_name'] = row[:measure_file_name_or_var_display_name]
-              if row[:measure_file_name_directory] 
+              if row[:measure_file_name_directory]
                 data['data'][measure_index]['measure_file_name_directory'] = row[:measure_file_name_directory]
               else
                 data['data'][measure_index]['measure_file_name_directory'] = row[:measure_file_name_or_var_display_name].underscore
@@ -741,7 +781,28 @@ module OpenStudio
         end
 
         def parse_outputs
-          rows = @xls.sheet('Outputs').parse
+          rows = nil
+          if @version >= '0.3.0'.to_version
+            rows = @xls.sheet('Outputs').parse(display_name: 'Variable Display Name',
+                                               metadata_id: 'Taxonomy Identifier',
+                                               name: '^Name$',
+                                               units: 'Units',
+                                               visualize: 'Visualize',
+                                               export: 'Export',
+                                               variable_type: 'Variable Type',
+                                               objective_function: 'Objective Function',
+                                               objective_function_target: 'Objective Function Target',
+                                               scaling_factor: 'Scale',
+                                               objective_function_group: 'Objective Function Group')
+          else
+            rows = @xls.sheet('Outputs').parse(display_name: 'Variable Display Name',
+                                               name: '^Name$',
+                                               units: 'units',
+                                               objective_function: 'objective function',
+                                               objective_function_target: 'objective function target',
+                                               scaling_factor: 'scale',
+                                               objective_function_group: 'objective')
+          end
 
           unless rows
             fail "Could not find the sheet name 'Outputs' in excel file #{@root_path}"
@@ -750,35 +811,39 @@ module OpenStudio
           data = {}
           data['output_variables'] = []
 
-          icnt = 0
           variable_index = -1
           group_index = 1
           @algorithm['objective_functions'] = []
 
-          rows.each do |row|
-            icnt += 1
-            # puts "Parsing line: #{icnt}"
-            next if icnt <= 3 # skip the first 3 lines of the file
+          rows.each_with_index do |row, icnt|
+            next if icnt < 2 # skip the first 3 lines of the file
 
             var = {}
-            var['display_name'] = row[0].strip
-            var['name'] = row[1]
-            var['units'] = row[2]
-            var['objective_function'] = row[3].downcase == 'true' ? true : false
-            if var['objective_function'] == true
+            var['display_name'] = row[:display_name]
+            var['metadata_id'] = row[:metadata_id]
+            var['name'] = row[:name]
+            var['units'] = row[:units]
+            var['visualize'] = row[:visualize].downcase == 'true' ? true : false if row[:visualize]
+            var['export'] = row[:export].downcase == 'true' ? true : false if row[:export]
+            var['variable_type'] = row[:variable_type] if row[:variable_type]
+            var['objective_function'] = row[:objective_function].downcase == 'true' ? true : false
+            if var['objective_function']
               @algorithm['objective_functions'] << var['name']
               variable_index += 1
               var['objective_function_index'] = variable_index
             else
               var['objective_function_index'] = nil
             end
-            var['objective_function_target'] = row[4]
-            var['scaling_factor'] = row[5]
-            if row[6].nil?
-              var['objective_function_group'] = group_index
-              group_index += 1
-            else
-              var['objective_function_group'] = row[6]
+            var['objective_function_target'] = row[:objective_function_target]
+            var['scaling_factor'] = row[:scaling_factor]
+
+            if var['objective_function']
+              if row[:objective_function_group].nil?
+                var['objective_function_group'] = group_index
+                group_index += 1
+              else
+                var['objective_function_group'] = row[:objective_function_group]
+              end
             end
             data['output_variables'] << var
           end