excel.rb in openstudio-analysis-0.4.5

- old
+ new

@@ -233,11 +233,11 @@
           @other_files.each do |library|
             a.libraries.add(library[:path], library_name: library[:lib_zip_name])
           end
 
           @worker_inits.each do |w|
-            a.worker_inits.add(w[:path],  args: w[:args])
+            a.worker_inits.add(w[:path], args: w[:args])
           end
 
           @worker_finals.each do |w|
             a.worker_finalizes.add(w[:path], args: w[:args])
           end
@@ -699,11 +699,11 @@
                 var['distribution'] = {}
 
                 # parse the choices/enums
                 if var['type'] == 'enum' || var['type'] == 'choice' # this is now a choice
                   if row[:enums]
-                    var['distribution']['enumerations'] = row[:enums].gsub('|', '').split(',').map(&:strip)
+                    var['distribution']['enumerations'] = row[:enums].delete('|').split(',').map(&:strip)
                   end
                 elsif var['type'] == 'bool'
                   var['distribution']['enumerations'] = []
                   var['distribution']['enumerations'] << 'true' # TODO: should this be a real bool?
                   var['distribution']['enumerations'] << 'false'
@@ -756,10 +756,10 @@
               data['data'][measure_index] = {}
 
               # generate name id
               # TODO: put this into a logger. puts "Parsing measure #{row[1]}"
               display_name = row[:measure_name_or_var_type]
-              measure_name = display_name.downcase.strip.gsub('-', '_').gsub(' ', '_').gsub('__', '_')
+              measure_name = display_name.downcase.strip.tr('-', '_').tr(' ', '_').gsub('__', '_')
               data['data'][measure_index]['display_name'] = display_name
               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]