grimoire 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e488dfe4964214969754e066c275034a4663d67
-  data.tar.gz: 015e51d0f9a05e51a00b5f0b41c4de77764c77f6
+  metadata.gz: 6edd571b20c68657154ccebb7e415844163e2021
+  data.tar.gz: c840f072f9a7ea4e7542e1a2243ed9b7b6b6b580
 SHA512:
-  metadata.gz: d4756adf5a06f61ed26b4732e7f8848b1a063f47372577578038be52ff8532e31d2c0f8e789612d9131d23aad8c27528fad05753d751b4bef6f821f8670253ce
-  data.tar.gz: 387138f63f6e94ee25c359be79359266721441b3f0779452fc20f871f525f1e2df03954a43702cf9473de8c10899c2249aa6ca547a2df7cad887d632dced909e
+  metadata.gz: 9588422c6b487a94fb009f75021499a918e7ffcf5fc247c1c1b4299b8a845170e0c2396b056a978dd04ef5018e434b1f1de71ed658adc0bfd99514e87278fa68
+  data.tar.gz: 6e73d8db9e4b7a82339cc4a7beb1673158cee6db83f76da3d904efe7a5939720f081aa9f9df638b6350bd264fa4e9d2f503942ba82044e5b7900a67b6cb6c35d

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.2.0
+* Use direct `#to_json` to prevent conversion errors on older ruby
+* Add `UnitScoreKeeper#preferred_score` to provide some score meaning
+* Pass scoring preference through to queue init
+* Provide current index to score keeper when requesting score
+
+_ BREAKING CHANGES_: `UnitScoreKeeper#score_for` must now accept two parameters
+
 # v0.1.6
 * Add debug output if UI is available for output
 * Update exception errors to provide more detail/context

data/lib/grimoire/solver.rb

@@ -54,12 +54,21 @@ module Grimoire
       end
     end
 
+    # @return [Bogo::PriorityQueue]
+    def create_queue
+      if(score_keeper)
+        Bogo::PriorityQueue.new(score_keeper.preferred_score)
+      else
+        Bogo::PriorityQueue.new
+      end
+    end
+
     # @return [Smash<{Unit#name:Bogo::PriorityQueue}>]
     def queues
       memoize(:queues) do
         Smash[
           world.units.map do |name, items|
-            queue = Bogo::PriorityQueue.new
+            queue = create_queue
             populate_queue(queue, items)
             [name, queue]
           end
@@ -88,7 +97,7 @@ module Grimoire
     # @return [Numeric] score
     def score_unit(unit, score)
       if(score_keeper)
-        score_keeper.score_for(unit) || score
+        score_keeper.score_for(unit, score) || score
       else
         score
       end
@@ -100,7 +109,7 @@ module Grimoire
     # @return [self]
     def reset_queue(name)
       queue = populate_queue(
-        Bogo::PriorityQueue.new,
+        create_queue,
         world.units[name]
       )
       queues[name] = queue

data/lib/grimoire/unit_score_keeper.rb

@@ -3,11 +3,20 @@ require 'grimoire'
 module Grimoire
   class UnitScoreKeeper < Utility
 
+    # Define meaning of score by what should be preferred. This is
+    # used by the solver to apply correct sorting to the queues.
+    #
+    # @return [Symbol] :lowscore or :highscore
+    def preferred_score
+      :lowscore
+    end
+
     # Provide score for given unit
     #
     # @param unit [Unit]
+    # @param idx [Integer] current order index
     # @return [Numeric]
-    def score_for(unit)
+    def score_for(unit, idx)
       raise NotImplementedError.new 'No scoring has been defined'
     end
 

data/lib/grimoire/utility.rb

@@ -18,7 +18,7 @@ module Grimoire
 
     # @return [String] JSON serialized
     def to_json(*args)
-      MultiJson.dump(data, *args)
+      data.to_json(*args)
     end
 
     # Write debug message

data/lib/grimoire/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grimoire
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo