diff-lcs 2.0.0.beta.1 → 2.0.0.beta.2

data/test/test_sdiff.rb

@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+class TestSDiff < Minitest::Test
+  def compare_sequences_correctly(s1, s2, result)
+    assert_equal context_diff(result), sdiff(s1, s2)
+    assert_equal context_diff(reverse_sdiff(result)), sdiff(s2, s1)
+  end
+
+  def test_seq1_seq2
+    compare_sequences_correctly(seq1, seq2, correct_forward_sdiff)
+  end
+
+  def test_abc_def_yyy_xxx_ghi_jkl
+    s1 = %w[abc def yyy xxx ghi jkl]
+    s2 = %w[abc dxf xxx ghi jkl]
+    result = [
+      ["=", [0, "abc"], [0, "abc"]],
+      ["!", [1, "def"], [1, "dxf"]],
+      ["-", [2, "yyy"], [2, nil]],
+      ["=", [3, "xxx"], [2, "xxx"]],
+      ["=", [4, "ghi"], [3, "ghi"]],
+      ["=", [5, "jkl"], [4, "jkl"]]
+    ]
+    compare_sequences_correctly(s1, s2, result)
+  end
+
+  def test_a_b_c_d_e_vs_a_e
+    s1 = %w[a b c d e]
+    s2 = %w[a e]
+    result = [
+      ["=", [0, "a"], [0, "a"]],
+      ["-", [1, "b"], [1, nil]],
+      ["-", [2, "c"], [1, nil]],
+      ["-", [3, "d"], [1, nil]],
+      ["=", [4, "e"], [1, "e"]]
+    ]
+    compare_sequences_correctly(s1, s2, result)
+  end
+
+  def test_a_e_vs_a_b_c_d_e
+    s1 = %w[a e]
+    s2 = %w[a b c d e]
+    result = [
+      ["=", [0, "a"], [0, "a"]],
+      ["+", [1, nil], [1, "b"]],
+      ["+", [1, nil], [2, "c"]],
+      ["+", [1, nil], [3, "d"]],
+      ["=", [1, "e"], [4, "e"]]
+    ]
+    compare_sequences_correctly(s1, s2, result)
+  end
+
+  def test_v_x_a_e_vs_w_y_a_b_c_d_e
+    s1 = %w[v x a e]
+    s2 = %w[w y a b c d e]
+    result = [
+      ["!", [0, "v"], [0, "w"]],
+      ["!", [1, "x"], [1, "y"]],
+      ["=", [2, "a"], [2, "a"]],
+      ["+", [3, nil], [3, "b"]],
+      ["+", [3, nil], [4, "c"]],
+      ["+", [3, nil], [5, "d"]],
+      ["=", [3, "e"], [6, "e"]]
+    ]
+    compare_sequences_correctly(s1, s2, result)
+  end
+
+  def test_x_a_e_vs_a_b_c_d_e
+    s1 = %w[x a e]
+    s2 = %w[a b c d e]
+    result = [
+      ["-", [0, "x"], [0, nil]],
+      ["=", [1, "a"], [0, "a"]],
+      ["+", [2, nil], [1, "b"]],
+      ["+", [2, nil], [2, "c"]],
+      ["+", [2, nil], [3, "d"]],
+      ["=", [2, "e"], [4, "e"]]
+    ]
+    compare_sequences_correctly(s1, s2, result)
+  end
+
+  def test_a_e_vs_x_a_b_c_d_e
+    s1 = %w[a e]
+    s2 = %w[x a b c d e]
+    result = [
+      ["+", [0, nil], [0, "x"]],
+      ["=", [0, "a"], [1, "a"]],
+      ["+", [1, nil], [2, "b"]],
+      ["+", [1, nil], [3, "c"]],
+      ["+", [1, nil], [4, "d"]],
+      ["=", [1, "e"], [5, "e"]]
+    ]
+    compare_sequences_correctly(s1, s2, result)
+  end
+
+  def test_a_e_v_vs_x_a_b_c_d_e_w_x
+    s1 = %w[a e v]
+    s2 = %w[x a b c d e w x]
+    result = [
+      ["+", [0, nil], [0, "x"]],
+      ["=", [0, "a"], [1, "a"]],
+      ["+", [1, nil], [2, "b"]],
+      ["+", [1, nil], [3, "c"]],
+      ["+", [1, nil], [4, "d"]],
+      ["=", [1, "e"], [5, "e"]],
+      ["!", [2, "v"], [6, "w"]],
+      ["+", [3, nil], [7, "x"]]
+    ]
+    compare_sequences_correctly(s1, s2, result)
+  end
+
+  def test_empty_vs_a_b_c
+    s1 = %w[]
+    s2 = %w[a b c]
+    result = [
+      ["+", [0, nil], [0, "a"]],
+      ["+", [0, nil], [1, "b"]],
+      ["+", [0, nil], [2, "c"]]
+    ]
+    compare_sequences_correctly(s1, s2, result)
+  end
+
+  def test_a_b_c_vs_1
+    s1 = %w[a b c]
+    s2 = %w[1]
+    result = [
+      ["!", [0, "a"], [0, "1"]],
+      ["-", [1, "b"], [1, nil]],
+      ["-", [2, "c"], [1, nil]]
+    ]
+    compare_sequences_correctly(s1, s2, result)
+  end
+
+  def test_a_b_c_vs_c
+    s1 = %w[a b c]
+    s2 = %w[c]
+    result = [
+      ["-", [0, "a"], [0, nil]],
+      ["-", [1, "b"], [0, nil]],
+      ["=", [2, "c"], [0, "c"]]
+    ]
+    compare_sequences_correctly(s1, s2, result)
+  end
+
+  def test_abcd_efgh_ijkl_mnop_vs_empty
+    s1 = %w[abcd efgh ijkl mnop]
+    s2 = []
+    result = [
+      ["-", [0, "abcd"], [0, nil]],
+      ["-", [1, "efgh"], [0, nil]],
+      ["-", [2, "ijkl"], [0, nil]],
+      ["-", [3, "mnop"], [0, nil]]
+    ]
+    compare_sequences_correctly(s1, s2, result)
+  end
+
+  def test_nested_array_vs_empty
+    s1 = [[1, 2]]
+    s2 = []
+    result = [
+      ["-", [0, [1, 2]], [0, nil]]
+    ]
+    compare_sequences_correctly(s1, s2, result)
+  end
+end

data/test/test_traverse_balanced.rb

@@ -0,0 +1,322 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class TestTraverseBalanced < Minitest::Test
+  def balanced_traversal(s1, s2, callback_type)
+    callback = send(callback_type)
+    traverse_balanced(s1, s2, callback)
+    callback
+  end
+
+  def balanced_reverse(change_result)
+    new_result = []
+    change_result.each do |line|
+      line = [line[0], line[2], line[1]]
+      case line[0]
+      when "<"
+        line[0] = ">"
+      when ">"
+        line[0] = "<"
+      end
+      new_result << line
+    end
+    new_result.sort_by { |line| [line[1], line[2]] }
+  end
+
+  def map_to_no_change(change_result)
+    new_result = []
+    change_result.each do |line|
+      case line[0]
+      when "!"
+        new_result << ["<", line[1], line[2]]
+        new_result << [">", line[1] + 1, line[2]]
+      else
+        new_result << line
+      end
+    end
+    new_result
+  end
+
+  class BalancedCallback
+    def initialize
+      reset
+    end
+
+    attr_reader :result
+
+    def reset
+      @result = []
+    end
+
+    def match(event)
+      @result << ["=", event.old_position, event.new_position]
+    end
+
+    def discard_a(event)
+      @result << ["<", event.old_position, event.new_position]
+    end
+
+    def discard_b(event)
+      @result << [">", event.old_position, event.new_position]
+    end
+
+    def change(event)
+      @result << ["!", event.old_position, event.new_position]
+    end
+  end
+
+  def balanced_callback
+    BalancedCallback.new
+  end
+
+  class BalancedCallbackNoChange < BalancedCallback
+    undef :change
+  end
+
+  def balanced_callback_no_change
+    BalancedCallbackNoChange.new
+  end
+
+  def assert_traversal_with_change(s1, s2, result)
+    traversal = balanced_traversal(s1, s2, :balanced_callback)
+    assert_equal result, traversal.result
+
+    traversal = balanced_traversal(s2, s1, :balanced_callback)
+    assert_equal balanced_reverse(result), traversal.result
+  end
+
+  def assert_traversal_without_change(s1, s2, result)
+    traversal = balanced_traversal(s1, s2, :balanced_callback_no_change)
+    assert_equal map_to_no_change(result), traversal.result
+
+    traversal = balanced_traversal(s2, s1, :balanced_callback_no_change)
+    assert_equal map_to_no_change(balanced_reverse(result)), traversal.result
+  end
+
+  def test_identical_string_sequences_abc
+    s1 = s2 = "abc"
+    result = [
+      ["=", 0, 0],
+      ["=", 1, 1],
+      ["=", 2, 2]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_identical_array_sequences_a_b_c
+    s1 = s2 = %w[a b c]
+    result = [
+      ["=", 0, 0],
+      ["=", 1, 1],
+      ["=", 2, 2]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_sequences_a_b_c_and_a_x_c
+    s1 = %w[a b c]
+    s2 = %w[a x c]
+    result = [
+      ["=", 0, 0],
+      ["!", 1, 1],
+      ["=", 2, 2]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_sequences_a_x_y_c_and_a_v_w_c
+    s1 = %w[a x y c]
+    s2 = %w[a v w c]
+    result = [
+      ["=", 0, 0],
+      ["!", 1, 1],
+      ["!", 2, 2],
+      ["=", 3, 3]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_sequences_x_y_c_and_v_w_c
+    s1 = %w[x y c]
+    s2 = %w[v w c]
+    result = [
+      ["!", 0, 0],
+      ["!", 1, 1],
+      ["=", 2, 2]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_sequences_a_x_y_z_and_b_v_w
+    s1 = %w[a x y z]
+    s2 = %w[b v w]
+    result = [
+      ["!", 0, 0],
+      ["!", 1, 1],
+      ["!", 2, 2],
+      ["<", 3, 3]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_sequences_a_z_and_a
+    s1 = %w[a z]
+    s2 = %w[a]
+    result = [
+      ["=", 0, 0],
+      ["<", 1, 1]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_sequences_z_a_and_a
+    s1 = %w[z a]
+    s2 = %w[a]
+    result = [
+      ["<", 0, 0],
+      ["=", 1, 0]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_sequences_a_b_c_and_x_y_z
+    s1 = %w[a b c]
+    s2 = %w[x y z]
+    result = [
+      ["!", 0, 0],
+      ["!", 1, 1],
+      ["!", 2, 2]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_strings_a_b_c_and_a_x_c
+    s1 = "a b c"
+    s2 = "a x c"
+    result = [
+      ["=", 0, 0],
+      ["=", 1, 1],
+      ["!", 2, 2],
+      ["=", 3, 3],
+      ["=", 4, 4]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_strings_a_x_y_c_and_a_v_w_c
+    s1 = "a x y c"
+    s2 = "a v w c"
+    result = [
+      ["=", 0, 0],
+      ["=", 1, 1],
+      ["!", 2, 2],
+      ["=", 3, 3],
+      ["!", 4, 4],
+      ["=", 5, 5],
+      ["=", 6, 6]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_strings_x_y_c_and_v_w_c
+    s1 = "x y c"
+    s2 = "v w c"
+    result = [
+      ["!", 0, 0],
+      ["=", 1, 1],
+      ["!", 2, 2],
+      ["=", 3, 3],
+      ["=", 4, 4]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_strings_a_z_and_a
+    s1 = "a z"
+    s2 = "a"
+    result = [
+      ["=", 0, 0],
+      ["<", 1, 1],
+      ["<", 2, 1]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_strings_z_a_and_a
+    s1 = "z a"
+    s2 = "a"
+    result = [
+      ["<", 0, 0],
+      ["<", 1, 0],
+      ["=", 2, 0]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_strings_a_b_c_and_x_y_z
+    s1 = "a b c"
+    s2 = "x y z"
+    result = [
+      ["!", 0, 0],
+      ["=", 1, 1],
+      ["!", 2, 2],
+      ["=", 3, 3],
+      ["!", 4, 4]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+
+  def test_strings_abcd_efgh_ijkl_mnopqrstuvwxyz_and_empty
+    s1 = "abcd efgh ijkl mnopqrstuvwxyz"
+    s2 = ""
+    result = [
+      ["<", 0, 0],
+      ["<", 1, 0],
+      ["<", 2, 0],
+      ["<", 3, 0],
+      ["<", 4, 0],
+      ["<", 5, 0],
+      ["<", 6, 0],
+      ["<", 7, 0],
+      ["<", 8, 0],
+      ["<", 9, 0],
+      ["<", 10, 0],
+      ["<", 11, 0],
+      ["<", 12, 0],
+      ["<", 13, 0],
+      ["<", 14, 0],
+      ["<", 15, 0],
+      ["<", 16, 0],
+      ["<", 17, 0],
+      ["<", 18, 0],
+      ["<", 19, 0],
+      ["<", 20, 0],
+      ["<", 21, 0],
+      ["<", 22, 0],
+      ["<", 23, 0],
+      ["<", 24, 0],
+      ["<", 25, 0],
+      ["<", 26, 0],
+      ["<", 27, 0],
+      ["<", 28, 0]
+    ]
+    assert_traversal_with_change(s1, s2, result)
+    assert_traversal_without_change(s1, s2, result)
+  end
+end

data/test/test_traverse_sequences.rb

@@ -0,0 +1,187 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+class TestTraverseSequences < Minitest::Test
+  def test_callback_with_no_finishers_over_seq1_seq2_has_correct_lcs_result_on_left_matches
+    callback_s1_s2 = simple_callback_no_finishers
+    traverse_sequences(seq1, seq2, callback_s1_s2)
+
+    callback_s2_s1 = simple_callback_no_finishers
+    traverse_sequences(seq2, seq1, callback_s2_s1)
+
+    assert_equal correct_lcs, callback_s1_s2.matched_a
+    assert_equal correct_lcs, callback_s2_s1.matched_a
+  end
+
+  def test_callback_with_no_finishers_over_seq1_seq2_has_correct_lcs_result_on_right_matches
+    callback_s1_s2 = simple_callback_no_finishers
+    traverse_sequences(seq1, seq2, callback_s1_s2)
+
+    callback_s2_s1 = simple_callback_no_finishers
+    traverse_sequences(seq2, seq1, callback_s2_s1)
+
+    assert_equal correct_lcs, callback_s1_s2.matched_b
+    assert_equal correct_lcs, callback_s2_s1.matched_b
+  end
+
+  def test_callback_with_no_finishers_over_seq1_seq2_has_correct_skipped_sequences_with_left_sequence
+    callback_s1_s2 = simple_callback_no_finishers
+    traverse_sequences(seq1, seq2, callback_s1_s2)
+
+    callback_s2_s1 = simple_callback_no_finishers
+    traverse_sequences(seq2, seq1, callback_s2_s1)
+
+    assert_equal skipped_seq1, callback_s1_s2.discards_a
+    assert_equal skipped_seq2, callback_s2_s1.discards_a
+  end
+
+  def test_callback_with_no_finishers_over_seq1_seq2_has_correct_skipped_sequences_with_right_sequence
+    callback_s1_s2 = simple_callback_no_finishers
+    traverse_sequences(seq1, seq2, callback_s1_s2)
+
+    callback_s2_s1 = simple_callback_no_finishers
+    traverse_sequences(seq2, seq1, callback_s2_s1)
+
+    assert_equal skipped_seq2, callback_s1_s2.discards_b
+    assert_equal skipped_seq1, callback_s2_s1.discards_b
+  end
+
+  def test_callback_with_no_finishers_over_seq1_seq2_does_not_have_done_markers
+    callback_s1_s2 = simple_callback_no_finishers
+    traverse_sequences(seq1, seq2, callback_s1_s2)
+
+    callback_s2_s1 = simple_callback_no_finishers
+    traverse_sequences(seq2, seq1, callback_s2_s1)
+
+    assert_empty callback_s1_s2.done_a
+    assert_empty callback_s1_s2.done_b
+    assert_empty callback_s2_s1.done_a
+    assert_empty callback_s2_s1.done_b
+  end
+
+  def test_callback_with_no_finishers_over_hello_hello_has_correct_lcs_result_on_left_matches
+    callback = simple_callback_no_finishers
+    traverse_sequences(hello, hello, callback)
+
+    assert_equal hello.chars, callback.matched_a
+  end
+
+  def test_callback_with_no_finishers_over_hello_hello_has_correct_lcs_result_on_right_matches
+    callback = simple_callback_no_finishers
+    traverse_sequences(hello, hello, callback)
+
+    assert_equal hello.chars, callback.matched_b
+  end
+
+  def test_callback_with_no_finishers_over_hello_hello_has_correct_skipped_sequences_with_left_sequence
+    callback = simple_callback_no_finishers
+    traverse_sequences(hello, hello, callback)
+
+    assert_empty callback.discards_a
+  end
+
+  def test_callback_with_no_finishers_over_hello_hello_has_correct_skipped_sequences_with_right_sequence
+    callback = simple_callback_no_finishers
+    traverse_sequences(hello, hello, callback)
+
+    assert_empty callback.discards_b
+  end
+
+  def test_callback_with_no_finishers_over_hello_hello_does_not_have_done_markers
+    callback = simple_callback_no_finishers
+    traverse_sequences(hello, hello, callback)
+
+    assert_empty callback.done_a
+    assert_empty callback.done_b
+  end
+
+  def test_callback_with_no_finishers_over_hello_ary_hello_ary_has_correct_lcs_result_on_left_matches
+    callback = simple_callback_no_finishers
+    traverse_sequences(hello_ary, hello_ary, callback)
+
+    assert_equal hello_ary, callback.matched_a
+  end
+
+  def test_callback_with_no_finishers_over_hello_ary_hello_ary_has_correct_lcs_result_on_right_matches
+    callback = simple_callback_no_finishers
+    traverse_sequences(hello_ary, hello_ary, callback)
+
+    assert_equal hello_ary, callback.matched_b
+  end
+
+  def test_callback_with_no_finishers_over_hello_ary_hello_ary_has_correct_skipped_sequences_with_left_sequence
+    callback = simple_callback_no_finishers
+    traverse_sequences(hello_ary, hello_ary, callback)
+
+    assert_empty callback.discards_a
+  end
+
+  def test_callback_with_no_finishers_over_hello_ary_hello_ary_has_correct_skipped_sequences_with_right_sequence
+    callback = simple_callback_no_finishers
+    traverse_sequences(hello_ary, hello_ary, callback)
+
+    assert_empty callback.discards_b
+  end
+
+  def test_callback_with_no_finishers_over_hello_ary_hello_ary_does_not_have_done_markers
+    callback = simple_callback_no_finishers
+    traverse_sequences(hello_ary, hello_ary, callback)
+
+    assert_empty callback.done_a
+    assert_empty callback.done_b
+  end
+
+  def test_callback_with_finisher_has_correct_lcs_result_on_left_matches
+    callback_s1_s2 = simple_callback
+    traverse_sequences(seq1, seq2, callback_s1_s2)
+    callback_s2_s1 = simple_callback
+    traverse_sequences(seq2, seq1, callback_s2_s1)
+
+    assert_equal correct_lcs, callback_s1_s2.matched_a
+    assert_equal correct_lcs, callback_s2_s1.matched_a
+  end
+
+  def test_callback_with_finisher_has_correct_lcs_result_on_right_matches
+    callback_s1_s2 = simple_callback
+    traverse_sequences(seq1, seq2, callback_s1_s2)
+    callback_s2_s1 = simple_callback
+    traverse_sequences(seq2, seq1, callback_s2_s1)
+
+    assert_equal correct_lcs, callback_s1_s2.matched_b
+    assert_equal correct_lcs, callback_s2_s1.matched_b
+  end
+
+  def test_callback_with_finisher_has_correct_skipped_sequences_for_left_sequence
+    callback_s1_s2 = simple_callback
+    traverse_sequences(seq1, seq2, callback_s1_s2)
+    callback_s2_s1 = simple_callback
+    traverse_sequences(seq2, seq1, callback_s2_s1)
+
+    assert_equal skipped_seq1, callback_s1_s2.discards_a
+    assert_equal skipped_seq2, callback_s2_s1.discards_a
+  end
+
+  def test_callback_with_finisher_has_correct_skipped_sequences_for_right_sequence
+    callback_s1_s2 = simple_callback
+    traverse_sequences(seq1, seq2, callback_s1_s2)
+    callback_s2_s1 = simple_callback
+    traverse_sequences(seq2, seq1, callback_s2_s1)
+
+    assert_equal skipped_seq2, callback_s1_s2.discards_b
+    assert_equal skipped_seq1, callback_s2_s1.discards_b
+  end
+
+  def test_callback_with_finisher_has_done_markers_differently_sized_sequences
+    callback_s1_s2 = simple_callback
+    traverse_sequences(seq1, seq2, callback_s1_s2)
+    callback_s2_s1 = simple_callback
+    traverse_sequences(seq2, seq1, callback_s2_s1)
+
+    assert_equal [["p", 9, "t", 11]], callback_s1_s2.done_a
+    assert_empty callback_s1_s2.done_b
+
+    assert_empty callback_s2_s1.done_a
+    assert_equal [["t", 11, "p", 9]], callback_s2_s1.done_b
+  end
+end