@@ -46,17 +46,17 @@ class Mapper @stops.detect {|stop| stop.stop_id == stop_name} end - def isochrone(stop, time) + def forward_isochrone(stop, time) @best_times = {stop => time} @stack = [stop] until @stack.empty? - traverse(@stack.pop, time) + traverse_forward(@stack.pop, time) end @best_times end private - def traverse(stop,time) + def traverse_forward(stop,time) stop.available_hops_after(time).each do |hop| if @best_times[hop.destination].nil? || @best_times[hop.destination] > hop.arrival_time @best_times[hop.destination] = hop.arrival_time mapper.rb @@ -23,7 +23,7 @@ class MapperTest < Test::Unit::TestCase assert_equal "NANAA", m.stop("STAGECOACH").available_hops.detect {|hop| hop.trip_id == "CITY1"}.destination.stop_id end - def test_isochrone_creation + def test_forward_isochrone_creation m = MapperFactory.new('sample-feed').mapper(Date.new(2008, 11, 18)) nanaa = m.stop("NANAA") assert_not_nil nanaa @@ -31,7 +31,7 @@ class MapperTest < Test::Unit::TestCase # http://www.google.com/maps?ttype=dep&saddr=North+Ave+at+N+A+Ave+Beatty,+NV&daddr=W+Cottonwood+Dr+at+A+Ave+S+Beatty,+NV&ie=UTF8&f=d&dirflg=r # 6:07am Depart North Ave / N A Ave (Demo) # 6:26am Arrive E Main St / S Irving St (Demo) - isochrone = m.isochrone(nanaa, Time.parse("6:07:00")) + isochrone = m.forward_isochrone(nanaa, Time.parse("6:07:00")) assert_equal Time.parse("6:26:00"), isochrone[m.stop("EMSI")] assert_equal Time.parse("6:07:00"), isochrone[nanaa], "should not be able to get to departure stop before we left" #puts isochrone.collect {|key,val| [key.stop_id, val]}.sort_by(&:last).inspect mapper_test.rb fe6ab5b5ca4b36673d69472638974d80cb3b912c Daniel Haran chebuctonian@mgmail.com http://github.com/danielharan/isochrones/commit/c2605d9b12cbb79ec6f6028af53adcbcb4408f2a c2605d9b12cbb79ec6f6028af53adcbcb4408f2a 2008-11-18T12:18:40-08:00 2008-11-18T12:14:47-08:00 rename isochrone method 3a37f3c733d3abec9f02674cb73e771dbe0bd69e Daniel Haran chebuctonian@mgmail.com