text_alignment 0.11.7 → 0.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52ad7c8b5822308ae15153e35626e13b5ec60d77428c80cbe3f1dd69f36edac1
-  data.tar.gz: efbcbbea9eb87606b1614661187356e15f65965b85c30ebf7d349d2f7e1028b0
+  metadata.gz: d07269e998620f3e8f1564a4b81d3710e1898058248377224be0c5398690872f
+  data.tar.gz: 7f457820b2d5a9a9dcbf00ceb89342ca7264e2ef85afd02bd2463256e71680dd
 SHA512:
-  metadata.gz: 59a2a8dd68066271b61b950c18f513b03d2b674e86c0d6d065e265367e079c99bfa973cb41c75bdc2f2d19443a9b6f8e46dcca27bb71eecd27ed00d00c07533e
-  data.tar.gz: 4779c1cbe899021125f56204d87462a8c1222c961f547e1ddc9ba4c46e29211da564bdc6492346baaa16ad4eaaedce4601f6afdcc0a16031a29be79f624c4935
+  metadata.gz: 299320641fb58973b89c64f1db0c79007f43103cb063bd171f386d9118cb49257765d0652024bbd7869daa88c4f18da7338b8d60285f3e0a95258049b9e62562
+  data.tar.gz: 3bdd474509910999521c52808a535227dbf5a6aa74345e39dc0e37eae7a000b51b1df3dbb50598abc865a036a4990cee0f3ccce35471d69cb2ef4bb9633fc83a

data/lib/text_alignment/anchor_finder.rb

@@ -6,7 +6,13 @@ module TextAlignment; end unless defined? TextAlignment
 
 class TextAlignment::AnchorFinder
 
-	def initialize(source_str, target_str, cultivation_map)
+	def initialize(source_str, target_str, cultivation_map, squeeze_ws = true)
+		@method_get_left_windows, @method_get_right_windows = if squeeze_ws
+			[method(:get_left_windows), method(:get_right_windows)]
+		else
+			[method(:get_left_windows_no_squeeze_ws), method(:get_right_windows_no_squeeze_ws)]
+		end
+
 		@s1 = source_str.downcase
 		@s2 = target_str.downcase
 
@@ -108,14 +114,14 @@ class TextAlignment::AnchorFinder
 					next
 				end
 
-				left_window_s1, left_window_s2 = get_left_windows(beg_s1, beg_s2, size_window)
+				left_window_s1, left_window_s2 = @method_get_left_windows.call(beg_s1, beg_s2, size_window)
 				if left_window_s1 && (text_similarity(left_window_s1, left_window_s2) > @sim_threshold)
 					break unless valid_beg_s2.nil?
 					valid_beg_s2 = beg_s2
 					next
 				end
 
-				right_window_s1, right_window_s2 = get_right_windows(beg_s1, beg_s2, size_window)
+				right_window_s1, right_window_s2 = @method_get_right_windows.call(beg_s1, beg_s2, size_window)
 				if right_window_s2 && (text_similarity(right_window_s1, right_window_s2) > @sim_threshold)
 					break unless valid_beg_s2.nil?
 					valid_beg_s2 = beg_s2
@@ -139,7 +145,7 @@ class TextAlignment::AnchorFinder
 		size_window ||= @size_window
 
 		# comment out below with the assumption that the beginning of a document gives a significant locational information
-		# return if @beg_s1 < size_window || @beg_s2 < size_window
+		# return if beg_s1 < size_window || beg_s2 < size_window
 
 		window_s1 = ''
 		loc = beg_s1 - 1
@@ -170,7 +176,7 @@ class TextAlignment::AnchorFinder
 		size_window ||= @size_window
 
 		# commend below with the assumption that the end of a document gives a significant locational
-		# return if (@beg_s1 + @size_ngram > (@s1.length - size_window)) || (@beg_s2 + @size_ngram > (@s2.length - size_window))
+		# return if (beg_s1 + @size_ngram > (@s1.length - size_window)) || (beg_s2 + @size_ngram > (@s2.length - size_window))
 
 		window_s1 = ''
 		loc = beg_s1 + @size_ngram
@@ -199,6 +205,44 @@ class TextAlignment::AnchorFinder
 		[window_s1, window_s2]
 	end
 
+	def get_left_windows_no_squeeze_ws(beg_s1, beg_s2, size_window = nil)
+		size_window ||= @size_window
+
+		# comment out below with the assumption that the beginning of a document gives a significant locational information
+		# return if beg_s1 < size_window || beg_s2 < size_window
+
+		wbeg = beg_s1 - size_window
+		wbeg = 0 if wbeg < 0
+		window_s1 = @s1[wbeg ... beg_s1]
+
+		wbeg = beg_s2 - size_window
+		wbeg = 0 if wbeg < 0
+		window_s2 = @s2[wbeg ... beg_s2]
+
+		[window_s1, window_s2]
+	end
+
+	def get_right_windows_no_squeeze_ws(beg_s1, beg_s2, size_window = nil)
+		size_window ||= @size_window
+
+		# commend below with the assumption that the end of a document gives a significant locational
+		# return if (@beg_s1 + @size_ngram > (@s1.length - size_window)) || (@beg_s2 + @size_ngram > (@s2.length - size_window))
+
+		slen = @s1.length
+		wbeg = beg_s1 + @size_ngram
+		wend = wbeg + size_window
+		wend = slen if wend > slen
+		window_s1 = @s1[wbeg ... wend]
+
+		slen = @s2.length
+		wbeg = beg_s2 + @size_ngram
+		wend = wbeg + size_window
+		wend = slen if wend > slen
+		window_s2 = @s2[wbeg ... wend]
+
+		[window_s1, window_s2]
+	end
+
 	def text_similarity(str1, str2, ngram_order = 2)
 		return 0 if str1.nil? || str2.nil?
 		String::Similarity.cosine(str1, str2, ngram:ngram_order)

data/lib/text_alignment/char_mapping.rb

@@ -1,3 +1,5 @@
+require 'strscan'
+
 module TextAlignment; end unless defined? TextAlignment
 
 TextAlignment::CHAR_MAPPING = [
@@ -80,8 +82,16 @@ TextAlignment::CHAR_MAPPING = [
 class TextAlignment::CharMapping
 	attr_reader :mapped_text
 
-	def initialize(_text, char_mapping = nil)
-		char_mapping ||= TextAlignment::CHAR_MAPPING
+	def initialize(_text, char_mapping = nil, squeeze_ws_to = 1)
+		if squeeze_ws_to == 0
+			@method_get_positions_squeeze_ws = method(:get_positions_squeeze_ws_0)
+			@method_squeeze_ws = method(:squeeze_ws_0!)
+		else
+			@method_get_positions_squeeze_ws = method(:get_positions_squeeze_ws_1)
+			@method_squeeze_ws = method(:squeeze_ws_1!)
+		end
+
+		char_mapping ||= TextAlignment::CHAR_MAPPING.sort{|a, b| b[1].length <=> a[1].length}
 		@mapped_text, offset_mapping = enmap_text(_text, char_mapping)
 		@index_enmap = offset_mapping.to_h
 		@index_demap = offset_mapping.map{|m| m.reverse}.to_h
@@ -105,7 +115,7 @@ class TextAlignment::CharMapping
 
 	private
 
-	def enmap_text(_text, char_mapping)
+	def enmap_text(_text, char_mapping, no_ws = false)
 		text = _text.dup
 
 		# To execute the single letter mapping replacement
@@ -113,14 +123,14 @@ class TextAlignment::CharMapping
 			text.gsub!(one, long) if long.length == 1
 		end
 
-		# To get the (location, length) index for replacements
-		loc_len = []
+		# To get the replacement positions, (position, old_length, new_length), for char mappings
+		rpositions = []
 		char_mapping.each do |one, long|
 			next if long.length == 1
 
 			init_next = 0
 			while loc = text.index(long, init_next)
-				loc_len << [loc, long.length, 1]
+				rpositions << [loc, long.length, 1]
 				init_next = loc + long.length
 			end
 
@@ -128,22 +138,17 @@ class TextAlignment::CharMapping
 			text.gsub!(long, one * long.length)
 		end
 
-		# To get the (location, length) index for consecutive whitespace sequences
-		init_next = 0
-		while loc = text.index(/\s{1,}/, init_next)
-			len = $~[0].length
-			loc_len << [loc, len, 0]
-			init_next = loc + len
-		end
+		# To get the replacement positions, (position, old_length, new_length), for consecutive whitespaces
+		rpositions += @method_get_positions_squeeze_ws.call(text)
 
-		loc_len.sort!{|a, b| a[0] <=> b[0]}
+		rpositions.sort!{|a, b| a[0] <=> b[0]}
 
 		# To get the offset_mapping before and after replacement
 		offset_mapping = []
 		init_next = 0
 		j = 0
 
-		loc_len.each do |loc, old_len, new_len|
+		rpositions.each do |loc, old_len, new_len|
 			offset_mapping += (init_next .. loc).map do |i|
 				m = [i, j]
 				j += 1
@@ -166,10 +171,41 @@ class TextAlignment::CharMapping
 		end
 
 		# To replace multi whitespace sequences to a space
-		text.gsub!(/\s{1,}/, '')
+		@method_squeeze_ws.call(text)
 
 		[text, offset_mapping]
 	end
+
+	# To get squeeze positions of whitespaces to one
+	def get_positions_squeeze_ws_1(text)
+		rpositions = []
+		text.scan(/s{2,}/) do |s|
+			loc = $~.begin(0)
+			len = $~.end(0) - loc
+			rpositions << [loc, len, 1]
+		end
+		rpositions
+	end
+
+	# To get squeeze positions of whitespaces to zero
+	def get_positions_squeeze_ws_0(text)
+		rpositions = []
+		text.scan(/\s+/) do |s|
+			loc = $~.begin(0)
+			len = $~.end(0) - loc
+			rpositions << [loc, len, 0]
+		end
+		rpositions
+	end
+
+	def squeeze_ws_1!(text)
+		text.gsub!(/\s{2,}/, ' ')
+	end
+
+	def squeeze_ws_0!(text)
+		text.gsub!(/\s+/, '')
+	end
+
 end
 
 if __FILE__ == $0
@@ -190,5 +226,5 @@ if __FILE__ == $0
 	denotations_mapped = text_mapping.enmap_denotations(denotations)
 	new_annotations = {text:text_mapped, denotations:denotations_mapped}
 
-	puts new_annotations.to_json
+	# puts new_annotations.to_json
 end

data/lib/text_alignment/mixed_alignment.rb

@@ -157,8 +157,7 @@ class TextAlignment::MixedAlignment
 			when '-'
 				''
 			when '+'
-				# (d.new_element =~ /\S/) ? '+' : ''
-				'+'
+				(d.new_element =~ /\S/) ? '+' : ''
 			else
 				''
 			end

data/lib/text_alignment/text_alignment.rb

@@ -11,14 +11,17 @@ class TextAlignment::TextAlignment
 	attr_reader :similarity
 	attr_reader :lost_annotations
 
-	# Initialize with a reference text, again which texts will be aligned
-	def initialize(reference_text, to_prevent_overlap = false)
+	# Initialize with a reference text, against which texts will be aligned
+	def initialize(reference_text, options = {})
 		raise ArgumentError, "nil text" if reference_text.nil?
 
+		options ||= {}
+		@to_prevent_overlap = options[:to_prevent_overlap] || false
+		@squeeze_ws_to = options[:squeeze_ws_to] || 0
+
 		@original_reference_text = reference_text
-		@rtext_mapping = TextAlignment::CharMapping.new(reference_text)
+		@rtext_mapping = TextAlignment::CharMapping.new(reference_text, nil, @squeeze_ws_to)
 		@mapped_reference_text = @rtext_mapping.mapped_text
-		@to_prevent_overlap = to_prevent_overlap
 
 		@original_text = nil
 		@blocks = nil
@@ -32,7 +35,7 @@ class TextAlignment::TextAlignment
 		# In case the input text is the same as the previous one, reuse the previous text mapping
 		unless @original_text && @original_text == text
 			@original_text = text
-			@text_mapping = TextAlignment::CharMapping.new(text)
+			@text_mapping = TextAlignment::CharMapping.new(text, nil, @squeeze_ws_to)
 		end
 
 		@mapped_text = @text_mapping.mapped_text
@@ -202,7 +205,7 @@ class TextAlignment::TextAlignment
 
 	def find_block_alignment(str1, str2, denotations, cultivation_map)
 		## to find block alignments
-		anchor_finder = TextAlignment::AnchorFinder.new(str1, str2, cultivation_map)
+		anchor_finder = TextAlignment::AnchorFinder.new(str1, str2, cultivation_map, @squeeze_ws_to == 1)
 
 		blocks = []
 		while block = anchor_finder.get_next_anchor

data/lib/text_alignment/version.rb

@@ -1,3 +1,3 @@
 class TextAlignment
-	VERSION = '0.11.7'
+	VERSION = '0.11.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text_alignment
 version: !ruby/object:Gem::Version
-  version: 0.11.7
+  version: 0.11.8
 platform: ruby
 authors:
 - Jin-Dong Kim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-27 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-dictionary