Skip to content
This repository has been archived by the owner on Oct 22, 2019. It is now read-only.

Commit

Permalink
swap roadmap fix for transport
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandrebini committed Mar 15, 2012
1 parent 5be2a5c commit b3ca1b3
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
20 changes: 19 additions & 1 deletion lib/ga/transport.rb
Expand Up @@ -47,8 +47,26 @@ def distance_to(start_machine, goal_machine)
def roadmap=new_roadmap
current_paths = paths
current_paths.delete_if do |r|
new_roadmap.paths.find{ |m| m.first == r.start && m.last == r.goal }.blank?
new_roadmap.paths.find do |machine_pairs|
@schema.position_of_machine(machine_pairs.first) == r.start &&
@schema.position_of_machine(machine_pairs.last) == r.goal
end.blank?
end

new_roadmap.paths.each_with_index do |machine_pairs, index|
start_position = @schema.position_of_machine(machine_pairs.first)
goal_position = @schema.position_of_machine(machine_pairs.last)

next if current_paths[index].present? &&
current_paths[index].start == start_position &&
current_paths[index].goal == goal_position

puts "passou"
current_paths.insert index, PathFinder.find(start_position, goal_position)
end

@roadmap = new_roadmap
@paths = current_paths
end

end
1 change: 1 addition & 0 deletions spec/lib/ga/transport_spec.rb
Expand Up @@ -109,6 +109,7 @@
paths_before = transport.paths.dup

transport.roadmap = Fabricate(:roadmap, :machines => [@machineB, @machineC, @machineD, @machineE])

transport.paths[0].should == paths_before[1]
transport.paths[1].should == paths_before[2]
transport.paths[2].start.should == @positionD
Expand Down

0 comments on commit b3ca1b3

Please sign in to comment.