@@ -42,7 +42,7 @@ module Cabar dependents = dependents_proc.call(e) dependents = dependents.select do | c | # Update dependent's depth. - if depth[c] < d + if ! depth[c] || (depth[c] < d) depth[c] = d end @@ -53,7 +53,7 @@ module Cabar false else # Mark edge as visited. - edge_visited[edge] ||= 1 + edge_visited[edge] ||= 0 edge_visited[edge] += 1 end end @@ -96,6 +96,13 @@ module Cabar end #module_method :sort_topographic + + # Returns the topographically sorted subset of all nodes in a directed graph. + # all_elements must list all the nodes in the directed graph. + def topographic_sort_subset subset, all_nodes, opts = nil + topographic_sort(all_nodes, opts) & subset + end + end # module end # module lib/ruby/cabar/sort.rb @@ -73,7 +73,7 @@ task :test_specs do spec_files = Dir["test/**/*.spec"].sort unless spec_files.empty? ENV['RUBYLIB'] = ($:.dup << 'test/ruby').join(':') - sh "spec -f specdoc #{spec_files.join(' ')}" + sh "spec -b -f specdoc #{spec_files.join(' ')}" end end rake_helper.rb @@ -10,34 +10,79 @@ describe Cabar::Sort do include Cabar::Sort before do - # Test +=begin + +Sort the graph nodes (@unsorted) such that all keys in +@children are listed before all values listed as dependents: + +a ----> c - + \ \ + ----> d ---> x ---> y ---> z ---> 1 + / \ +b ---------------- --> 2 + +=end + @srand ||= srand($$ ^ Time.now.to_i) + @children = { - 'a' => [ 'b', 'c' ], - 'b' => [ 'x' ], + 'a' => [ 'c', 'd' ], + 'b' => [ 'y' ], 'c' => [ 'x' ], + 'd' => [ 'x' ], 'x' => [ 'y' ], 'y' => [ 'z' ], 'z' => [ '1', '2' ], } @children_proc = lambda { | x | @children[x] || [ ] } @unsorted = (@children.keys + @children.values).flatten.uniq + # Correct answers are: @sorted = [ - # 'b' and 'c' are mutually independent, but depend on 'a'. - [ 'a', 'b', 'c', 'x', 'y', 'z', '1', '2' ], - [ 'a', 'b', 'c', 'x', 'y', 'z', '2', '1' ], - [ 'a', 'c', 'b', 'x', 'y', 'z', '1', '2' ], - [ 'a', 'c', 'b', 'x', 'y', 'z', '2', '1' ], - ] + # eg: 'c' and 'd' are mutually independent, but 'a' depends on both. + [ 'a', 'b', 'c', 'd', 'x', 'y', 'z', '1', '2' ], + [ 'a', 'b', 'd', 'c', 'x', 'y', 'z', '1', '2' ], + [ 'a', 'b', 'c', 'd', 'x', 'y', 'z', '2', '1' ], + [ 'a', 'b', 'd', 'c', 'x', 'y', 'z', '2', '1' ], + [ 'b', 'a', 'c', 'd', 'x', 'y', 'z', '1', '2' ], + [ 'b', 'a', 'd', 'c', 'x', 'y', 'z', '1', '2' ], + [ 'b', 'a', 'c', 'd', 'x', 'y', 'z', '2', '1' ], + [ 'b', 'a', 'd', 'c', 'x', 'y', 'z', '2', '1' ], + ] end it "sorts random permutations topologically." do 1000.times do permutation = @unsorted.sort { | a, b | rand(10000) <=> rand(10000) } result = topographic_sort(permutation, :dependents => @children_proc) - # puts "permutation = #{permutation.inspect}" - # puts " result = #{result.inspect}" - @sorted.any? { | x | result === x }.should == true + correct = @sorted.any? { | x | result === x } == true +=begin + puts "permutation = #{permutation.inspect}" + puts " result = #{result.inspect}" + puts " correct = #{correct.inspect}" + exit(1) unless correct +=end + correct.should == true + end + + end + + it "sorts random subset permutations topologically." do + 1000.times do + unsorted = @unsorted.select { | n | rand(2) == 0 } + sorted = @sorted.map { | x | x.select { | n | unsorted.include? n } }.uniq + + permutation = unsorted.sort { | a, b | rand(10000) <=> rand(10000) } + result = topographic_sort_subset(permutation, @unsorted, :dependents => @children_proc) + # result = topographic_sort(permutation, :dependents => @children_proc) + correct = sorted.any? { | x | result === x } == true +=begin + puts "permutation = #{permutation.inspect}" + puts "sorted = \n #{sorted.map{|x| x.inspect}.join(",\n ")}" + puts " result = #{result.inspect}" + puts " correct = #{correct.inspect}" +# exit(1) unless correct +=end + correct.should == true end end @@ -62,34 +107,39 @@ describe Cabar::Sort do it "handles cyclical graphs." do @children['z'] << 'x' - @sorted << ["a", "b", "c", "2", "1", "x", "y", "z"] - @sorted << ["a", "c", "b", "y", "z", "2", "x", "1"] - @sorted << ["a", "c", "b", "z", "x", "1", "2", "y"] - @sorted << ["a", "b", "c", "2", "x", "1", "y", "z"] - @sorted << ["a", "b", "c", "y", "z", "2", "x", "1"] - @sorted << ["a", "c", "b", "1", "x", "2", "y", "z"] - @sorted << ["a", "c", "b", "z", "1", "2", "x", "y"] - @sorted << ["a", "b", "c", "y", "z", "2", "1", "x"] - @sorted << ["a", "b", "c", "x", "1", "2", "y", "z"] - @sorted << ["a", "b", "c", "1", "x", "2", "y", "z"] - @sorted << ["a", "b", "c", "z", "2", "x", "1", "y"] - @sorted << ["a", "c", "b", "2", "x", "1", "y", "z"] - @sorted << ["a", "b", "c", "y", "z", "x", "1", "2"] - @sorted << ["a", "b", "c", "x", "2", "1", "y", "z"] - @sorted << ["a", "c", "b", "x", "1", "2", "y", "z"] - @sorted << ["a", "c", "b", "y", "z", "x", "2", "1"] - @sorted << ["a", "b", "c", "1", "2", "x", "y", "z"] - @sorted << ["a", "b", "c", "z", "1", "2", "x", "y"] - @sorted << ["a", "b", "c", "y", "z", "1", "2", "x"] + @sorted << ["a", "b", "c", "d", "2", "1", "x", "y", "z"] + @sorted << ["a", "b", "d", "c", "y", "z", "2", "x", "1"] + @sorted << ["a", "b", "d", "c", "z", "x", "1", "2", "y"] + @sorted << ["a", "b", "c", "d", "2", "x", "1", "y", "z"] + @sorted << ["a", "b", "c", "d", "y", "z", "2", "x", "1"] + @sorted << ["a", "b", "d", "c", "1", "x", "2", "y", "z"] + @sorted << ["a", "b", "d", "c", "z", "1", "2", "x", "y"] + @sorted << ["a", "b", "c", "d", "y", "z", "2", "1", "x"] + @sorted << ["a", "b", "c", "d", "x", "1", "2", "y", "z"] + @sorted << ["a", "b", "c", "d", "1", "x", "2", "y", "z"] + @sorted << ["a", "b", "c", "d", "z", "2", "x", "1", "y"] + @sorted << ["a", "b", "d", "c", "2", "x", "1", "y", "z"] + @sorted << ["a", "b", "c", "d", "y", "z", "x", "1", "2"] + @sorted << ["a", "b", "c", "d", "x", "2", "1", "y", "z"] + @sorted << ["a", "b", "d", "c", "x", "1", "2", "y", "z"] + @sorted << ["a", "b", "d", "c", "y", "z", "x", "2", "1"] + @sorted << ["a", "b", "c", "d", "1", "2", "x", "y", "z"] + @sorted << ["a", "b", "c", "d", "z", "1", "2", "x", "y"] + @sorted << ["a", "b", "c", "d", "y", "z", "1", "2", "x"] 1000.times do permutation = @unsorted.sort { | a, b | rand(10000) <=> rand(10000) } result = topographic_sort(permutation, :dependents => @children_proc, :order => lambda { | a, b | a <=> b }) - # puts "permutation = #{permutation.inspect}" - # puts " result = #{result.inspect}" - @sorted.any? { | x | result === x }.should == true + correct = @sorted.any? { | x | result === x } == true +=begin + puts "permutation = #{permutation.inspect}" + puts " result = #{result.inspect}" + puts " correct = #{correct.inspect}" + exit(1) unless correct +=end + correct.should == true end end test/ruby/cabar/sort.spec 9673fd454cfea99a87e7fa97006e5c930ad0b413 kstephens kstephens@3b289f47-807e-410a-85af-7ee1d5ead6e2 http://github.com/jlawler/cabar/commit/cc4b0a9ba65b66b55204d97ffd5b2b05820b954b cc4b0a9ba65b66b55204d97ffd5b2b05820b954b 2008-06-04T16:39:00-07:00 2008-06-04T16:39:00-07:00 Added topographic_sort_subset. git-svn-id: http://cabar.rubyforge.org/svn/cabar/trunk@325 3b289f47-807e-410a-85af-7ee1d5ead6e2 e2daf258faab20ea5fc2fd95e56b851b00bb9778 kstephens kstephens@3b289f47-807e-410a-85af-7ee1d5ead6e2