pub_grub 0.5.0.alpha2 → 0.5.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5d938331a11c5c808f24935dbecaba4ddebf099c5b511fe9d4308eedbafcf9c
-  data.tar.gz: 1c728638783ac576a475b29269b05d486c049b0d4725dd5fd030f95045f61390
+  metadata.gz: 2318849a1cea100c14280880d29b53fad23da9bb6e56035d16c8526304d02570
+  data.tar.gz: 06f54f9d158a9cc20684ae48eaccb2626276a8c3bec4e8b5ef301e1ceafb1958
 SHA512:
-  metadata.gz: 4ec023a28a5981e6835d5f20cee1534c05b98494c0f97638e161049f18bd9e11ee353563f0b705b119af52c318da829fe2056c773db200c09db077e674ee22eb
-  data.tar.gz: 88f857cbe30f1e30426fa68be1d3d293ea269e05fac2fdbcdadc83d6c928b9c9e360322da55e2ba5d0ccf512659010260cbc713787b42a0d39541db2f83e8f4e
+  metadata.gz: f043f66fe1ba07cbf5bf9e60c632e4a1100456125a66e09ba6512835808a1c5187576f4106c64ff600397d4a7ff87e590e8f30b2d5395d94d72a0358e6ac8f88
+  data.tar.gz: f46c47b204a5e7dc2b51a1e9eb26f798289a9d674adef3b2102c6fe2d697cbdf4509dca66482e317968fc386ad31f51638d682b4bfa90dcc75f62ec6205f5cd1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pub_grub (0.5.0.alpha2)
+    pub_grub (0.5.0.alpha3)
 
 GEM
   remote: https://rubygems.org/

data/lib/pub_grub/partial_solution.rb

@@ -21,7 +21,8 @@ module PubGrub
       package = term.package
       return :overlap if !@terms.key?(package)
 
-      @terms[package].relation(term)
+      @relation_cache[package][term] ||=
+        @terms[package].relation(term)
     end
 
     def satisfies?(term)
@@ -33,21 +34,12 @@ module PubGrub
     end
 
     def satisfier(term)
-      assigned_term = nil
-
-      @assignments_by[term.package].each do |assignment|
-        if assigned_term
-          assigned_term = assigned_term.intersect(assignment.term)
-        else
-          assigned_term = assignment.term
+      assignment =
+        @assignments_by[term.package].bsearch do |assignment|
+          @cumulative_assignments[assignment].satisfies?(term)
         end
 
-        if assigned_term.satisfies?(term)
-          return assignment
-        end
-      end
-
-      raise "#{term} unsatisfied"
+      assignment || raise("#{term} unsatisfied")
     end
 
     # A list of unsatisfied terms
@@ -94,32 +86,37 @@ module PubGrub
 
       # { Package => Array<Assignment> }
       @assignments_by = Hash.new { |h,k| h[k] = [] }
+      @cumulative_assignments = {}.compare_by_identity
 
       # { Package => Package::Version }
       @decisions = {}
 
       # { Package => Term }
       @terms = {}
+      @relation_cache = Hash.new { |h,k| h[k] = {} }
 
       # { Package => Boolean }
       @required = Set.new
     end
 
     def add_assignment(assignment)
-      @assignments << assignment
-      @assignments_by[assignment.term.package] << assignment
-
       term = assignment.term
       package = term.package
 
+      @assignments << assignment
+      @assignments_by[package] << assignment
+
       @required.add(package) if term.positive?
 
       if @terms.key?(package)
         old_term = @terms[package]
         @terms[package] = old_term.intersect(term)
       else
-        @terms[term.package] = term
+        @terms[package] = term
       end
+      @relation_cache[package].clear
+
+      @cumulative_assignments[assignment] = @terms[package]
     end
   end
 end

data/lib/pub_grub/version.rb

@@ -1,3 +1,3 @@
 module PubGrub
-  VERSION = "0.5.0.alpha2"
+  VERSION = "0.5.0.alpha3"
 end

data/lib/pub_grub/version_range.rb

@@ -79,7 +79,7 @@ module PubGrub
     end
 
     def hash
-      min.hash ^ max.hash ^ include_min.hash ^ include_max.hash
+      @hash ||= min.hash ^ max.hash ^ include_min.hash ^ include_max.hash
     end
 
     def eql?(other)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pub_grub
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha2
+  version: 0.5.0.alpha3
 platform: ruby
 authors:
 - John Hawthorn