regexgen 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb6f68dd7f81cc6714b77b64161cce3b36943b9d9ad832386a576294888eee6c
-  data.tar.gz: 1ebb00e814c7c25587eb209922370516fd388e615d7c1a7bd1c30faa026d14db
+  metadata.gz: e86e086268d6721f47706182ff5ea253c144a1c17a204ebe35ecb8c1f706cc89
+  data.tar.gz: a88cd0e49107c29290c840d66a859a67538977b18fc3294b5df97894b99897ae
 SHA512:
-  metadata.gz: 2b9683000022bf3961a3cfd376e2eb97e4d17f24d73408fb456fd4c6d4dbcfec9c1add69405b75e58b76e19ece25b72f1c9a717d151ccec10f4f1ff168e5acf6
-  data.tar.gz: e440c3632860395f6da1713d60781fd1a29cfaaca4b80e568cf4704c0c7580541c6ddc0b7f8feaa0359608f100224209d5eeb068b3038f077fc5cdab8c8ac50f
+  metadata.gz: 9ea1ab6014151731615350e3eaeb5e975fb346e23b442c673077f424e806fae63c2a2db9058a041a8c32e523287c6417bdad0f54b6991c30c7f46e3ddc0fbcc1
+  data.tar.gz: ff525455e5a7ecbd1a2bbde4a618f1b192ebadfaf7c13c3d7f4bbdd750103b472c700bcbddda2a937466486c60310b28a5123d0030c97264903d9c11787cafd3

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-08-10 13:40:30 UTC using RuboCop version 0.89.0.
+# on 2020-08-18 06:34:11 UTC using RuboCop version 0.89.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -9,7 +9,7 @@
 # Offense count: 5
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
-  Max: 66
+  Max: 73
 
 # Offense count: 7
 # Configuration parameters: IgnoredMethods.
@@ -19,7 +19,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 6
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 39
+  Max: 47
 
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    regexgen (0.2.1)
+    regexgen (0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -26,19 +26,19 @@ GEM
     reverse_markdown (2.0.0)
       nokogiri
     rexml (3.2.4)
-    rubocop (0.89.0)
+    rubocop (0.89.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
+      rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (0.3.0)
       parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
-    solargraph (0.39.13)
+    solargraph (0.39.14)
       backport (~> 1.1)
       benchmark
       bundler (>= 1.17.2)

data/lib/regexgen/minimize.rb

@@ -41,20 +41,34 @@ module Regexgen
     # c is a letter of the alphabet
     # A ∩ B is intersection (A & B)
     # |A| is the cardinality of A (A.size)
-    def minimize(root, alphabet)
+    def minimize(root)
       states = root.visit
       final_states = states.select(&:accepting).to_set
 
+      # Create a map of incoming transitions to each state, grouped by
+      # character.
+      transitions = Hash.new { |h, k| h[k] = Hash.new { |h_, k_| h_[k_] = Set.new } }
+      states.each_with_object(transitions) do |s, acc|
+        s.transitions.each do |t, st|
+          acc[st][t] << s
+        end
+      end
+
       p = Set[states, final_states]
       w = Set.new(p)
       until w.empty?
         a = w.shift
-        alphabet.each do |c|
-          x = states.each_with_object(Set.new) do |s, acc|
-            next unless s.transitions.key?(c)
 
-            acc.add(s) if a.include?(s.transitions[c])
+        # Collect states that have transitions leading to states in a, grouped
+        # by character.
+        t = Hash.new { |h, k| h[k] = Set.new }
+        a.each_with_object(t) do |s, acc|
+          transitions[s].each do |t_, x|
+            acc[t_].merge(x)
           end
+        end
+
+        t.each_value do |x|
           p.to_a.each do |y|
             intersection = x & y
             next if intersection.empty?

data/lib/regexgen/trie.rb

@@ -27,7 +27,7 @@ module Regexgen
     end
 
     def minimize
-      Regexgen.minimize(@root, @alphabet)
+      Regexgen.minimize(@root)
     end
 
     def to_s

data/lib/regexgen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Regexgen
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexgen
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Aaron Madlon-Kay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug