ac-library-rb 0.5.0 → 0.6.0

data/lib_lock/ac-library-rb/modint.rb

@@ -162,7 +162,9 @@ module AcLibraryRb
 
     def inv_internal(a)
       if $_mod_is_prime
-        a != 0 ? a.pow($_mod - 2, $_mod) : raise(RangeError, 'no inverse')
+        raise(RangeError, 'no inverse') if a == 0
+
+        a.pow($_mod - 2, $_mod)
       else
         g, x = ModInt.inv_gcd(a, $_mod)
         g == 1 ? x : raise(RangeError, 'no inverse')

data/lib_lock/ac-library-rb/scc.rb

@@ -1,16 +1,30 @@
 module AcLibraryRb
   # Strongly Connected Components
-  class SCCGraph
+  class SCC
     # initialize graph with n vertices
-    def initialize(n = 0)
-      @n, @edges = n, []
+    def initialize(n)
+      @n = n
+      @edges = []
     end
 
     # add directed edge
     def add_edge(from, to)
-      raise "invalid params" unless (0...@n).include? from and (0...@n).include? to
+      unless 0 <= from && from < @n and 0 <= to && to < @n
+        msg = "Wrong params: from=#{from} and to=#{to} must be in 0...#{@n}"
+        raise ArgumentError.new(msg)
+      end
 
       @edges << [from, to]
+      self
+    end
+
+    def add_edges(edges)
+      edges.each{ |from, to| add_edge(from, to) }
+      self
+    end
+
+    def add(x, to = nil)
+      to ? add_edge(x, to) : add_edges(x)
     end
 
     # returns list of strongly connected components
@@ -18,10 +32,8 @@ module AcLibraryRb
     # O(@n + @edges.size)
     def scc
       group_num, ids = scc_ids
-      counts = [0] * group_num
-      ids.each { |x| counts[x] += 1 }
       groups = Array.new(group_num) { [] }
-      ids.each_with_index { |x, i| groups[x] << i }
+      ids.each_with_index { |id, i| groups[id] << i }
       groups
     end
 
@@ -60,7 +72,8 @@ module AcLibraryRb
     end
 
     def csr
-      start, elist = [0] * (@n + 1), [nil] * @edges.size
+      start = [0] * (@n + 1)
+      elist = [nil] * @edges.size
       @edges.each { |(i, _)| start[i + 1] += 1 }
       @n.times { |i| start[i + 1] += start[i] }
       counter = start.dup
@@ -71,9 +84,4 @@ module AcLibraryRb
       [start, elist]
     end
   end
-
-  # class alias
-  StronglyConnectedComponents = SCCGraph
-  SCC  = SCCGraph
-  SCCG = SCCGraph
 end

data/lib_lock/ac-library-rb/segtree.rb

@@ -3,21 +3,21 @@ module AcLibraryRb
   class Segtree
     attr_reader :d, :op, :n, :leaf_size, :log
 
-    def initialize(arg = 0, e, &block)
-      case arg
-      when Integer
-        v = Array.new(arg) { e }
-      when Array
-        v = arg
+    # new(v, e){ |x, y|  }
+    # new(v, op, e)
+    def initialize(a0, a1, a2 = nil, &block)
+      if a2.nil?
+        @e, @op = a1, proc(&block)
+        v = (a0.is_a?(Array) ? a0 : [@e] * a0)
+      else
+        @op, @e = a1, a2
+        v = (a0.is_a?(Array) ? a0 : [@e] * a0)
       end
 
-      @e  = e
-      @op = proc(&block)
-
       @n = v.size
       @log = (@n - 1).bit_length
       @leaf_size = 1 << @log
-      @d = Array.new(@leaf_size * 2) { e }
+      @d = Array.new(@leaf_size * 2, @e)
       v.each_with_index { |v_i, i| @d[@leaf_size + i] = v_i }
       (@leaf_size - 1).downto(1) { |i| update(i) }
     end
@@ -27,12 +27,25 @@ module AcLibraryRb
       @d[q] = x
       1.upto(@log) { |i| update(q >> i) }
     end
+    alias []= set
 
     def get(pos)
       @d[@leaf_size + pos]
     end
+    alias [] get
+
+    def prod(l, r = nil)
+      if r.nil? # if 1st argument l is Range
+        if r = l.end
+          r += @n if r < 0
+          r += 1 unless l.exclude_end?
+        else
+          r = @n
+        end
+        l = l.begin
+        l += @n if l < 0
+      end
 
-    def prod(l, r)
       return @e if l == r
 
       sml = @e
@@ -122,21 +135,20 @@ module AcLibraryRb
       @d[k] = @op.call(@d[2 * k], @d[2 * k + 1])
     end
 
-    def inspect
-      t = 0
-      res = "SegmentTree @e = #{@e}, @n = #{@n}, @leaf_size = #{@leaf_size} @op = #{@op}\n  "
-      a = @d[1, @d.size - 1]
-      a.each_with_index do |e, i|
-        res << e.to_s << ' '
-        if t == i && i < @leaf_size
-          res << "\n  "
-          t = t * 2 + 2
-        end
-      end
-      res
-    end
+    # def inspect # for debug
+    #   t = 0
+    #   res = "Segtree @e = #{@e}, @n = #{@n}, @leaf_size = #{@leaf_size} @op = #{@op}\n  "
+    #   a = @d[1, @d.size - 1]
+    #   a.each_with_index do |e, i|
+    #     res << e.to_s << ' '
+    #     if t == i && i < @leaf_size
+    #       res << "\n  "
+    #       t = t * 2 + 2
+    #     end
+    #   end
+    #   res
+    # end
   end
 
-  SegTree     = Segtree
-  SegmentTree = Segtree
+  SegTree = Segtree
 end

data/lib_lock/ac-library-rb/suffix_array.rb

@@ -77,9 +77,7 @@ module AcLibraryRb
       end_l = lms[lms_map[l] + 1] || n
       end_r = lms[lms_map[r] + 1] || n
       same = true
-      if end_l - l != end_r - r
-        same = false
-      else
+      if end_l - l == end_r - r
         while l < end_l
           break if s[l] != s[r]
 
@@ -87,6 +85,8 @@ module AcLibraryRb
           r += 1
         end
         same = false if l == n || s[l] != s[r]
+      else
+        same = false
       end
       rec_upper += 1 if not same
       rec_s[lms_map[sorted_lms[i]]] = rec_upper
@@ -101,7 +101,11 @@ module AcLibraryRb
 
   # suffix array for array of integers or string
   def suffix_array(s, upper = nil)
-    if not upper
+    if upper
+      s.each{ |s|
+        raise ArgumentError if s < 0 || upper < s
+      }
+    else
       case s
       when Array
         # compression
@@ -119,10 +123,6 @@ module AcLibraryRb
         upper = 255
         s = s.bytes
       end
-    else
-      s.each{ |s|
-        raise ArgumentError if s < 0 || upper < s
-      }
     end
 
     return sa_is(s, upper)

data/lib_lock/ac-library-rb/two_sat.rb

@@ -4,16 +4,18 @@ module AcLibraryRb
   # TwoSAT
   # Reference: https://github.com/atcoder/ac-library/blob/master/atcoder/twosat.hpp
   class TwoSAT
-    def initialize(n = 0)
+    def initialize(n)
       @n = n
       @answer = Array.new(n)
-      @scc = SCCGraph.new(2 * n)
+      @scc = SCC.new(2 * n)
     end
 
     attr_reader :answer
 
     def add_clause(i, f, j, g)
-      raise RangeError unless (0...@n).cover?(i) && (0...@n).cover?(j)
+      unless 0 <= i && i < @n and 0 <= j && j < @n
+        raise RangeError.new
+      end
 
       @scc.add_edge(2 * i + (f ? 0 : 1), 2 * j + (g ? 1 : 0))
       @scc.add_edge(2 * j + (g ? 0 : 1), 2 * i + (f ? 1 : 0))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ac-library-rb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - universato
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-16 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   ac-library-rb is a ruby port of AtCoder Library (ACL).
   DSU(UnionFind), FenwickTree, PriorityQueue, Segtree, SCC, 2-SAT, suffix_array, lcp_array, z_algorithm, crt, inv_mod, floor_sum, max_flow, min_cost_flow......
@@ -90,6 +104,7 @@ files:
 - document_ja/two_sat.md
 - lib/ac-library-rb/version.rb
 - lib/convolution.rb
+- lib/core_ext/all.rb
 - lib/core_ext/modint.rb
 - lib/crt.rb
 - lib/dsu.rb
@@ -111,6 +126,7 @@ files:
 - lib_helpers/ac-library-rb/all.rb
 - lib_lock/ac-library-rb.rb
 - lib_lock/ac-library-rb/convolution.rb
+- lib_lock/ac-library-rb/core_ext/all.rb
 - lib_lock/ac-library-rb/core_ext/modint.rb
 - lib_lock/ac-library-rb/crt.rb
 - lib_lock/ac-library-rb/dsu.rb
@@ -144,14 +160,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: ac-library-rb is a ruby port of AtCoder Library (ACL).