From 9fa16cbb025795fec47fee1edd93d81ca9ee5c39 Mon Sep 17 00:00:00 2001
From: Mitchell Vitez <mitchellvitez@gmail.com>
Date: Tue, 15 Apr 2014 16:22:14 -0400
Subject: [PATCH 1/2] Added weighting and empty/max scoring

---
 playout_strategy.py | 63 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 2 deletions(-)

diff --git a/playout_strategy.py b/playout_strategy.py
index 56549f1..c6de61f 100644
--- a/playout_strategy.py
+++ b/playout_strategy.py
@@ -6,7 +6,6 @@ def __init__(self,X=None):
     super(Twenty48Strategy, self).__init__(X)
     
   def estimate_score(self,numiter=50):
-    # raise NotImplementedError("You haven't implemented this yet")
     vals = []
     for i in range(numiter):
       t = Twenty48(self.X)
@@ -30,6 +29,55 @@ def take_best_move(self,numiter=50):
     self.move(best_action)
     return best_action
 
+class Twenty48StrategyWeighted(Twenty48Strategy):
+  """ Takes into account the score, highest number on the board,
+        and the number of empty slots left on the board, all weighted """
+        
+  def __init__(self, X=None):
+    super(Twenty48Strategy, self).__init__(X)
+    self.sumWeight = 1
+    self.maxWeight = 1
+    self.emptyWeight = 1
+
+  def set_weights(self, sumw, maxw, emptyw):
+    self.sumWeight = sumw
+    self.maxWeight = maxw
+    self.emptyWeight = emptyw
+      
+  def estimate_score(self,numiter=50):
+    vals = []
+    for i in range(numiter):
+      t = Twenty48(self.X)
+      t.run_until_dead()
+      vals.append(self.sumWeight * t.score() + self.maxWeight * t.highest() 
+                  + self.emptyWeight * t.get_open_slots_num())
+    return sum(vals)/float(numiter)
+
+class Twenty48StrategyMaximizeSum(Twenty48StrategyWeighted):
+  """ Maximizes the sum of numbers on the board
+        same strategy as initial Twenty48Strategy """
+  def __init__(self):
+    super(Twenty48StrategyWeighted, self).__init__()
+    self.sumWeight = 1
+    self.maxWeight = 0
+    self.emptyWeight = 0
+    
+class Twenty48StrategyMaximizeHighest(Twenty48StrategyWeighted):
+  """ Maximizes the highest number currently on the board """
+  def __init__(self):
+    super(Twenty48StrategyWeighted, self).__init__()
+    self.sumWeight = 0
+    self.maxWeight = 1
+    self.emptyWeight = 0
+
+class Twenty48StrategyMaximizeEmpty(Twenty48StrategyWeighted):
+  """ Maximizes the number of empty slots left on the board """
+  def __init__(self):
+    super(Twenty48StrategyWeighted, self).__init__()
+    self.sumWeight = 0
+    self.maxWeight = 0
+    self.emptyWeight = 1
+
 class TwoLayerStrategy(Twenty48Strategy):
   """docstring for TwoLayerStrategy"""
   def __init__(self, X=None):
@@ -51,9 +99,20 @@ def estimate_moves(self,numiter=10):
 
 if __name__ == '__main__':
 
-  t = Twenty48Strategy()
+  # t = Twenty48Strategy()
+  t = Twenty48StrategyWeighted()
+  t.set_weights(3.1, 2.4, 1.6)
+  # t = Twenty48StrategyMaximizeSum()
+  # t = Twenty48StrategyMaximizeHighest()
+  # t = Twenty48StrategyMaximizeEmpty()
+  ## The three above all seem to be suboptimal strategies
   # t = TwoLayerStrategy()
   print t
+  count = 0
   while not t.is_dead():
     print "best action is %s" % t.take_best_move(numiter=50)
     print t
+  if t.highest() >= 2048: 
+      print "Game was won"
+  else: 
+      print "Game was lost"

From ab85bffe30f9c40e6ed754b54478890bbc4085c0 Mon Sep 17 00:00:00 2001
From: Mitchell Vitez <mitchellvitez@gmail.com>
Date: Tue, 15 Apr 2014 16:23:14 -0400
Subject: [PATCH 2/2] Added getters for empty spaces and max on board

---
 twenty48.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/twenty48.py b/twenty48.py
index 06f77ae..05b38bd 100644
--- a/twenty48.py
+++ b/twenty48.py
@@ -61,6 +61,8 @@ def set(self,i,j,val): self.X[4*i + j] = val
   def get(self,i,j): return self.X[4*i + j]
 
   def score(self): return sum(self.X)
+  
+  def highest(self): return max(self.X)
 
   def add_random_piece(self):
     pair = self.pick_rand_slot()
@@ -74,9 +76,15 @@ def add_random_piece(self):
   def get_open_slots(self):
     return [(i,j) for i in range(4) for j in range(4) if self.get(i,j) == 0]
 
+  def get_open_slots_num(self):
+    return len([(i,j) for i in range(4) for j in range(4) if self.get(i,j) == 0])
+
   def get_full_slots(self):
     return [(i,j) for i in range(4) for j in range(4) if self.get(i,j) != 0] 
 
+  def get_full_slots_num(self):
+    return len([(i,j) for i in range(4) for j in range(4) if self.get(i,j) != 0])
+
   def pick_rand_slot(self):
     open_slots = self.get_open_slots()
     if len(open_slots) == 0:  return False
@@ -115,4 +123,4 @@ def estimate_score(self,numiter=50):
   
 
 
-  
\ No newline at end of file
+