ac-library-rb 0.5.2 → 0.6.1

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
@@ -128,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/two_sat.rb

@@ -4,23 +4,25 @@ 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 ArgumentError.new("i:#{i} and j:#{j} must be in (0...#{@n})")
+      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))
       nil
     end
 
-    def satisfiable
+    def satisfiable?
       id = @scc.send(:scc_ids)[1]
       @n.times do |i|
         return false if id[2 * i] == id[2 * i + 1]
@@ -29,7 +31,7 @@ module AcLibraryRb
       end
       true
     end
-    alias satisfiable? satisfiable
+    alias satisfiable satisfiable?
   end
 
   TwoSat = TwoSAT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ac-library-rb
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - universato
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2021-08-09 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
@@ -108,9 +123,10 @@ files:
 - lib/suffix_array.rb
 - lib/two_sat.rb
 - lib/z_algorithm.rb
+- lib_helpers/ac-library-rb.rb
 - 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.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: ac-library-rb is a ruby port of AtCoder Library (ACL).

data/lib_lock/ac-library-rb.rb

@@ -1,22 +0,0 @@
-module AcLibraryRb
-end
-include AcLibraryRb
-
-require_relative './ac-library-rb/convolution'
-require_relative './ac-library-rb/crt'
-require_relative './ac-library-rb/dsu'
-require_relative './ac-library-rb/fenwick_tree'
-require_relative './ac-library-rb/floor_sum'
-require_relative './ac-library-rb/inv_mod'
-require_relative './ac-library-rb/lazy_segtree'
-require_relative './ac-library-rb/lcp_array'
-require_relative './ac-library-rb/max_flow'
-require_relative './ac-library-rb/min_cost_flow'
-require_relative './ac-library-rb/modint'
-require_relative './ac-library-rb/pow_mod'
-require_relative './ac-library-rb/priority_queue'
-require_relative './ac-library-rb/scc'
-require_relative './ac-library-rb/segtree'
-require_relative './ac-library-rb/suffix_array'
-require_relative './ac-library-rb/two_sat'
-require_relative './ac-library-rb/z_algorithm'