ac-library-rb 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eb404ec2eab941e961da5a9cc0e19b87858a33101c791750a2e33d61781f8b8
-  data.tar.gz: a341ee2e478add1f3e611071213911dd919e7229ca3cc8cc9c19880e3e471467
+  metadata.gz: f191f90563fea038c7181e2bf9d13e1dc8caa0e816a364176e46b67c8d63f471
+  data.tar.gz: c89db082816046146cb60faa3747e046877394bfff776a3defe8063fb2d1c390
 SHA512:
-  metadata.gz: 053064e9c40fe91e306a7695906bec15ef8752c3ddfa54f7954bf83f5954a626370f9390034f0777c0e403460f7ed650707a89be6a02d88c49cb52cdb0da5ffb
-  data.tar.gz: 910dd3b9d493efba69cfe458a41a82c28ba4b5dde013521f56b29fbe7f3737d7d82fd50424b205c98683f0691da843de6ffc3ec58dd5cdf75e7d7ed1d94f1185
+  metadata.gz: '0114099d09f9566741d84ed2b5e43427b62592bb8b2a6b90d25b9f68288d2a387f34899351d18a7b3e0c93ec72af9cae4aac2f1d38f5fe517e30ec850e33429e'
+  data.tar.gz: cdb1eac1808855f86c00c991b4c66ae3489035420ef0fdb8c88915712ace8faa5db02da074a78734e0c4235058ac1e2a62a0fc9cc0523e6c85aff4617b47ae39

data/ac-library-rb.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "simplecov"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/bin/lock_lib.rb

@@ -17,7 +17,7 @@ Dir.glob(lib_path) do |file|
 end
 
 # copy library from `lib/core_ext` to `lib_lock/ac-library-rb/core_ext`
-ac_library_rb_classes = %w[ModInt]
+ac_library_rb_classes = %w[ModInt FenwickTree PriorityQueue]
 replaces = ac_library_rb_classes.to_h{ |cls| ["#{cls}.new", "AcLibraryRb::#{cls}.new"] }
 pattern = Regexp.new(replaces.keys.join('|'))
 

data/document_en/dsu.md

@@ -27,7 +27,7 @@ p d.size(2)     # => 2
 
 ## Class Method
 
-### new(n = 0) -> DSU
+### new(n) -> DSU
 
 ```rb
 d = DSU.new(n)
@@ -41,7 +41,7 @@ It creates an undirected graph with `n` vertices and `0` edges.
 
 **alias**
 
-- `DSU`, `DisjointSetUnion`, `UnionFind`, `UnionFindTree`
+- `DSU`, `UnionFind`
 
 ## Instance Methods
 

data/document_en/max_flow.md

@@ -5,7 +5,7 @@ Library for solving [Maximum flow problem](https://en.wikipedia.org/wiki/Maximum
 
 ## Class Methods.
 
-### new(n = 0) -> MaxFlow
+### new(n) -> MaxFlow
 
 ```ruby
 graph = Maxflow.new(10)

data/document_en/min_cost_flow.md

@@ -4,7 +4,7 @@ It solves [Minimum\-cost flow problem](https://en.wikipedia.org/wiki/Minimum-cos
 
 ## Class Methods.
 
-### new(n = 0) -> MinCostFlow
+### new(n) -> MinCostFlow
 
 ```ruby
 graph = MinCostFlow.new(10)

data/document_en/segtree.md

@@ -4,7 +4,8 @@ Segment Tree
 
 ## Class Methods
 
-### new(n, e, &op) -> Segtree
+### new(n, e){ |x, y| ... } -> Segtree
+### new(n, op, e) -> Segtree
 
 ```rb
 seg = Segtree.new(n, e) { |x, y| ... }
@@ -15,7 +16,9 @@ It creates an array `a` of length `n`. All the elements are initialized to `e`.
 - `block`: returns `op(x, y)`
 - `e`: identity element.
 
-### new(ary, e, &op) -> Segtree
+
+### new(ary, e){ |x, y| ... } -> Segtree
+### new(ary, op, e) -> Segtree
 
 ```rb
 seg = Segtree.new(ary, e) { |x, y| ... }

data/document_en/two_sat.md

@@ -17,7 +17,7 @@ it decides whether there is a truth assignment that satisfies all clauses.
 
 ## Class Methods
 
-### new(n = 0) -> TwoSAT
+### new(n) -> TwoSAT
 
 ```ruby
 ts = TwoSAT.new(n)

data/document_ja/dsu.md

@@ -30,7 +30,7 @@ p d.size(2)     # => 2
 
 ## 特異メソッド
 
-### new(n = 0) -> DSU
+### new(n) -> DSU
 
 ```rb
 d = DSU.new(n)
@@ -48,9 +48,7 @@ d = DSU.new(n)
 **エイリアス**
 
 - `DSU`
-- `DisjointSetUnion`
 - `UnionFind`
-- `UnionFindTree`
 
 ## インスタンスメソッド
 

data/document_ja/max_flow.md

@@ -4,7 +4,7 @@
 
 ## 特異メソッド
 
-### new(n = 0) -> MaxFlow
+### new(n) -> MaxFlow
 
 ```ruby
 graph = Maxflow.new(10)

data/document_ja/min_cost_flow.md

@@ -4,7 +4,7 @@
 
 ## 特異メソッド
 
-### new(n = 0) -> MinCostFlow
+### new(n) -> MinCostFlow
 
 ```ruby
 graph = MinCostFlow.new(10)

data/document_ja/scc.md

@@ -6,7 +6,7 @@ Strongly Connected Components
 
 ## 特異メソッド
 
-### new(n = 0) -> SCC
+### new(n) -> SCC
 
 ```ruby
 graph = SCC.new(6)
@@ -50,8 +50,9 @@ graph.scc
 
 ## Verified
 
-[ALPC: G \- SCC](https://atcoder.jp/contests/practice2/tasks/practice2_g)
-- [2538ms 2020/9/8](https://atcoder.jp/contests/practice2/submissions/16569175)
+- [ALPC: G \- SCC](https://atcoder.jp/contests/practice2/tasks/practice2_g)  
+  - [2538ms 2020/9/8](https://atcoder.jp/contests/practice2/submissions/16569175)  
+- [競プロ典型 90 問: 021 - Come Back in One Piece][https://atcoder.jp/contests/typical90/tasks/typical90_u]
 
 # 参考リンク
 

data/document_ja/segtree.md

@@ -4,7 +4,8 @@
 
 ## 特異メソッド
 
-### new(arg, e, &op) -> Segtree
+### new(arg, e){ |x, y| ... } -> Segtree
+### new(arg, op, e) -> Segtree
 
 ```rb
 seg = Segtree.new(arg, e) { |x, y| ... }

data/document_ja/two_sat.md

@@ -15,7 +15,7 @@
 
 ## 特異メソッド
 
-### new(n = 0) -> TwoSAT
+### new(n) -> TwoSAT
 
 ```ruby
 ts = TwoSAT.new(n)

data/lib/ac-library-rb/version.rb

@@ -1,3 +1,3 @@
 module AcLibraryRb
-  VERSION = "0.5.4".freeze
+  VERSION = "0.6.0".freeze
 end

data/lib/convolution.rb

@@ -122,3 +122,24 @@ class Convolution
 
   private :batterfly, :batterfly_inv, :bsf, :calc_primitive_root
 end
+
+# [EXPERIMENTAL]
+def convolution(a, b, mod: 998244353, k: 35, z: 99)
+  n = a.size
+  m = b.size
+  return [] if n == 0 || m == 0
+
+  raise ArgumentError if a.min < 0 || b.min < 0
+
+  format = "%0#{k}x" # "%024x"
+  sa = ""
+  sb = ""
+  a.each{ |x| sa << (format % x) }
+  b.each{ |x| sb << (format % x) }
+
+  zero = '0'
+  s = zero * z + ("%x" % (sa.hex * sb.hex))
+  i = -(n + m - 1) * k - 1
+
+  Array.new(n + m - 1){ (s[i + 1..i += k] || zero).hex % mod }
+end

data/lib/core_ext/all.rb

@@ -0,0 +1,11 @@
+class Array
+  def to_fenwick_tree
+    FenwickTree.new(self)
+  end
+  alias to_fetree to_fenwick_tree
+
+  def to_priority_queue
+    PriorityQueue.new(self)
+  end
+  alias to_pq to_priority_queue
+end

data/lib/dsu.rb

@@ -1,13 +1,13 @@
 # Disjoint Set Union
 class DSU
-  def initialize(n = 0)
+  def initialize(n)
     @n = n
     @parent_or_size = Array.new(n, -1)
     # root node: -1 * component size
     # otherwise: parent
   end
 
-  attr_accessor :parent_or_size
+  attr_reader :parent_or_size, :n
 
   def merge(a, b)
     x = leader(a)
@@ -27,7 +27,7 @@ class DSU
 
   def leader(a)
     unless 0 <= a && a < @n
-      raise ArgumentError.new, "#{a} is out of range 0 <= arg < size"
+      raise ArgumentError.new, "#{a} is out of range (0...#{@n})"
     end
 
     @parent_or_size[a] < 0 ? a : (@parent_or_size[a] = leader(@parent_or_size[a]))
@@ -44,6 +44,4 @@ class DSU
   end
 end
 
-UnionFind        = DSU
-UnionFindTree    = DSU
-DisjointSetUnion = DSU
+UnionFind = DSU

data/lib/fenwick_tree.rb

@@ -2,7 +2,7 @@
 class FenwickTree
   attr_reader :data, :size
 
-  def initialize(arg = 0)
+  def initialize(arg = nil)
     case arg
     when Array
       @size = arg.size
@@ -17,7 +17,7 @@ class FenwickTree
       @size = arg
       @data = Array.new(@size + 1, 0)
     else
-      raise ArgumentError
+      raise ArgumentError.new("wrong argument. type is Array or Integer")
     end
   end
 
@@ -29,8 +29,25 @@ class FenwickTree
     end
   end
 
-  def sum(l, r)
-    _sum(r) - _sum(l)
+  # .sum(l, r)  # [l, r)  <- Original
+  # .sum(r)     # [0, r)  <- [Experimental]
+  # .sum(l..r)  # [l, r]  <- [Experimental]
+  def sum(a, b = nil)
+    if b
+      _sum(b) - _sum(a)
+    elsif a.is_a?(Range)
+      l = a.begin
+      l += @size if l < 0
+      if r = a.end
+        r += @size if r < 0
+        r += 1 unless a.exclude_end?
+      else
+        r = @size
+      end
+      _sum(r) - _sum(l)
+    else
+      _sum(a)
+    end
   end
 
   def _sum(i)
@@ -43,7 +60,3 @@ class FenwickTree
   end
   alias left_sum _sum
 end
-
-FeTree            = FenwickTree
-Fetree            = FenwickTree
-BinaryIndexedTree = FenwickTree

data/lib/lazy_segtree.rb

@@ -49,7 +49,18 @@ class LazySegtree
   end
   alias [] get
 
-  def prod(l, r)
+  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
+
     return @e if l == r
 
     l += @size
@@ -83,9 +94,22 @@ class LazySegtree
   end
 
   # apply(pos, f)
-  # apply(l, r, f) -> range_apply(l, r, f)
+  # apply(l, r, f)  -> range_apply(l, r, f)
+  # apply(l...r, f) -> range_apply(l, r, f)  ... [Experimental]
   def apply(pos, f, fr = nil)
-    return range_apply(pos, f, fr) if fr
+    if fr
+      return range_apply(pos, f, fr)
+    elsif pos.is_a?(Range)
+      l = pos.begin
+      l += @n if l < 0
+      if r = pos.end
+        r += @n if r < 0
+        r += 1 unless pos.exclude_end?
+      else
+        r = @n
+      end
+      return range_apply(l, r, f)
+    end
 
     pos += @size
     @log.downto(1) { |i| push(pos >> i) }
@@ -194,3 +218,5 @@ class LazySegtree
     @lz[k] = @id
   end
 end
+
+LazySegTree = LazySegtree

data/lib/max_flow.rb

@@ -1,6 +1,6 @@
 # MaxFlowGraph
 class MaxFlow
-  def initialize(n = 0)
+  def initialize(n)
     @n   = n
     @pos = []
     @g   = Array.new(n) { [] }
@@ -20,6 +20,15 @@ class MaxFlow
     edge_number
   end
 
+  def add_edges(edges)
+    edges.each{ |from, to, cap| add_edge(from, to, cap) }
+    self
+  end
+
+  def add(x, to = nil, cap = nil)
+    cap ? add_edge(x, to, cap) : add_edges(x)
+  end
+
   def push(edge)
     add_edge(*edge)
   end
@@ -132,6 +141,3 @@ class MaxFlow
     res
   end
 end
-
-MaxFlowGraph = MaxFlow
-MFGraph      = MaxFlow

data/lib/min_cost_flow.rb

@@ -11,7 +11,7 @@ class MinCostFlow
     @g_cost = Array.new(n) { [] }
     @pv     = Array.new(n)
     @pe     = Array.new(n)
-    @dual   = Array.new(n) { 0 }
+    @dual   = Array.new(n, 0)
   end
 
   def add_edge(from, to, cap, cost)
@@ -36,6 +36,15 @@ class MinCostFlow
     edge_number
   end
 
+  def add_edges(edges)
+    edges.each{ |from, to, cap, cost| add_edge(from, to, cap, cost) }
+    self
+  end
+
+  def add(x, to = nil, cap = nil, cost = nil)
+    cost ? add_edge(x, to, cap, cost) : add_edges(x)
+  end
+
   def get_edge(i)
     from, id = @pos[i]
     to = @g_to[from][id]
@@ -138,6 +147,3 @@ class MinCostFlow
   end
   alias min_cost_slop slope
 end
-
-MCF      = MinCostFlow
-MCFGraph = MinCostFlow

data/lib/scc.rb

@@ -1,18 +1,31 @@
 # Strongly Connected Components
 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
   # the components are sorted in topological order
   # O(@n + @edges.size)
@@ -58,7 +71,8 @@ class SCC
   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
@@ -69,8 +83,3 @@ class SCC
     [start, elist]
   end
 end
-
-# class alias
-StronglyConnectedComponents = SCC
-SCCGraph = SCC
-SCCG = SCC

data/lib/segtree.rb

@@ -2,14 +2,10 @@
 class Segtree
   attr_reader :d, :op, :n, :leaf_size, :log
 
-  # new(e){ |x, y|  }
   # new(v, e){ |x, y|  }
   # new(v, op, e)
-  def initialize(a0, a1 = nil, a2 = nil, &block)
-    if a1.nil?
-      @e, @op = a0, proc(&block)
-      v = []
-    elsif a2.nil?
+  def initialize(a0, a1, a2 = nil, &block)
+    if a2.nil?
       @e, @op = a1, proc(&block)
       v = (a0.is_a?(Array) ? a0 : [@e] * a0)
     else
@@ -37,7 +33,18 @@ class Segtree
   end
   alias [] get
 
-  def prod(l, r)
+  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
+
     return @e if l == r
 
     sml = @e
@@ -129,7 +136,7 @@ class Segtree
 
   # def inspect # for debug
   #   t = 0
-  #   res = "SegmentTree @e = #{@e}, @n = #{@n}, @leaf_size = #{@leaf_size} @op = #{@op}\n  "
+  #   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 << ' '
@@ -142,5 +149,4 @@ class Segtree
   # end
 end
 
-SegTree     = Segtree
-SegmentTree = Segtree
+SegTree = Segtree

data/lib/two_sat.rb

@@ -3,16 +3,18 @@ require_relative './scc.rb'
 # 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))

data/lib_lock/ac-library-rb.rb

@@ -2,6 +2,8 @@ module AcLibraryRb
 end
 include AcLibraryRb
 
+require_relative './lib_lock/ac-library-rb/all.rb'
+
 require_relative './ac-library-rb/convolution'
 require_relative './ac-library-rb/crt'
 require_relative './ac-library-rb/dsu'

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

@@ -123,4 +123,25 @@ module AcLibraryRb
 
     private :batterfly, :batterfly_inv, :bsf, :calc_primitive_root
   end
+
+  # [EXPERIMENTAL]
+  def convolution(a, b, mod: 998244353, k: 35, z: 99)
+    n = a.size
+    m = b.size
+    return [] if n == 0 || m == 0
+
+    raise ArgumentError if a.min < 0 || b.min < 0
+
+    format = "%0#{k}x" # "%024x"
+    sa = ""
+    sb = ""
+    a.each{ |x| sa << (format % x) }
+    b.each{ |x| sb << (format % x) }
+
+    zero = '0'
+    s = zero * z + ("%x" % (sa.hex * sb.hex))
+    i = -(n + m - 1) * k - 1
+
+    Array.new(n + m - 1){ (s[i + 1..i += k] || zero).hex % mod }
+  end
 end

data/lib_lock/ac-library-rb/core_ext/all.rb

@@ -0,0 +1,11 @@
+class Array
+  def to_fenwick_tree
+    AcLibraryRb::FenwickTree.new(self)
+  end
+  alias to_fetree to_fenwick_tree
+
+  def to_priority_queue
+    AcLibraryRb::PriorityQueue.new(self)
+  end
+  alias to_pq to_priority_queue
+end

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

@@ -1,14 +1,14 @@
 module AcLibraryRb
   # Disjoint Set Union
   class DSU
-    def initialize(n = 0)
+    def initialize(n)
       @n = n
       @parent_or_size = Array.new(n, -1)
       # root node: -1 * component size
       # otherwise: parent
     end
 
-    attr_accessor :parent_or_size
+    attr_reader :parent_or_size, :n
 
     def merge(a, b)
       x = leader(a)
@@ -28,7 +28,7 @@ module AcLibraryRb
 
     def leader(a)
       unless 0 <= a && a < @n
-        raise ArgumentError.new, "#{a} is out of range 0 <= arg < size"
+        raise ArgumentError.new, "#{a} is out of range (0...#{@n})"
       end
 
       @parent_or_size[a] < 0 ? a : (@parent_or_size[a] = leader(@parent_or_size[a]))
@@ -45,7 +45,5 @@ module AcLibraryRb
     end
   end
 
-  UnionFind        = DSU
-  UnionFindTree    = DSU
-  DisjointSetUnion = DSU
+  UnionFind = DSU
 end

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

@@ -3,7 +3,7 @@ module AcLibraryRb
   class FenwickTree
     attr_reader :data, :size
 
-    def initialize(arg = 0)
+    def initialize(arg = nil)
       case arg
       when Array
         @size = arg.size
@@ -18,7 +18,7 @@ module AcLibraryRb
         @size = arg
         @data = Array.new(@size + 1, 0)
       else
-        raise ArgumentError
+        raise ArgumentError.new("wrong argument. type is Array or Integer")
       end
     end
 
@@ -30,8 +30,25 @@ module AcLibraryRb
       end
     end
 
-    def sum(l, r)
-      _sum(r) - _sum(l)
+    # .sum(l, r)  # [l, r)  <- Original
+    # .sum(r)     # [0, r)  <- [Experimental]
+    # .sum(l..r)  # [l, r]  <- [Experimental]
+    def sum(a, b = nil)
+      if b
+        _sum(b) - _sum(a)
+      elsif a.is_a?(Range)
+        l = a.begin
+        l += @size if l < 0
+        if r = a.end
+          r += @size if r < 0
+          r += 1 unless a.exclude_end?
+        else
+          r = @size
+        end
+        _sum(r) - _sum(l)
+      else
+        _sum(a)
+      end
     end
 
     def _sum(i)
@@ -44,8 +61,4 @@ module AcLibraryRb
     end
     alias left_sum _sum
   end
-
-  FeTree            = FenwickTree
-  Fetree            = FenwickTree
-  BinaryIndexedTree = FenwickTree
 end

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

@@ -50,7 +50,18 @@ module AcLibraryRb
     end
     alias [] get
 
-    def prod(l, r)
+    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
+
       return @e if l == r
 
       l += @size
@@ -84,9 +95,22 @@ module AcLibraryRb
     end
 
     # apply(pos, f)
-    # apply(l, r, f) -> range_apply(l, r, f)
+    # apply(l, r, f)  -> range_apply(l, r, f)
+    # apply(l...r, f) -> range_apply(l, r, f)  ... [Experimental]
     def apply(pos, f, fr = nil)
-      return range_apply(pos, f, fr) if fr
+      if fr
+        return range_apply(pos, f, fr)
+      elsif pos.is_a?(Range)
+        l = pos.begin
+        l += @n if l < 0
+        if r = pos.end
+          r += @n if r < 0
+          r += 1 unless pos.exclude_end?
+        else
+          r = @n
+        end
+        return range_apply(l, r, f)
+      end
 
       pos += @size
       @log.downto(1) { |i| push(pos >> i) }
@@ -195,4 +219,6 @@ module AcLibraryRb
       @lz[k] = @id
     end
   end
+
+  LazySegTree = LazySegtree
 end

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

@@ -1,7 +1,7 @@
 module AcLibraryRb
   # MaxFlowGraph
   class MaxFlow
-    def initialize(n = 0)
+    def initialize(n)
       @n   = n
       @pos = []
       @g   = Array.new(n) { [] }
@@ -21,6 +21,15 @@ module AcLibraryRb
       edge_number
     end
 
+    def add_edges(edges)
+      edges.each{ |from, to, cap| add_edge(from, to, cap) }
+      self
+    end
+
+    def add(x, to = nil, cap = nil)
+      cap ? add_edge(x, to, cap) : add_edges(x)
+    end
+
     def push(edge)
       add_edge(*edge)
     end
@@ -133,7 +142,4 @@ module AcLibraryRb
       res
     end
   end
-
-  MaxFlowGraph = MaxFlow
-  MFGraph      = MaxFlow
 end

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

@@ -12,7 +12,7 @@ module AcLibraryRb
       @g_cost = Array.new(n) { [] }
       @pv     = Array.new(n)
       @pe     = Array.new(n)
-      @dual   = Array.new(n) { 0 }
+      @dual   = Array.new(n, 0)
     end
 
     def add_edge(from, to, cap, cost)
@@ -37,6 +37,15 @@ module AcLibraryRb
       edge_number
     end
 
+    def add_edges(edges)
+      edges.each{ |from, to, cap, cost| add_edge(from, to, cap, cost) }
+      self
+    end
+
+    def add(x, to = nil, cap = nil, cost = nil)
+      cost ? add_edge(x, to, cap, cost) : add_edges(x)
+    end
+
     def get_edge(i)
       from, id = @pos[i]
       to = @g_to[from][id]
@@ -139,7 +148,4 @@ module AcLibraryRb
     end
     alias min_cost_slop slope
   end
-
-  MCF      = MinCostFlow
-  MCFGraph = MinCostFlow
 end

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

@@ -2,18 +2,31 @@ module AcLibraryRb
   # Strongly Connected Components
   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
     # the components are sorted in topological order
     # O(@n + @edges.size)
@@ -59,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
@@ -70,9 +84,4 @@ module AcLibraryRb
       [start, elist]
     end
   end
-
-  # class alias
-  StronglyConnectedComponents = SCC
-  SCCGraph = SCC
-  SCCG = SCC
 end

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

@@ -3,14 +3,10 @@ module AcLibraryRb
   class Segtree
     attr_reader :d, :op, :n, :leaf_size, :log
 
-    # new(e){ |x, y|  }
     # new(v, e){ |x, y|  }
     # new(v, op, e)
-    def initialize(a0, a1 = nil, a2 = nil, &block)
-      if a1.nil?
-        @e, @op = a0, proc(&block)
-        v = []
-      elsif a2.nil?
+    def initialize(a0, a1, a2 = nil, &block)
+      if a2.nil?
         @e, @op = a1, proc(&block)
         v = (a0.is_a?(Array) ? a0 : [@e] * a0)
       else
@@ -38,7 +34,18 @@ module AcLibraryRb
     end
     alias [] get
 
-    def prod(l, r)
+    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
+
       return @e if l == r
 
       sml = @e
@@ -130,7 +137,7 @@ module AcLibraryRb
 
     # def inspect # for debug
     #   t = 0
-    #   res = "SegmentTree @e = #{@e}, @n = #{@n}, @leaf_size = #{@leaf_size} @op = #{@op}\n  "
+    #   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 << ' '
@@ -143,6 +150,5 @@ module AcLibraryRb
     # end
   end
 
-  SegTree     = Segtree
-  SegmentTree = Segtree
+  SegTree = Segtree
 end

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.4
+  version: 0.6.0
 platform: ruby
 authors:
 - universato
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-06 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
@@ -151,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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).