From 99a5cb1f207eab17550c301205b05ee505a08a80 Mon Sep 17 00:00:00 2001 From: otherl Date: Sun, 29 Sep 2013 20:08:38 +0100 Subject: Removed the cashe for previously run routes as the graph structure change is incompatible with it. --- blatube.rb | 10 +++------- cache/.gitignore | 4 ---- 2 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 cache/.gitignore diff --git a/blatube.rb b/blatube.rb index f82869d..d8e2407 100644 --- a/blatube.rb +++ b/blatube.rb @@ -108,13 +108,8 @@ def add_terminals end def calculate_routes - routes,distances = YAML::load(File.open("cache/#{@from_station}_#{@weight == 'distance' ? @weight : "#{@weight}_#{@change_time}"}.yaml", 'r')) - @distances = Hash.new(INFINITY).merge distances - @routes = Hash.new(-1).merge routes -rescue Errno::ENOENT add_change_time unless @weight == 'distance' run_algorithm @graph, @graph.keys, @from_station.upcase - File.new("cache/#{@from_station}_#{@weight == 'distance' ? @weight : "#{@weight}_#{@change_time}"}.yaml", 'w') << [@routes,@distances].to_yaml end #TODO: changes on the same line (eg. 'CAMDEN TOWN') @@ -228,9 +223,10 @@ begin else get_line_status end - puts @output.join ' ' rescue StandardError => e - puts (@output << e.message).join ' ' + @output << e.message puts e.message puts e.backtrace +ensure + puts @output.join ' ' end diff --git a/cache/.gitignore b/cache/.gitignore deleted file mode 100644 index 5e7d273..0000000 --- a/cache/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore everything in this directory -* -# Except this file -!.gitignore -- cgit v1.2.3