lib/openstudio/analysis/translator/excel.rb in openstudio-analysis-1.0.0.rc6 vs lib/openstudio/analysis/translator/excel.rb in openstudio-analysis-1.0.0.rc7

@@ -424,13 +424,13 @@
 
             next if row[0].nil?
 
             if b_settings
               @version = row[1].chomp if row[0] == 'Spreadsheet Version'
-              @settings["#{row[0].snake_case}"] = row[1] if row[0]
+              @settings["#{row[0].to_underscore}"] = row[1] if row[0]
               if @settings['cluster_name']
-                @settings['cluster_name'] = @settings['cluster_name'].snake_case
+                @settings['cluster_name'] = @settings['cluster_name'].to_underscore
               end
 
               if row[0] == 'AWS Tag'
                 @aws_tags << row[1].strip
               end
@@ -443,11 +443,11 @@
                 if row[1]
                   @name = row[1]
                 else
                   @name = SecureRandom.uuid
                 end
-                @analysis_name = @name.snake_case
+                @analysis_name = @name.to_underscore
               end
               if row[0] == 'Export Directory'
                 tmp_filepath = row[1]
                 if (Pathname.new tmp_filepath).absolute?
                   @export_path = tmp_filepath
@@ -461,11 +461,11 @@
                   @measure_paths << tmp_filepath
                 else
                   @measure_paths << File.expand_path(File.join(@root_path, tmp_filepath))
                 end
               end
-              @run_setup["#{row[0].snake_case}"] = row[1] if row[0]
+              @run_setup["#{row[0].to_underscore}"] = row[1] if row[0]
 
               # type cast
               if @run_setup['allow_multiple_jobs']
                 fail "allow_multiple_jobs is no longer a valid option in the Excel file, please delete the row and rerun"
               end
@@ -474,18 +474,18 @@
               end
             elsif b_problem_setup
               if row[0]
                 v = row[1]
                 v.to_i if v % 1 == 0
-                @problem["#{row[0].snake_case}"] = v
+                @problem["#{row[0].to_underscore}"] = v
               end
 
             elsif b_algorithm_setup
               if row[0] && !row[0].empty?
                 v = row[1]
                 v = v.to_i if v % 1 == 0
-                @algorithm["#{row[0].snake_case}"] = v
+                @algorithm["#{row[0].to_underscore}"] = v
               end
             elsif b_weather_files
               if row[0] == 'Weather File'
                 weather_path = row[1]
                 unless (Pathname.new weather_path).absolute?
@@ -504,11 +504,11 @@
               if row[0] && row[0].downcase == 'model'
                 model_path = row[3]
                 unless (Pathname.new model_path).absolute?
                   model_path = File.expand_path(File.join(@root_path, model_path))
                 end
-                @models << { name: tmp_m_name.snake_case, display_name: tmp_m_name, type: row[2], path: model_path }
+                @models << { name: tmp_m_name.to_underscore, display_name: tmp_m_name, type: row[2], path: model_path }
               end
             elsif b_other_libs
               # determine if the path is relative
               other_path = row[2]
               unless (Pathname.new other_path).absolute?
@@ -786,10 +786,10 @@
               data['data'][measure_index]['enabled'] = row[:enabled]
               data['data'][measure_index]['measure_file_name'] = row[:measure_file_name_or_var_display_name]
               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
+                data['data'][measure_index]['measure_file_name_directory'] = row[:measure_file_name_or_var_display_name].to_underscore
               end
               data['data'][measure_index]['measure_type'] = row[:measure_type_or_parameter_name_in_measure]
               data['data'][measure_index]['version'] = @version_id
 
               data['data'][measure_index]['variables'] = []