text_alignment 0.3.15 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8252929e7b74251db493ad991332d0da8a92f35441e2a442d05b6fb29139d657
-  data.tar.gz: c9e41127fb231e4db2843696c1029b35711449c5bf5104158da301d03b817131
+  metadata.gz: 179976ef6ac286a34343f99eef5cf8ee3d26997c1a8e1c8e9348793773ac044a
+  data.tar.gz: e15a57b2460a21d2607e3e4775ad32c5a760d9f00067c898b966e21777c241d4
 SHA512:
-  metadata.gz: 1fc8da7324d71cf25edbec9765ab512928323079472736ea4e294abb12dfafc87f55d71cb49c371470811775bd489d3c91cce4a787b99faa305f2f326dc80c77
-  data.tar.gz: f694c99216b59dd693a6acdfffc727fe74b5c189b4b9583b31fb7e6394319a3176de76237a142dac3770bcd1fbbc467d5d1e97a7225ed993a21246a66de8b2ec
+  metadata.gz: b3742565325c8ce8b4ce35093b4524b1d9182b51e332f50d9376ce2c22af8918a168b1fcc5764e4313e819c546684a3fc9411d8ee39607d95557924975bd4143
+  data.tar.gz: 6f68f68799075990fce62f4454c2ef1f1ef4ff260eac44a5332744a9c21605ac14eb35c9d6d24bedb31681f0995222699d8018727f7e70a45c11076df1c82212

data/bin/align_annotations

@@ -103,6 +103,8 @@ target_annotations = if source_annotations.class == Array
 else
 	alignment = TextAlignment::TextAlignment.new(source_annotations[:text], target_text)
 
+	pp alignment
+
 	# verification
 	source_text = source_annotations[:text]
 	puts "=====BEGIN"
@@ -129,9 +131,6 @@ else
 	puts
 	puts "=====END"
 
-	pp alignment
-
-	exit
 	# alignment.block_alignments.each do |a|
 	# 	if a[:alignment].nil? || a[:alignment] == :empty
 	# 		# p [a[:source], a[:target]]

data/lib/text_alignment/anchor_finder.rb

@@ -4,7 +4,7 @@ require 'string-similarity'
 module TextAlignment; end unless defined? TextAlignment
 
 TextAlignment::SIZE_NGRAM = 10 unless defined? TextAlignment::SIZE_NGRAM
-TextAlignment::SIZE_WINDOW = 30 unless defined? TextAlignment::SIZE_WINDOW
+TextAlignment::SIZE_WINDOW = 40 unless defined? TextAlignment::SIZE_WINDOW
 TextAlignment::TEXT_SIMILARITY_TRESHOLD = 0.8 unless defined? TextAlignment::TEXT_SIMILARITY_TRESHOLD
 
 class TextAlignment::AnchorFinder
@@ -23,6 +23,7 @@ class TextAlignment::AnchorFinder
 
 		# current position in s1
 		@beg_s1 = 0
+		@end_s1_prev = 0
 		@end_s2_prev = 0
 	end
 
@@ -31,8 +32,8 @@ class TextAlignment::AnchorFinder
 		while @beg_s1 < (@s1.length - @size_ngram)
 			anchor = @s1[@beg_s1, @size_ngram]
 
-			search_position = 0
-			# search_position = @end_s2_prev
+			# search_position = 0
+			search_position = @end_s2_prev
 			while @beg_s2 = @s2.index(anchor, search_position)
 				# if both the begining points are sufficiantly close to the end points of the last match
 				break if @end_s1_prev && (@beg_s1 - @end_s1_prev < 5) && (@beg_s2 >= @end_s2_prev) && (@beg_s2 - @end_s2_prev < 5)
@@ -56,7 +57,7 @@ class TextAlignment::AnchorFinder
 		# extend the block
 		b1 = @beg_s1
 		b2 = @beg_s2
-		while b1 > -1 && b2 > -1 && @s1[b1] == @s2[b2]
+		while b1 >= @end_s1_prev && b2 > -1 && @s1[b1] == @s2[b2]
 			b1 -= 1; b2 -= 1
 		end
 		b1 += 1; b2 += 1

data/lib/text_alignment/text_alignment.rb

@@ -40,6 +40,9 @@ class TextAlignment::TextAlignment
 			end
 		end
 
+		# pp mblocks
+		# puts "-----"
+		# puts
 		# mblocks.each do |b|
 		# 	p [b[:source], b[:target]]
 		# 	puts "---"
@@ -78,6 +81,8 @@ class TextAlignment::TextAlignment
 
 						@block_alignments << {source:{begin:0, end:b1}, target:{begin:0, end:b2}, alignment: :empty} if b1 > 0
 
+						_str1 = str1[b1 ... e1]
+						_str2 = str2[b2 ... e2]
 						alignment = TextAlignment::MixedAlignment.new(_str1.downcase, _str2.downcase, mappings)
 						if alignment.similarity < 0.6
 							@block_alignments << {source:{begin:b1, end:e1}, target:{begin:0, end:e2}, alignment: :empty}
@@ -113,19 +118,6 @@ class TextAlignment::TextAlignment
 		end
 
 		# Final step
-		if mblocks[-1][:source][:end] < str1.length
-			b1 = mblocks[-1][:source][:end]
-			b2 = mblocks[-1][:target][:end]
-
-			if mblocks[-1][:target][:end] < str2.length
-
-			else
-				e1 = str1.length
-				e2 = str2.length
-				@block_alignments << {source:{begin:b1, end:e1}, target:{begin:b2, end:e2}, alignment: :empty}
-			end
-		end
-
 		if  mblocks[-1][:source][:end] < str1.length && mblocks[-1][:target][:end] < str2.length
 			b1 = mblocks[-1][:source][:end]
 			b2 = mblocks[-1][:target][:end]
@@ -174,7 +166,8 @@ class TextAlignment::TextAlignment
 				nil
 			end
 		else
-			block_alignment[:alignment].transform_begin_position(begin_position - block_alignment[:source][:begin]) + block_alignment[:target][:begin]
+			r = block_alignment[:alignment].transform_begin_position(begin_position - block_alignment[:source][:begin])
+			r.nil? ? nil : r + block_alignment[:target][:begin]
 		end
 	end
 
@@ -192,7 +185,8 @@ class TextAlignment::TextAlignment
 				nil
 			end
 		else
-			block_alignment[:alignment].transform_end_position(end_position - block_alignment[:source][:begin]) + block_alignment[:target][:begin]
+			r = block_alignment[:alignment].transform_end_position(end_position - block_alignment[:source][:begin])
+			r.nil? ? nil : r + block_alignment[:target][:begin]
 		end
 	end
 

data/lib/text_alignment/version.rb

@@ -1,3 +1,3 @@
 class TextAlignment
-	VERSION = '0.3.15'
+	VERSION = '0.3.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text_alignment
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.20
 platform: ruby
 authors:
 - Jin-Dong Kim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-dictionary