manasimu 0.0.25 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7789310be16e9d3b352d2aa77999dbd18b80e90e86270637cc0317bc5941be4a
-  data.tar.gz: 6b85a7a3523e6033aa1efe1d70ef8f7540799a1e72ee4e8ba7f21f0b1d946b14
+  metadata.gz: 4f05b8686e87a5b30f3437b017034b1d11ef8d4f0ee750ae8054294848e3e782
+  data.tar.gz: 031dbf782b235517129e04642108281c11f6de3a07dacd140bcbedbc22b56bfb
 SHA512:
-  metadata.gz: 2676d3fd0ba9efc9b1aea58f4dbf9d677da052ed4cd74e31d5e3a47a25db1ab74d5ca1ccab98081556d1d72edff16d5086b43d2579075c0e2684f5b208d80a2b
-  data.tar.gz: f8bb389f4018e8d70f6f810d2475e68635feff41f78b1460f55e3e8e8e8e34414e7182d8b8c38ae3f3cbb6c02010a337c566048cac9e80f2323e5d74422311c6
+  metadata.gz: 4fbd32550c42b6360ff607e7d2c7f7e37e508736c5a8441e3bf6e7a54a5e8ee113530af81af27b5ec435b0483df2c6fee5ec4131b365e09983060620ff0acc8c
+  data.tar.gz: 984bcb2a54f4c30ed6505514f93bd58f9b3ca489f0c38dae55156d8ba44b8586251a3d3296db7aea6c2ba1458c04dbed656a3f730f66b8f8b8ee51c6ea16accf

data/lib/manasimu/card.rb

@@ -192,7 +192,7 @@ class CardType
 
   def mana_source
     @mana_source ||= @contents.map { |c| 
-        c.color_identity ? c.color_identity.split(',') : []
+        c.color_identity ? c.color_identity : []
       }.flatten.uniq
   end
 
@@ -206,7 +206,7 @@ class CardType
 
   def mana_cost
     return @mana_cost if @mana_cost
-    spell = @contents.select {|c| c.types != "Land"}.first
+    spell = @contents.select {|c| not c.types.include? "Land"}.first
     if spell
       @mana_cost = spell.mana_cost
     else
@@ -227,7 +227,7 @@ class CardType
   end
 
   def types
-    @types ||= @contents.map {|c| c.types}
+    @types ||= @contents.map {|c| c.types}.flatten
   end
 
   def color_identity
@@ -235,7 +235,7 @@ class CardType
     @memo_colors ||= []
     @contents.each do |c|
       if c.color_identity
-        c.color_identity.split(",").each do |color|
+        c.color_identity.each do |color|
           @memo_colors << color if not @memo_colors.include? color
         end
       end
@@ -289,7 +289,7 @@ class CardType
             [0,1]
           end
     @is_land = arr.select do |i|
-      @contents[i] and @contents[i].types == "Land"
+      @contents[i] and @contents[i].types.include? "Land"
     end.length > 0
     return @is_land
   end
@@ -298,6 +298,15 @@ class CardType
     @contents[0].names
   end
 
+  @name_ja_split = nil
+  def name_ja_split
+    return @name_ja_split if @name_ja_split
+    c = @contents[0]
+    return "" if not c.names
+    return "" if not c.names[0]
+    @name_ja_split = c.names[0].split(' // ')[0]
+  end
+
   def playable?(lands, capas)
     return [false, [], []] if lands.empty?
     return [false, [], []] if converted_mana_cost > lands.length
@@ -385,6 +394,14 @@ class CardType
     [played_count, drawed_count, can_played_count, mana_sources_count]
   end
 
+  def <=>(o)
+    a = @contents[0]
+    b = o.contents[0]
+    d = a.set_code <=> b.set_code
+    return d if d != 0
+    a.number <=> b.number
+  end
+
   def to_s
     @contents.map {|c| c.to_s}.join(",")
   end
@@ -399,6 +416,10 @@ class CardTypeAggregate
     @memo = []
   end
 
+  def sort!
+    @memo.sort!
+  end
+
   def find(set_code, number)
     ret = @memo.bsearch do |c|
       a = c.contents[0]
@@ -415,6 +436,10 @@ class CardTypeAggregate
     end
   end
 
+  def length
+    @memo.length
+  end
+
   def add(card_type)
     @memo << card_type
   end
@@ -439,7 +464,7 @@ class Content
   def initialize(hash)
     @name = hash[:name]
     @names = hash[:names]
-    @number = hash[:number]
+    @number = hash[:number].to_i
     @side = hash[:side]
     @set_code = hash[:set_code]
     @mana_cost = hash[:mana_cost]
@@ -451,11 +476,11 @@ class Content
   end
 
   def mana_source?
-    return @types == "Land"
+    return @types.include? "Land"
   end
 
   def to_s
-    "[#{@name}] [#{@types}] [#{@color_identity}] [#{@mana_cost}]"
+    "[#{@name}] [#{@names}] [#{@types}] [#{@color_identity}] [#{@mana_cost}]"
   end
 
   def to_factory

data/lib/manasimu/data.rb

@@ -74,54 +74,144 @@ class Deck
       distinct_types << type
     end
 
+    en = -1
+    ja = 0
 
-    [-1, 4].each do |i|
+    [en, ja].each do |language|
 
       distinct_types.sort! do |a,b| 
-        if i < 0
+        if language == en
           a.name <=> b.name 
-        elsif a.names[i] and b.names[i]
-          a.names[i] <=> b.names[i]
+        elsif language == ja
+          d = a.name_ja_split.length <=> b.name_ja_split.length
+          if d == 0
+            a.name_ja_split <=> b.name_ja_split
+          else
+            d
+          end
         else
-          0
+          # none
         end
       end
 
       lines.each do |line|
         line.chomp!
-        search_type = distinct_types.bsearch do |type|
-          if i < 0
-            name = type.name.split(' // ')[0]
-          elsif type.names[i]
-            name = type.names[i].split(' // ')[0]
-          else
-            next
-          end
+        line.chomp.strip!
+        line.chomp.lstrip!
+        line.gsub!(/ \d+$/, '')
 
-          flag = true
-          name.chars.each_with_index do |nc,i|
-            if line.length > i
-              lc = line.chars[i]
-              if nc > lc
-                flag = true
-                break
-              elsif nc < lc
-                flag = false
+        if line =~ /^[\/,\|\d-]*$/ or line =~ /^x\d+$/
+          next 
+        end
+
+        search_type = 
+          if language == en
+            # binary search
+            distinct_types.bsearch do |type|
+              name = type.name.split(' // ')[0]
+              flag = true
+              name.chars.each_with_index do |nc,i|
+                if line.length > i
+                  lc = line.chars[i]
+                  if nc > lc
+                    flag = true
+                    break
+                  elsif nc < lc
+                    flag = false
+                    break
+                  else
+                    # continue
+                  end
+                else
+                  flag = true
+                  break
+                end
+              end
+              flag
+            end
+          else language == ja
+            # Levenshtein distance
+            
+            line.gsub!(/[①②③④⑤⑥⑦⑧⑨⑩⑪⑫⑬●〇▼▽▲△]+/, '')
+            line.chomp!
+            line.strip!
+            line.lstrip!
+
+            len = line.length
+
+            s_index = distinct_types.bsearch_index do |type|
+              name = type.name_ja_split
+              name.length >= len - 2
+            end
+
+            e_index = distinct_types.bsearch_index do |type|
+              name = type.name_ja_split
+              name.length >= len + 2
+            end
+
+            next if not s_index
+
+            min = Float::MAX
+            min_type = nil
+
+            distinct_types[s_index..e_index].each do |type|
+              name = type.name_ja_split
+
+              check_indexies = []
+              if name.length == 1
+                check_indexies[0] = 0
+              elsif name.length == 2
+                check_indexies[0] = 0
+                check_indexies[1] = 1
+              elsif name.length > 0
+                check_indexies[0] = 0
+                check_indexies[1] = (name.length / 2).to_i
+                check_indexies[2] = name.length - 1
+              end
+
+              next if check_indexies.length == 0
+
+              include_some = false
+              check_indexies.each do |idx|
+                if not name[idx].empty? and line.index(name[idx])
+                  include_some = true
+                  break
+                end
+              end
+
+              next if not include_some
+
+              d = levenshtein(line, name)
+              base =  [name.length, line.length].max
+              diff_rate =  d.to_f / base
+              if diff_rate < min
+                min = diff_rate
+                min_type = type
+              end
+              if d == 0
                 break
-              else
-                # continue
               end
-            else
-              flag = true
-              break
             end
+
+            result = nil
+
+            if min_type and min <= 0.3
+              result = min_type
+            end
+
+            result
           end
-          flag
-        end
+
         if search_type
-          a = search_type.name.split(' // ')[0]
-          if line =~ /^#{a}.*$/ and a != 'X'
+          if language == en
+            a = search_type.name.split(' // ')[0]
+            if line =~ /^#{a}.*$/ and a != 'X'
+              ret << search_type
+            end
+          elsif language == ja
             ret << search_type
+          else
+            # none
           end
         end
       end
@@ -132,6 +222,25 @@ class Deck
     ret
   end
 
+  def self.tsearch(arr, line, low, high)
+    if high - low < 1000
+      return [low, high]
+    end
+    c1 = ((low * 2 + high ) / 3).to_i - 1
+    c2 = ((low + high * 2 ) / 3).to_i + 1
+
+    n1 = arr[c1].name_ja_split
+    n2 = arr[c2].name_ja_split
+    
+    y1 = levenshtein(line, n1)
+    y2 = levenshtein(line, n2)
+    if y1 > y2
+      tsearch(arr, line, c1, high)
+    else
+      tsearch(arr, line, low, c2)
+    end
+  end
+
   def self.get_card_details(deck_items)
     cards = []
     card_id = 0
@@ -171,4 +280,26 @@ class Deck
     end
     [cards, clone_card_types]
   end
+
+  def self.levenshtein(first, second)
+    matrix = [(0..first.length).to_a]
+    (1..second.length).each do |j|
+      matrix << [j] + [0] * (first.length)
+    end
+
+    (1..second.length).each do |i|
+      (1..first.length).each do |j|
+        if first[j-1] == second[i-1]
+          matrix[i][j] = matrix[i-1][j-1]
+        else
+          matrix[i][j] = [
+            matrix[i-1][j],
+            matrix[i][j-1],
+            matrix[i-1][j-1],
+          ].min + 1
+        end
+      end
+    end
+    return matrix.last.last
+  end
 end

data/lib/manasimu/expansion.rb

@@ -1,3 +1,14 @@
 class Expansion
   attr_accessor :code, :name, :exists
+
+  def self.load
+    return [] if not File.exists?(File.expand_path( '../../../db/expansions', __FILE__ ))
+    File.open(File.expand_path( '../../../db/expansions', __FILE__ ), "r") do |file|
+      Marshal.load(file)
+    end
+  end
+
+  def ==(other)
+    self.code == other.code and self.exists
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manasimu
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.28
 platform: ruby
 authors:
 - so1itaryrove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-04 00:00:00.000000000 Z
+date: 2022-08-13 00:00:00.000000000 Z
 dependencies: []
 description: mtg arrena mana curve simulator
 email: so1itaryrove@gmail.com