@@ -19,37 +19,31 @@ module SequenceRecognizer hash.delete_if {|key, sequences| sequences.empty? } # reconstruct the shortcodes - result = [] - hash.each do |key, sequences| - sequences.each do |sequence| - result << recompose( key => sequence ) - end - end - result + recompose(hash) end # '1234678' => ['1234','678'] def multiplex_sequences_from(string) @cache ||= {} return @cache[string] if @cache[string] - regexps = ordered_sequences.dup sequences_found = [] - regexps.each do |regexp| + ordered_sequences.each do |regexp| if string =~ regexp sequences_found << $~[0] - remove_recursively(regexp, regexps) end end + # remove subsets + redundant = [] + sequences_found.each do |s1| + sequences_found.each do |s2| + redundant << s2 if s1 != s2 && !s1.index(s2).nil? + end + end + sequences_found.delete_if {|sequence| redundant.include? sequence} @cache[string] = sequences_found return sequences_found end - def remove_recursively(regexp, regexps) - regexps.delete(regexp) - dependent = hashed_sequences[regexp] - dependent.each {|r| remove_recursively(r, regexps)} - end - # [81602, 81702, 81802, 81902] #=> {'81x82' => "6789"} def decompose(shortcodes, n = 5) shortcodes.map! {|s| s.to_s} @@ -57,7 +51,7 @@ module SequenceRecognizer n.times do |index| shortcodes.each do |shortcode| digit = shortcode[index].chr - key = shortcode.to_s.dup + key = shortcode.dup key[index] = 'x' result[key] ||= '' result[key] << digit @@ -66,67 +60,56 @@ module SequenceRecognizer result end - # {'66x77' => '123'} #=> ['66177', '66277', '66377'] + # {'66x77' => ['123', 678]} #=> [['66177', '66277', '66377'], ['66677', 66777, 66877]] def recompose(hash) - result = [] - hash.each do |key, sequence| - sequence.each_byte do |digit| - result << key.sub('x', digit.chr) - end + results = [] + hash.each do |key, sequences| + results += sequences.map {|seq| seq.unpack('a'*seq.size).map {|digit| key.tr('x',digit)}} end - result.sort + results end private - def hashed_sequences - return @hashed_sequences if @hashed_sequences - @hashed_sequences = { - /0123456789/ => [ /012345678/, /123456789/ ], - /012345678/ => [ /01234567/, /12345678/ ], - /123456789/ => [ /12345678/, /23456789/ ], - /01234567/ => [ /0123456/, /1234567/ ], - /12345678/ => [ /1234567/, /2345678/ ], - /23456789/ => [ /2345678/, /3456789/ ], - /0123456/ => [ /012345/, /123456/ ], - /1234567/ => [ /123456/, /234567/ ], - /2345678/ => [ /234567/, /345678/ ], - /3456789/ => [ /345678/, /456789/ ], - /012345/ => [ /01234/, /12345/ ], - /123456/ => [ /12345/, /23456/ ], - /234567/ => [ /23456/, /34567/ ], - /345678/ => [ /34567/, /45678/ ], - /456789/ => [ /45678/, /56789/ ], - /01234/ => [ /0123/, /1234/ ], - /12345/ => [ /1234/, /2345/ ], - /23456/ => [ /2345/, /3456/ ], - /34567/ => [ /3456/, /4567/ ], - /45678/ => [ /4567/, /5678/ ], - /56789/ => [ /5678/, /6789/ ], - /0123/ => [ /012/, /123/ ], - /1234/ => [ /123/, /234/ ], - /2345/ => [ /234/, /345/ ], - /3456/ => [ /345/, /456/ ], - /4567/ => [ /456/, /567/ ], - /5678/ => [ /567/, /678/ ], - /6789/ => [ /678/, /789/ ], - /012/ => [], - /123/ => [], - /234/ => [], - /345/ => [], - /456/ => [], - /567/ => [], - /678/ => [], - /789/ => [] - } - return @hashed_sequences - end - def ordered_sequences return @ordered_sequences if @ordered_sequences - @ordered_sequences = [/0123456789/,/012345678/,/123456789/,/01234567/,/12345678/,/23456789/,/0123456/,/1234567/,/2345678/, - /3456789/,/012345/,/123456/,/234567/,/345678/,/456789/,/01234/,/12345/,/23456/,/34567/,/45678/,/56789/,/0123/,/1234/, - /2345/,/3456/,/4567/,/5678/,/6789/,/012/,/123/,/234/,/345/,/456/,/567/,/678/,/789/] + @ordered_sequences = [ + /0123456789/, + /012345678/, + /123456789/, + /01234567/, + /12345678/, + /23456789/, + /0123456/, + /1234567/, + /2345678/, + /3456789/, + /012345/, + /123456/, + /234567/, + /345678/, + /456789/, + /01234/, + /12345/, + /23456/, + /34567/, + /45678/, + /56789/, + /0123/, + /1234/, + /2345/, + /3456/, + /4567/, + /5678/, + /6789/, + /012/, + /123/, + /234/, + /345/, + /456/, + /567/, + /678/, + /789/] return @ordered_sequences end end sequence_recognizer.rb 0e97505613f4564e4ae8bfde03c031fe63565205 Paolo Dona paolo.dona@gmail.com http://github.com/paolodona/sequence_recognizer/commit/67174ad5c05b3468fb90fd73cadb4f91f4d13c00 67174ad5c05b3468fb90fd73cadb4f91f4d13c00 2008-12-11T19:10:08-08:00 2008-12-11T19:10:08-08:00 simplified 36eba035e68ea7a069e4eb7c5f5d167062cfa21d Paolo Dona paolo.dona@gmail.com