ac-library-rb 0.6.0 → 0.7.0

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

@@ -37,39 +37,40 @@ module AcLibraryRb
 
     # return edge = [from, to, cap, flow]
     def [](i)
-      _e  = @g[@pos[i][0]][@pos[i][1]]
-      _re = @g[_e[0]][_e[1]]
-      [@pos[i][0], _e[0], _e[-1] + _re[-1], _re[-1]]
+      from, from_id = @pos[i]
+
+      to, to_id, cap = @g[from][from_id]    # edge
+      _from, _from_id, flow = @g[to][to_id] # reverse edge
+
+      [from, to, cap + flow, flow]
     end
     alias get_edge []
     alias edge []
 
     def edges
-      @pos.map do |(from, id)|
-        _e  = @g[from][id]
-        _re = @g[_e[0]][_e[1]]
-        [from, _e[0], _e[-1] + _re[-1], _re[-1]]
+      @pos.map do |(from, from_id)|
+        to, to_id, cap = @g[from][from_id]
+        _from, _from_id, flow = @g[to][to_id]
+        [from, to, cap + flow, flow]
       end
     end
 
     def change_edge(i, new_cap, new_flow)
-      _e  = @g[@pos[i][0]][@pos[i][1]]
-      _re = @g[_e[0]][_e[1]]
-      _e[2]  = new_cap - new_flow
-      _re[2] = new_flow
+      from, from_id = @pos[i]
+
+      e = @g[from][from_id]
+      re = @g[e[0]][e[1]]
+      e[2]  = new_cap - new_flow
+      re[2] = new_flow
     end
 
     def flow(s, t, flow_limit = 1 << 64)
-      level = Array.new(@n)
-      iter  = Array.new(@n)
-      que   = []
-
       flow = 0
       while flow < flow_limit
-        bfs(s, t, level, que)
+        level = bfs(s, t)
         break if level[t] == -1
 
-        iter.fill(0)
+        iter = [0] * @n
         while flow < flow_limit
           f = dfs(t, flow_limit - flow, s, level, iter)
           break if f == 0
@@ -99,22 +100,22 @@ module AcLibraryRb
 
     private
 
-    def bfs(s, t, level, que)
-      level.fill(-1)
+    def bfs(s, t)
+      level = Array.new(@n, -1)
       level[s] = 0
-      que.clear
-      que << s
+      que = [s]
 
       while (v = que.shift)
-        @g[v].each do |e|
-          next if e[2] == 0 || level[e[0]] >= 0
+        @g[v].each do |u, _, cap|
+          next if cap == 0 || level[u] >= 0
 
-          level[e[0]] = level[v] + 1
-          return nil if e[0] == t
+          level[u] = level[v] + 1
+          return level if u == t
 
-          que << e[0]
+          que << u
         end
       end
+      level
     end
 
     def dfs(v, up, s, level, iter)

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

@@ -5,7 +5,7 @@ module AcLibraryRb
   class ModInt < Numeric
     class << self
       def set_mod(mod)
-        raise ArgumentError unless mod.is_a? Integer and 1 <= mod
+        raise ArgumentError unless mod.is_a?(Integer) && (1 <= mod)
 
         $_mod = mod
         $_mod_is_prime = ModInt.prime?(mod)
@@ -27,7 +27,7 @@ module AcLibraryRb
 
       def prime?(n)
         return false if n <= 1
-        return true if n == 2 or n == 7 or n == 61
+        return true if (n == 2) || (n == 7) || (n == 61)
         return false if (n & 1) == 0
 
         d = n - 1
@@ -35,11 +35,11 @@ module AcLibraryRb
         [2, 7, 61].each do |a|
           t = d
           y = a.pow(t, n)
-          while t != n - 1 and y != 1 and y != n - 1
+          while (t != n - 1) && (y != 1) && (y != n - 1)
             y = y * y % n
             t <<= 1
           end
-          return false if y != n - 1 and (t & 1) == 0
+          return false if (y != n - 1) && ((t & 1) == 0)
         end
         true
       end

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

@@ -14,11 +14,17 @@ module AcLibraryRb
       heapify
     end
 
+    def self.[](*array, &comp)
+      new(array, &comp)
+    end
+
     attr_reader :heap
+    alias to_a heap
 
     # Push new element to the heap.
     def push(item)
       shift_down(0, @heap.push(item).size - 1)
+      self
     end
 
     alias << push
@@ -47,6 +53,14 @@ module AcLibraryRb
       @heap.empty?
     end
 
+    def size
+      @heap.size
+    end
+
+    def to_s
+      "<#{self.class}: @heap:(#{heap.join(', ')}), @comp:<#{@comp.class} #{@comp.source_location.join(':')}>>"
+    end
+
     private
 
     def heapify

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

@@ -9,7 +9,7 @@ module AcLibraryRb
 
     # add directed edge
     def add_edge(from, to)
-      unless 0 <= from && from < @n and 0 <= to && to < @n
+      unless 0 <= from && from < @n && 0 <= to && to < @n
         msg = "Wrong params: from=#{from} and to=#{to} must be in 0...#{@n}"
         raise ArgumentError.new(msg)
       end

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

@@ -13,8 +13,8 @@ module AcLibraryRb
     attr_reader :answer
 
     def add_clause(i, f, j, g)
-      unless 0 <= i && i < @n and 0 <= j && j < @n
-        raise RangeError.new
+      unless 0 <= i && i < @n && 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))
@@ -22,7 +22,7 @@ module AcLibraryRb
       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]
@@ -31,7 +31,7 @@ module AcLibraryRb
       end
       true
     end
-    alias satisfiable? satisfiable
+    alias satisfiable satisfiable?
   end
 
   TwoSat = TwoSAT

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ac-library-rb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - universato
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2022-11-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: prime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -52,9 +66,24 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
+- !ruby/object:Gem::Dependency
+  name: simplecov-cobertura
+  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......
+  DSU(UnionFind), FenwickTree, PriorityQueue, Segtree, SCC, 2-SAT,
+  suffix_array, lcp_array, z_algorithm, crt, inv_mod, floor_sum, max_flow, min_cost_flow......
 email:
 - universato@gmail.com
 executables: []
@@ -70,6 +99,7 @@ files:
 - README.md
 - Rakefile
 - ac-library-rb.gemspec
+- ac-library-rb_header.jpg
 - bin/console
 - bin/lock_lib.rb
 - bin/setup
@@ -84,6 +114,7 @@ files:
 - document_en/min_cost_flow.md
 - document_en/modint.md
 - document_en/priority_queue.md
+- document_en/scc.md
 - document_en/segtree.md
 - document_en/string.md
 - document_en/two_sat.md
@@ -123,8 +154,8 @@ 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
@@ -151,23 +182,24 @@ licenses:
 metadata:
   homepage_uri: https://github.com/universato/ac-library-rb
   source_code_uri: https://github.com/universato/ac-library-rb
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib_lock
-- lib_helpers
+- lib_helpers"
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 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,24 +0,0 @@
-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'
-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'