linotype 0.0.4 → 0.0.5

data/lib/linotype/game.rb

@@ -173,8 +173,7 @@ module Linotype
     def uncovered_tiles
       all_tiles.select { |tile| !tile.covered_by }
     end
-    private :uncovered_tiles
-    
+        
     def defended_tiles(player)
       tile_rows.flatten.select { |tile| player && tile.covered_by == player && tile.defended? }
     end

data/lib/linotype/move.rb

@@ -44,6 +44,8 @@ module Linotype
       self.score["covered_#{time}".to_sym] = @game.covered_tiles(player).count
       self.score["edges_#{time}".to_sym] = @game.edge_tiles(player).count
       self.score["corners_#{time}".to_sym] = @game.corner_tiles(player).count
+      self.score["corners_defended_#{time}".to_sym] = (@game.defended_tiles(player) & @game.corner_tiles(player)).count
+      self.score["remaining_uncovered_#{time}".to_sym] = @game.uncovered_tiles.count
     end
     
     def calculate_net_scores
@@ -51,6 +53,7 @@ module Linotype
       self.score[:covered] = score[:covered_after] - score[:covered_before]
       self.score[:edges] = score[:edges_after] - score[:edges_before]
       self.score[:corners] = score[:corners_after] - score[:corners_before]
+      self.score[:corners_defended] = score[:corners_defended_after] - score[:corners_defended_before]
     end
            
     def valid?

data/lib/linotype/simulator.rb

@@ -21,8 +21,9 @@ module Linotype
         end
         game.print_board
         game.print_scores
+        puts "---------------"
       end
-      game
+      puts "Game Over!"
     end
     
   end

data/lib/linotype/strategy.rb

@@ -1,8 +1,17 @@
 module Linotype
   class Strategy
     
-    LETTERPRESS_FAN_HEURISTIC = ->(move) do
-      move.score[:covered] + move.score[:defended] + move.score[:edges] + move.score[:corners]
+    EDGE_AND_CORNER = ->(move) do
+      score = move.score[:covered] + move.score[:defended] + move.score[:edges] + move.score[:corners]
+      score += 100000 if move.score[:remaining_uncovered_after] == 0
+      score
+    end
+    
+    CORNER_LOVER = ->(move) do
+      score = move.score[:covered] + move.score[:defended] + move.score[:edges] + move.score[:corners]
+      score += 10 if (move.score[:corners_defended_before] == 0 && move.score[:corners_defended_after] > 0)
+      score += 100000 if move.score[:remaining_uncovered_after] == 0
+      score
     end
     
     MAX_SIX_LETTERS = ->(move) do
@@ -27,5 +36,9 @@ module Linotype
       scoring_algorithm.call move
     end
     
+    def self.predefined(strategy_name)
+      new(const_get(strategy_name))
+    end
+    
   end
 end

data/lib/linotype/version.rb

@@ -1,3 +1,3 @@
 module Linotype
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linotype
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: