lib/coderunner/run.rb in coderunner-0.11.2 vs lib/coderunner/run.rb in coderunner-0.11.3

- old
+ new

@@ -229,28 +229,28 @@ @directory = Dir.pwd @relative_directory = File.expand_path(Dir.pwd).sub(File.expand_path(@runner.root_folder) + '/', '') # p @directory @readme = nil - if @code_runner_version < Version.new('0.5.1') - begin - update_from_version_0_5_0_and_lower - rescue Errno::ENOENT => err # No code runner files were found - unless @runner.heuristic_analysis - puts err - raise CRFatal.new("No code runner files found: suggest using heuristic analysis (flag -H if you are using the code_runner script)") - end - unless @runner.current_request == :traverse_directories - @runner.requests.push :traverse_directories unless @runner.requests.include? :traverse_directories - raise CRMild.new("can't begin heuristic analysis until there has been a sweep over all directories") # this will get rescued - end - @runner.increment_max_id - @id = @runner.max_id - @job_no = -1 - run_heuristic_analysis - end - end + #if @code_runner_version < Version.new('0.5.1') + #begin + #update_from_version_0_5_0_and_lower + #rescue Errno::ENOENT => err # No code runner files were found + #unless @runner.heuristic_analysis + #puts err + #raise CRFatal.new("No code runner files found: suggest using heuristic analysis (flag -H if you are using the code_runner script)") + #end + #unless @runner.current_request == :traverse_directories + #@runner.requests.push :traverse_directories unless @runner.requests.include? :traverse_directories + #raise CRMild.new("can't begin heuristic analysis until there has been a sweep over all directories") # this will get rescued + #end + #@runner.increment_max_id + #@id = @runner.max_id + #@job_no = -1 + #run_heuristic_analysis + #end + #end read_info begin read_results if FileTest.exist? 'code_runner_results.rb' @@ -440,11 +440,11 @@ # This function set the input parameters of the run using the following sources in ascending order of priority: main defaults file (in the code module folder), local defaults file (in the local Directory), parameters (an inspected hash usually specified on the command line). def update_submission_parameters(parameters, start_from_defaults=true) logf(:update_submission_parameters) if start_from_defaults - upgrade_defaults_from_0_5_0 if self.class.constants.include? :DEFAULTS_FILE_NAME_0_5_0 + #upgrade_defaults_from_0_5_0 if self.class.constants.include? :DEFAULTS_FILE_NAME_0_5_0 main_defaults_file = "#{defaults_location}/#{defaults_file_name}" main_defaults_file_text = File.read(main_defaults_file) evaluate_defaults_file(main_defaults_file) unless FileTest.exist?(defaults_file_name) @@ -751,14 +751,14 @@ end @readout_list = (rcp.variables+rcp.results) unless rcp.readout_list # (variables+results).each{|v| const_get(:READOUT_LIST).push v} unless READOUT_LIST.size > 0 - if rcp.variables_0_5_0 - rcp.variables_0_5_0.dup.each do |par, info| #for backwards compatibility only - rcp.variables_0_5_0[par] = info[0] if info.class == Array - end - end + #if rcp.variables_0_5_0 + #rcp.variables_0_5_0.dup.each do |par, info| #for backwards compatibility only + #rcp.variables_0_5_0[par] = info[0] if info.class == Array + #end + #end