grimoire 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80076e8f01f36c012ab6dfb0fd3e28002828f06b
-  data.tar.gz: 8a44a15ea9dc630a83937e8a765af8801784163d
+  metadata.gz: 244dbe7852a4c8a6571a1acca74fd4691f2b3b95
+  data.tar.gz: 8885acc391087a2f00aabbd2afc5cff96bcb7da7
 SHA512:
-  metadata.gz: a8d92eb9fcf4c38ae1fd67d5c30472cdcbf7e9775afc7b51129530cf16f9e37edd42269007d82e3ef32c397d9b2be26659f813f751a7f47dd4c436a0e5bab887
-  data.tar.gz: c980efe5d8a72b2ea50fe3b19169662939de2a711076aa4c2de3ce032e0be58dac1ffcc51b881bc7076b85d11e4b45adceb05268fdb8c15ca23b9c71c9a600ed
+  metadata.gz: 53f4a3d269886d731bbe4b624d2fbb5d8111e05dde78bbcc50bfa4d43955ca6f2b3ca6a04f41aef71ba3a0e6e45620c2b29e3465a7c3e72912c7cfd39978e661
+  data.tar.gz: 760312eebe3756cb1f7353dd78020dccbe87fdea4f93ee60cccbcd87e9a86f38fbc11f653faa8a862cf139a771935dd6dd76e22d2c8ca431e127007cf14a2de8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.6
+* Add support for external constraint set within solver
+* Allow Solver#requirements to be coerced from Array
+
 # v0.2.4
 * No longer force error when no requested units are within system
 * Discard no solution errors when pruning the world instead of failing

data/README.md

@@ -50,6 +50,23 @@ solver = Grimoire::Solver.new(
 )
 ```
 
+* Create a solver with restrictions (optional)
+
+```ruby
+solver = Grimoire::Solver.new(
+  :system => system,
+  :score_keeper => score_keeper,
+  :requirements => [
+    ['unit1', '> 2.0.0'],
+    ['unit2', '> 1', '< 3']
+  ],
+  :restrictions => [
+    ['unit1', '< 3'],
+    ['unit2', '> 1.2.0']
+  ]
+)
+```
+
 * Generate solutions
 
 ```ruby

data/lib/grimoire/solver.rb

@@ -10,7 +10,12 @@ module Grimoire
 
     include Bogo::Memoization
 
-    attribute :requirements, RequirementList, :required => true
+    attribute :restrictions, RequirementList, :coerce => lambda{|x|
+      RequirementList.new(:name => 'restrictions', :requirements => x) if x.is_a?(Array)
+    }
+    attribute :requirements, RequirementList, :required => true, :coerce => lambda{|x|
+      RequirementList.new(:name => 'requirements', :requirements => x) if x.is_a?(Array)
+    }
     attribute :system, System, :required => true
     attribute :score_keeper, UnitScoreKeeper
     attribute :result_limit, Integer, :required => true, :default => 1
@@ -25,11 +30,35 @@ module Grimoire
       @world = System.new
       @new_world = nil
       @log = []
+      if(restrictions)
+        apply_restrictions!
+      end
       build_world(requirements.requirements, world, system)
       @log.clear
       world.scrub!
     end
 
+    # Restrictions are simply an implicit expansion of the requirements
+    # that. When restrictions are provided, it serves to further
+    # restrict the valid units available for solutions
+    #
+    # @return [self]
+    def apply_restrictions!
+      restrictions.requirements.each do |rst|
+        req = requirements.requirements.detect do |r|
+          r.name == rst.name
+        end
+        if(req)
+          new_req = req.merge(rst)
+          requirements.requirements.delete(req)
+          requirements.requirements.push(new_req)
+        else
+          requirements.requirements.push(rst)
+        end
+      end
+      self
+    end
+
     # After the world has been generated extraneous units will
     # be included as a result of dependency constraints that may
     # be too loose and are not actually required by any resolution

data/lib/grimoire/version.rb

@@ -1,4 +1,4 @@
 module Grimoire
   # Current library version
-  VERSION = Gem::Version.new('0.2.4')
+  VERSION = Gem::Version.new('0.2.6')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grimoire
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo
@@ -112,4 +112,3 @@ signing_key:
 specification_version: 4
 summary: Constraint solver
 test_files: []
-has_rdoc: