grimoire 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef5df1a91ba2a0ba8d102c0566e2eccca125678c
-  data.tar.gz: 7f2faf3d48426e22fee9ddf77d2c7845d1897071
+  metadata.gz: 200bc22b954a33f6ec11d2a41403afafacc3fe35
+  data.tar.gz: e2ebba16137affccdf764c24c08132f8668bc6ab
 SHA512:
-  metadata.gz: 67788092dff047186519fff5efe33869c3395bda3769f49de24dca62d8a5e2a466d11278fbd770ed0cb14b212f782321a5c90c37ff8c9e6f555bfb68201a50cf
-  data.tar.gz: 548afdfb3c061bb89591113404c438e97d9ecf4ed7cb74b4cf5b843c4c2a820e998218bb3e3f2b72fbc5a262cf99c0ed61168f9f354cb7abd6c3ab76fb3f6125
+  metadata.gz: a4dbcf9162fe2846c739bb71fd1a9d50e87a7f843841663b0c7878917dbbf2dbab2a6ef004498543a3d07ba03c14806e714da846f15e523918c9f9fb434f5516
+  data.tar.gz: fa8a7d53d999489bf596f3ffbf1f77d5fd04ee68b3b5e3e236aab6dc2df230f55d75f4100cca5e9a6e1d3c4d00c703e813052a1cf87cd64e5042d771be42aa9d

data/CHANGELOG.md

@@ -1,2 +1,7 @@
+# v0.1.2
+* Add JSON serialization support to utility instances
+* Add abstract for unit scoring
+* Populate queues in single push
+
 # v0.1.0
 * Initial commit

data/lib/grimoire.rb

@@ -17,6 +17,7 @@ module Grimoire
   autoload :Solver, 'grimoire/solver'
   autoload :System, 'grimoire/system'
   autoload :Unit, 'grimoire/unit'
+  autoload :UnitScoreKeeper, 'grimoire/unit_score_keeper'
   autoload :Utility, 'grimoire/utility'
 
 end

data/lib/grimoire/solver.rb

@@ -11,6 +11,7 @@ module Grimoire
 
     attribute :requirements, RequirementList, :required => true
     attribute :system, System, :required => true
+    attribute :score_keeper, UnitScoreKeeper
 
     # @return [System] subset of full system based on requirements
     attr_reader :world
@@ -60,9 +61,11 @@ module Grimoire
     # @param units [Array<Unit>]
     # @return [Bogo::PriorityQueue]
     def populate_queue(p_queue, units)
-      units.each_with_index do |unit, index|
-        p_queue.push(unit, score_unit(unit, index))
+      i = 0
+      units = units.map do |unit|
+        [unit, score_unit(unit, i += 1)]
       end
+      p_queue.multi_push(units)
       p_queue
     end
 
@@ -70,9 +73,13 @@ module Grimoire
     #
     # @param unit [Unit]
     # @param score [Integer] current score
-    # @return [Integer] score
+    # @return [Numeric] score
     def score_unit(unit, score)
-      score
+      if(score_keeper)
+        score_keeper.score_for(unit) || score
+      else
+        score
+      end
     end
 
     # Repopulate the given queue

data/lib/grimoire/unit_score_keeper.rb

@@ -0,0 +1,15 @@
+require 'grimoire'
+
+module Grimoire
+  class UnitScoreKeeper < Utility
+
+    # Provide score for given unit
+    #
+    # @param unit [Unit]
+    # @return [Numeric]
+    def score_for(unit)
+      raise NotImplementedError.new 'No scoring has been defined'
+    end
+
+  end
+end

data/lib/grimoire/utility.rb

@@ -16,6 +16,10 @@ module Grimoire
       load_data(args)
     end
 
+    # @return [String] JSON serialized
+    def to_json(*args)
+      MultiJson.dump(data, *args)
+    end
   end
 
 end

data/lib/grimoire/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grimoire
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo
@@ -70,6 +70,7 @@ files:
 - lib/grimoire/solver.rb
 - lib/grimoire/system.rb
 - lib/grimoire/unit.rb
+- lib/grimoire/unit_score_keeper.rb
 - lib/grimoire/utility.rb
 - lib/grimoire/version.rb
 homepage: https://github.com/spox/grimoire