openstudio-analysis 1.0.0.rc9 → 1.0.0.rc10

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

@@ -35,7 +35,7 @@ module OpenStudio
           if File.exist?(@csv_filename)
             @csv = CSV.read(@csv_filename)
           else
-            fail "File #{@csv_filename} does not exist"
+            raise "File #{@csv_filename} does not exist"
           end
 
           # Remove nil rows and check row length
@@ -66,7 +66,7 @@ module OpenStudio
           # Seperate CSV into meta and measure groups
           measure_tag_index = nil
           @csv.each_with_index { |row, index| measure_tag_index = index if row[0] == 'BEGIN-MEASURES' }
-          fail "ERROR: No 'BEGIN-MEASURES' tag found in input csv file." unless measure_tag_index
+          raise "ERROR: No 'BEGIN-MEASURES' tag found in input csv file." unless measure_tag_index
           meta_rows = []
           measure_rows = []
           @csv.each_with_index do |_, index|
@@ -77,7 +77,7 @@ module OpenStudio
           @setup = parse_csv_meta(meta_rows)
 
           @version = Semantic::Version.new @version
-          fail "CSV interface version #{@version} is no longer supported.  Please upgrade your csv interface to at least 0.0.1" if @version < '0.0.0'
+          raise "CSV interface version #{@version} is no longer supported.  Please upgrade your csv interface to at least 0.0.1" if @version < '0.0.0'
 
           @variables = parse_csv_measures(measure_rows)
 
@@ -103,34 +103,34 @@ module OpenStudio
         def validate_analysis
           # Setup the paths and do some error checking
           @measure_paths.each do |mp|
-            fail "Measures directory '#{mp}' does not exist" unless Dir.exist?(mp)
+            raise "Measures directory '#{mp}' does not exist" unless Dir.exist?(mp)
           end
 
           @models.uniq!
-          fail 'No seed models defined in spreadsheet' if @models.empty?
+          raise 'No seed models defined in spreadsheet' if @models.empty?
 
           @models.each do |model|
-            fail "Seed model does not exist: #{model[:path]}" unless File.exist?(model[:path])
+            raise "Seed model does not exist: #{model[:path]}" unless File.exist?(model[:path])
           end
 
           @weather_paths.uniq!
-          fail 'No weather files found based on what is in the spreadsheet' if @weather_paths.empty?
+          raise 'No weather files found based on what is in the spreadsheet' if @weather_paths.empty?
 
           @weather_paths.each do |wf|
-            fail "Weather file does not exist: #{wf}" unless File.exist?(wf)
+            raise "Weather file does not exist: #{wf}" unless File.exist?(wf)
           end
 
           # This can be a directory as well
           @other_files.each do |f|
-            fail "Other files do not exist for: #{f[:path]}" unless File.exist?(f[:path])
+            raise "Other files do not exist for: #{f[:path]}" unless File.exist?(f[:path])
           end
 
           @worker_inits.each do |f|
-            fail "Worker initialization file does not exist for: #{f[:path]}" unless File.exist?(f[:path])
+            raise "Worker initialization file does not exist for: #{f[:path]}" unless File.exist?(f[:path])
           end
 
           @worker_finals.each do |f|
-            fail "Worker finalization file does not exist for: #{f[:path]}" unless File.exist?(f[:path])
+            raise "Worker finalization file does not exist for: #{f[:path]}" unless File.exist?(f[:path])
           end
 
           FileUtils.mkdir_p(@export_path)
@@ -140,13 +140,13 @@ module OpenStudio
           measure_display_names = @variables.map { |m| m[:measure_data][:display_name] }.compact
           measure_display_names_mult = measure_display_names.select { |m| measure_display_names.count(m) > 1 }.uniq
           if measure_display_names_mult && !measure_display_names_mult.empty?
-            fail "Measure Display Names are not unique for '#{measure_display_names_mult.join('\', \'')}'"
+            raise "Measure Display Names are not unique for '#{measure_display_names_mult.join('\', \'')}'"
           end
 
           variable_names = @variables.map { |v| v[:vars].map { |hash| hash[:display_name] } }.flatten
           dupes = variable_names.select { |e| variable_names.count(e) > 1 }.uniq
           if dupes.count > 0
-            fail "duplicate variable names found in list #{dupes.inspect}"
+            raise "duplicate variable names found in list #{dupes.inspect}"
           end
         end
 
@@ -155,8 +155,8 @@ module OpenStudio
         # @append_model_name [Boolean] Append the name of the seed model to the display name
         # @return [Object] An OpenStudio::Analysis
         def analysis(seed_model = nil, append_model_name = false)
-          fail 'There are no seed models defined in the excel file. Please add one.' if @models.size == 0
-          fail 'There are more than one seed models defined in the excel file. This is not supported by the CSV Translator.' if @models.size > 1 && seed_model.nil?
+          raise 'There are no seed models defined in the excel file. Please add one.' if @models.size == 0
+          raise 'There are more than one seed models defined in the excel file. This is not supported by the CSV Translator.' if @models.size > 1 && seed_model.nil?
 
           seed_model = @models.first if seed_model.nil?
 
@@ -174,12 +174,12 @@ module OpenStudio
                   measure[:measure_data][:local_path_to_measure] = "#{measure_dir_to_add}/measure.rb"
                   break
                 else
-                  fail "Measure in directory '#{measure_dir_to_add}' did not contain a measure.rb file"
+                  raise "Measure in directory '#{measure_dir_to_add}' did not contain a measure.rb file"
                 end
               end
             end
 
-            fail "Could not find measure '#{measure['name']}' in directory named '#{measure['measure_file_name_directory']}' in the measure paths '#{@measure_paths.join(', ')}'" unless measure[:measure_data][:local_path_to_measure]
+            raise "Could not find measure '#{measure['name']}' in directory named '#{measure['measure_file_name_directory']}' in the measure paths '#{@measure_paths.join(', ')}'" unless measure[:measure_data][:local_path_to_measure]
 
             a.workflow.add_measure_from_csv(measure)
           end
@@ -226,7 +226,7 @@ module OpenStudio
           end
 
           # Assign required attributes
-          fail 'Require setting not found: version' unless config_hash[:version]
+          raise 'Require setting not found: version' unless config_hash[:version]
           @version = config_hash[:version]
 
           if config_hash[:analysis_name]
@@ -236,7 +236,7 @@ module OpenStudio
           end
           @analysis_name = @name.to_underscore
 
-          fail 'Require setting not found: measure_path' unless config_hash[:measure_paths]
+          raise 'Require setting not found: measure_path' unless config_hash[:measure_paths]
           config_hash[:measure_paths] = [config_hash[:measure_paths]] unless config_hash[:measure_paths].respond_to?(:each)
           config_hash[:measure_paths].each do |path|
             if (Pathname.new path).absolute?
@@ -246,7 +246,7 @@ module OpenStudio
             end
           end
 
-          fail 'Required setting not found: weather_paths' unless config_hash[:weather_paths]
+          raise 'Required setting not found: weather_paths' unless config_hash[:weather_paths]
           config_hash[:weather_paths] = config_hash[:weather_paths].split(',')
           config_hash[:weather_paths].each do |path|
             if (Pathname.new path).absolute?
@@ -256,7 +256,7 @@ module OpenStudio
             end
           end
 
-          fail 'Required setting not found: models' unless config_hash[:models]
+          raise 'Required setting not found: models' unless config_hash[:models]
           config_hash[:models] = [config_hash[:models]] unless config_hash[:models].respond_to?(:each)
           config_hash[:models].each do |path|
             model_name = File.basename(path).split('.')[0]
@@ -274,7 +274,7 @@ module OpenStudio
             if File.exist? path
               @outputs = MultiJson.load(File.read(path))
             else
-              fail "Could not find output json: #{config_hash[:output_json]}"
+              raise "Could not find output json: #{config_hash[:output_json]}"
             end
           end
 
@@ -295,10 +295,10 @@ module OpenStudio
           end
 
           if config_hash[:allow_multiple_jobs]
-            fail "allow_multiple_jobs is no longer a valid option in the CSV, please delete and rerun"
+            raise 'allow_multiple_jobs is no longer a valid option in the CSV, please delete and rerun'
           end
           if config_hash[:use_server_as_worker]
-            fail "use_server_as_worker is no longer a valid option in the CSV, please delete and rerun"
+            raise 'use_server_as_worker is no longer a valid option in the CSV, please delete and rerun'
           end
 
           # Assign AWS settings
@@ -323,7 +323,7 @@ module OpenStudio
             col_ind = (0..(measure_rows[0].length - 1)).to_a.select { |i| measure_rows[0][i] == measure.to_s }
             col_ind.each do |var_ind|
               tuple = measure.to_s + measure_rows[1][var_ind]
-              fail "Multiple measure_variable tuples found for '#{measure}_#{measure_rows[1][var_ind]}'. These tuples must be unique." if measure_var_list.include? tuple
+              raise "Multiple measure_variable tuples found for '#{measure}_#{measure_rows[1][var_ind]}'. These tuples must be unique." if measure_var_list.include? tuple
               measure_var_list << tuple
               measure_map[measure][measure_rows[1][var_ind].to_sym] = var_ind
             end
@@ -333,19 +333,14 @@ module OpenStudio
           data = []
           measures.each_with_index do |measure, measure_index|
             data[measure_index] = {}
-            measure_xml = ''
-            for i in 0..(@measure_paths.length - 1)
-              if File.exist? File.join(@measure_paths[i], measure.to_s, 'measure.xml')
-                measure_xml = Nokogiri::XML File.read(File.join(@measure_paths[i], measure.to_s, 'measure.xml'))
-                break
-              end
-            end
-            fail "Could not find measure #{measure} xml in measure_paths: '#{@measure_paths.join("\n")}'" if measure_xml == ''
+            measure_xml, measure_type = find_measure(measure.to_s)
+
+            raise "Could not find measure #{measure} xml in measure_paths: '#{@measure_paths.join("\n")}'" unless measure_xml
             measure_data = {}
             measure_data[:classname] = measure_xml.xpath('/measure/class_name').text
             measure_data[:name] = measure_xml.xpath('/measure/name').text
             measure_data[:display_name] = measure_xml.xpath('/measure/display_name').text
-            measure_data[:measure_type] = parse_measure_type(File.join(@measure_paths[i], measure.to_s, 'measure.rb'))
+            measure_data[:measure_type] = measure_type
             measure_data[:uid] = measure_xml.xpath('/measure/uid').text
             measure_data[:version_id] = measure_xml.xpath('/measure/version_id').text
             data[measure_index][:measure_data] = measure_data
@@ -354,30 +349,41 @@ module OpenStudio
 
             # construct the list of variables
             vars.each do |var|
+              # var looks like [:cooling_adjustment, 0]
               var = var[0]
-              next if var.to_s == "None"
+              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
+                if var.to_s == '__SKIP__' || arg.xpath('name').text == var.to_s
                   found_arg = arg
                   break
                 end
               end
 
               # var_json = measure_json['arguments'].select { |hash| hash['local_variable'] == var.to_s }[0]
-              fail "measure.xml for measure #{measure} does not have an argument with argument == #{var}" unless found_arg
+              raise "measure.xml for measure #{measure} does not have an argument with argument == #{var}" unless found_arg
+              var_type = nil
+              var_units = ''
+              if var.to_s == '__SKIP__'
+                var_type = 'boolean'
+                var_units = ''
+              else
+                var_type = found_arg.xpath('type').text.downcase
+                var_units = found_arg.xpath('units')
+              end
+
               var_hash[:name] = var.to_s
               var_hash[:variable_type] = 'variable'
               var_hash[:display_name] = measure_rows[2][measure_map[measure][var]]
               var_hash[:display_name_short] = var_hash[:display_name]
               # var_hash[:name] = var_json['local_variable']
-              var_hash[:type] = found_arg.xpath('type').text.downcase
-              var_hash[:units] = found_arg.xpath('units')
+              var_hash[:type] = var_type
+              var_hash[:units] = var_units
               var_hash[:distribution] = {}
               case var_hash[:type].downcase
-                when 'bool', 'boolean' # is 'boolean' necessary? it's not in the enum catch
-                  var_hash[:distribution][:values] = (3..(measure_rows.length - 1)).map { |value| measure_rows[value.to_i][measure_map[measure][var]].to_s == 'true' }
+                when 'bool', 'boolean'
+                  var_hash[:distribution][:values] = (3..(measure_rows.length - 1)).map { |value| measure_rows[value.to_i][measure_map[measure][var]].to_s.downcase == 'true' }
                   var_hash[:distribution][:maximum] = true
                   var_hash[:distribution][:minimum] = false
                   var_hash[:distribution][:mode] = var_hash[:distribution][:values].group_by { |i| i }.max { |x, y| x[1].length <=> y[1].length }[0]
@@ -423,6 +429,19 @@ module OpenStudio
 
         private
 
+        # Find the measure in the measure path
+        def find_measure(measure_name)
+          @measure_paths.each do |mp|
+            measure_xml = File.join(mp, measure_name, 'measure.xml')
+            measure_rb = File.join(mp, measure_name, 'measure.rb')
+            if File.exist?(measure_xml) && File.exist?(measure_rb)
+              return Nokogiri::XML File.read(measure_xml), parse_measure_type(measure_rb)
+            end
+          end
+
+          return nil, nil
+        end
+
         def parse_measure_type(measure_filename)
           measure_string = File.read(measure_filename)
 
@@ -435,7 +454,7 @@ module OpenStudio
           elsif measure_string =~ /OpenStudio::Ruleset::UtilityUserScript/
             return 'UtilityUserScript'
           else
-            fail "measure type is unknown with an inherited class in #{measure_filename}"
+            raise "measure type is unknown with an inherited class in #{measure_filename}"
           end
         end
       end

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

@@ -37,7 +37,7 @@ module OpenStudio
           if File.exist?(@xls_filename)
             @xls = Roo::Spreadsheet.open(@xls_filename)
           else
-            fail "File #{@xls_filename} does not exist"
+            raise "File #{@xls_filename} does not exist"
           end
 
           # Initialize some other instance variables
@@ -66,7 +66,7 @@ module OpenStudio
           @setup = parse_setup
 
           @version = Semantic::Version.new @version
-          fail "Spreadsheet version #{@version} is no longer supported.  Please upgrade your spreadsheet to at least 0.1.9" if @version < '0.1.9'
+          raise "Spreadsheet version #{@version} is no longer supported.  Please upgrade your spreadsheet to at least 0.1.9" if @version < '0.1.9'
 
           @variables = parse_variables
 
@@ -94,34 +94,34 @@ module OpenStudio
         def validate_analysis
           # Setup the paths and do some error checking
           @measure_paths.each do |mp|
-            fail "Measures directory '#{mp}' does not exist" unless Dir.exist?(mp)
+            raise "Measures directory '#{mp}' does not exist" unless Dir.exist?(mp)
           end
 
           @models.uniq!
-          fail 'No seed models defined in spreadsheet' if @models.empty?
+          raise 'No seed models defined in spreadsheet' if @models.empty?
 
           @models.each do |model|
-            fail "Seed model does not exist: #{model[:path]}" unless File.exist?(model[:path])
+            raise "Seed model does not exist: #{model[:path]}" unless File.exist?(model[:path])
           end
 
           @weather_files.uniq!
-          fail 'No weather files found based on what is in the spreadsheet' if @weather_files.empty?
+          raise 'No weather files found based on what is in the spreadsheet' if @weather_files.empty?
 
           @weather_files.each do |wf|
-            fail "Weather file does not exist: #{wf}" unless File.exist?(wf)
+            raise "Weather file does not exist: #{wf}" unless File.exist?(wf)
           end
 
           # This can be a directory as well
           @other_files.each do |f|
-            fail "Other files do not exist for: #{f[:path]}" unless File.exist?(f[:path])
+            raise "Other files do not exist for: #{f[:path]}" unless File.exist?(f[:path])
           end
 
           @worker_inits.each do |f|
-            fail "Worker initialization file does not exist for: #{f[:path]}" unless File.exist?(f[:path])
+            raise "Worker initialization file does not exist for: #{f[:path]}" unless File.exist?(f[:path])
           end
 
           @worker_finals.each do |f|
-            fail "Worker finalization file does not exist for: #{f[:path]}" unless File.exist?(f[:path])
+            raise "Worker finalization file does not exist for: #{f[:path]}" unless File.exist?(f[:path])
           end
 
           FileUtils.mkdir_p(@export_path)
@@ -131,7 +131,7 @@ module OpenStudio
           measure_display_names = @variables['data'].map { |m| m['enabled'] ? m['display_name'] : nil }.compact
           measure_display_names_mult = measure_display_names.select { |m| measure_display_names.count(m) > 1 }.uniq
           if measure_display_names_mult && !measure_display_names_mult.empty?
-            fail "Measure Display Names are not unique for '#{measure_display_names_mult.join('\', \'')}'"
+            raise "Measure Display Names are not unique for '#{measure_display_names_mult.join('\', \'')}'"
           end
 
           # verify that all continuous variables have all the data needed and create a name map
@@ -145,7 +145,7 @@ module OpenStudio
 
                   # make sure that variables have static values
                   if variable['distribution']['static_value'].nil? || variable['distribution']['static_value'] == ''
-                    fail "Variable #{measure['name']}:#{variable['name']} needs a static value"
+                    raise "Variable #{measure['name']}:#{variable['name']} needs a static value"
                   end
 
                   if variable['type'] == 'enum' || variable['type'] == 'Choice'
@@ -153,39 +153,39 @@ module OpenStudio
                   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"
+                        raise "Variable #{measure['name']}:#{variable['name']} needs discrete values"
                       end
                     elsif variable['distribution']['type'] == 'integer_sequence'
                       if variable['distribution']['mean'].nil? || variable['distribution']['mean'] == ''
-                        fail "Variable #{measure['name']}:#{variable['name']} must have a mean/mode"
+                        raise "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"
+                        raise "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 
+                        raise "Variable #{measure['name']}:#{variable['name']} must have a maximum"
+                      end
                     else
                       if variable['distribution']['mean'].nil? || variable['distribution']['mean'] == ''
-                        fail "Variable #{measure['name']}:#{variable['name']} must have a mean"
+                        raise "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"
+                        raise "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"
+                      raise "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"
+                      raise "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"
+                      raise "Variable #{measure['name']}:#{variable['name']} must have a maximum"
                     end
                     unless variable['type'] == 'string' || variable['type'] =~ /bool/
                       if variable['distribution']['min'] > variable['distribution']['max']
-                        fail "Variable min is greater than variable max for #{measure['name']}:#{variable['name']}"
+                        raise "Variable min is greater than variable max for #{measure['name']}:#{variable['name']}"
                       end
                     end
 
@@ -197,7 +197,7 @@ module OpenStudio
 
           dupes = variable_names.select { |e| variable_names.count(e) > 1 }.uniq
           if dupes.count > 0
-            fail "duplicate variable names found in list #{dupes.inspect}"
+            raise "duplicate variable names found in list #{dupes.inspect}"
           end
 
           # most of the checks will raise a runtime exception, so this true will never be called
@@ -210,8 +210,8 @@ module OpenStudio
         # @append_model_name [Boolean] Append the name of the seed model to the display name
         # @return [Object] An OpenStudio::Analysis
         def analysis(seed_model = nil, append_model_name = false)
-          fail 'There are no seed models defined in the excel file. Please add one.' if @models.size == 0
-          fail "There are more than one seed models defined in the excel file. Call 'analyses' to return the array" if @models.size > 1 && seed_model.nil?
+          raise 'There are no seed models defined in the excel file. Please add one.' if @models.size == 0
+          raise "There are more than one seed models defined in the excel file. Call 'analyses' to return the array" if @models.size > 1 && seed_model.nil?
 
           seed_model = @models.first if seed_model.nil?
 
@@ -231,12 +231,12 @@ module OpenStudio
                   measure['local_path_to_measure'] = "#{measure_dir_to_add}/measure.rb"
                   break
                 else
-                  fail "Measure in directory '#{measure_dir_to_add}' did not contain a measure.rb file"
+                  raise "Measure in directory '#{measure_dir_to_add}' did not contain a measure.rb file"
                 end
               end
             end
 
-            fail "Could not find measure '#{measure['name']}' in directory named '#{measure['measure_file_name_directory']}' in the measure paths '#{@measure_paths.join(', ')}'" unless measure['local_path_to_measure']
+            raise "Could not find measure '#{measure['name']}' in directory named '#{measure['measure_file_name_directory']}' in the measure paths '#{@measure_paths.join(', ')}'" unless measure['local_path_to_measure']
 
             a.workflow.add_measure_from_excel(measure)
           end
@@ -426,7 +426,7 @@ module OpenStudio
 
             if b_settings
               @version = row[1].chomp if row[0] == 'Spreadsheet Version'
-              @settings["#{row[0].to_underscore}"] = row[1] if row[0]
+              @settings[(row[0].to_underscore).to_s] = row[1] if row[0]
               if @settings['cluster_name']
                 @settings['cluster_name'] = @settings['cluster_name'].to_underscore
               end
@@ -463,27 +463,27 @@ module OpenStudio
                   @measure_paths << File.expand_path(File.join(@root_path, tmp_filepath))
                 end
               end
-              @run_setup["#{row[0].to_underscore}"] = row[1] if row[0]
+              @run_setup[(row[0].to_underscore).to_s] = 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"
+                raise 'allow_multiple_jobs is no longer a valid option in the Excel file, please delete the row and rerun'
               end
               if @run_setup['use_server_as_worker']
-                fail "use_server_as_worker is no longer a valid option in the Excel file, please delete the row and rerun"
+                raise 'use_server_as_worker is no longer a valid option in the Excel file, please delete the row and rerun'
               end
             elsif b_problem_setup
               if row[0]
                 v = row[1]
                 v.to_i if v % 1 == 0
-                @problem["#{row[0].to_underscore}"] = v
+                @problem[(row[0].to_underscore).to_s] = 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].to_underscore}"] = v
+                @algorithm[(row[0].to_underscore).to_s] = v
               end
             elsif b_weather_files
               if row[0] == 'Weather File'
@@ -575,7 +575,7 @@ module OpenStudio
                                                    notes: /notes/i,
                                                    relation_to_eui: /typical\svar\sto\seui\srelationship/i,
                                                    clean: true)
-            elsif @version >= '0.3.0'.to_version            
+            elsif @version >= '0.3.0'.to_version
               rows = @xls.sheet('Variables').parse(enabled: /# variable/i,
                                                    measure_name_or_var_type: /type/i,
                                                    measure_file_name_or_var_display_name: /parameter\sdisplay\sname.*/i,
@@ -692,7 +692,7 @@ module OpenStudio
             raise "Unable to parse spreadsheet #{@xls_filename} with version #{@version} due to error: #{e.message}"
           end
 
-          fail "Could not find the sheet name 'Variables' in excel file #{@root_path}" unless rows
+          raise "Could not find the sheet name 'Variables' in excel file #{@root_path}" unless rows
 
           # map the data to another hash that is more easily processed
           data = {}
@@ -841,11 +841,11 @@ module OpenStudio
                                                objective_function_target: /objective\sfunction\starget/i,
                                                scaling_factor: /scale/i,
                                                objective_function_group: /objective/i)
-            
+
           end
 
           unless rows
-            fail "Could not find the sheet name 'Outputs' in excel file #{@root_path}"
+            raise "Could not find the sheet name 'Outputs' in excel file #{@root_path}"
           end
 
           data = {}

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

@@ -1,7 +1,6 @@
 module OpenStudio
   module Analysis
     module Translator
-
       class Workflow
         attr_reader :osa_filename
         attr_reader :root_path
@@ -24,7 +23,7 @@ module OpenStudio
           if File.exist?(@osa_filename)
             @osa = ::JSON.parse(File.read(@osa_filename), symbolize_names: true)[:analysis]
           else
-            fail "File #{@osa_filename} does not exist"
+            raise "File #{@osa_filename} does not exist"
           end
 
           # Initialize some other instance variables
@@ -68,11 +67,11 @@ module OpenStudio
             # warn('data_point selector in ods will be changed to datapoint in version 1.0') # NL this isn't true anymore.
             osd = ::JSON.parse(File.read(osd_filename), symbolize_names: true)[:data_point]
           else
-            fail "File #{osd_filename} does not exist"
+            raise "File #{osd_filename} does not exist"
           end
 
           # Parse the osd hash based off of the osa hash. First check that the analysis id matches
-          fail "File #{osd_filename} does not reference #{@osa_id}." unless @osa_id == osd[:analysis_id]
+          raise "File #{osd_filename} does not reference #{@osa_id}." unless @osa_id == osd[:analysis_id]
           # @todo (rhorsey) Fix the spec so this line can be uncommented
           osw_steps_instance = @steps
           osw_steps_instance.each_with_index do |step, i|

data/lib/openstudio/analysis/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Analysis
-    VERSION = '1.0.0.rc9'
+    VERSION = '1.0.0.rc10'.freeze
   end
 end

data/lib/openstudio/analysis/workflow.rb

@@ -4,7 +4,7 @@ module OpenStudio
     class Workflow
       attr_reader :items
       # allow users to access the items via the measures attribute accessor
-      alias_method :measures, :items
+      alias measures items
 
       # Create an instance of the OpenStudio::Analysis::Workflow
       #
@@ -46,12 +46,12 @@ module OpenStudio
           if measure_hash.nil? && File.exist?(File.join(local_path_to_measure, 'measure.json'))
             measure_hash = JSON.parse(File.read(File.join(local_path_to_measure, 'measure.json')), symbolize_names: true)
           elsif measure_hash.nil?
-            fail 'measure.json was not found and was not automatically created'
+            raise 'measure.json was not found and was not automatically created'
           end
 
           add_measure(instance_name, instance_display_name, local_path_to_measure, measure_hash)
         else
-          fail "could not find measure to add to workflow #{local_path_to_measure}"
+          raise "could not find measure to add to workflow #{local_path_to_measure}"
         end
 
         @items.last
@@ -186,7 +186,7 @@ module OpenStudio
       def find_measure(instance_name)
         @items.find { |i| i.name == instance_name }
       end
-      alias_method :find_workflow_step, :find_measure
+      alias find_workflow_step find_measure
 
       # Return all the variables in the analysis as an array. The list that is returned is read only.
       #
@@ -209,7 +209,7 @@ module OpenStudio
 
           h = arr
         else
-          fail "Version #{version} not yet implemented for to_hash"
+          raise "Version #{version} not yet implemented for to_hash"
         end
 
         h
@@ -222,7 +222,7 @@ module OpenStudio
         if version == 1
           JSON.pretty_generate(to_hash(version))
         else
-          fail "Version #{version} not yet implemented for to_json"
+          raise "Version #{version} not yet implemented for to_json"
         end
       end
 
@@ -254,7 +254,7 @@ module OpenStudio
             end
           end
 
-          fail "Could not find local measure when loading workflow for #{wf[:measure_definition_class_name]} in #{File.basename(wf[:measure_definition_directory])}. You may have to add measure paths to OpenStudio::Analysis.measure_paths" unless local_measure_dir
+          raise "Could not find local measure when loading workflow for #{wf[:measure_definition_class_name]} in #{File.basename(wf[:measure_definition_directory])}. You may have to add measure paths to OpenStudio::Analysis.measure_paths" unless local_measure_dir
 
           o.add_measure_from_analysis_hash(wf[:name], wf[:display_name], local_measure_dir, wf)
         end
@@ -272,7 +272,7 @@ module OpenStudio
           j = JSON.parse(File.read(filename), symbolize_names: true)
           o = OpenStudio::Analysis::Workflow.load(j)
         else
-          fail "Could not find workflow file #{filename}"
+          raise "Could not find workflow file #{filename}"
         end
 
         o