From 9487a1d65daabe5cf32cef00b21ac14abf3717df Mon Sep 17 00:00:00 2001
From: Rushil Umaretiya <rushilwiz@gmail.com>
Date: Tue, 15 Dec 2020 10:09:32 -0500
Subject: [PATCH] finished u3 l1

---
 Unit 3/Umaretiya_r_U3_L1.py      |   6 +-
 Unit 3/Umaretiya_r_U3_L1_test.py | 123 -------------------------------
 2 files changed, 3 insertions(+), 126 deletions(-)
 delete mode 100644 Unit 3/Umaretiya_r_U3_L1_test.py

diff --git a/Unit 3/Umaretiya_r_U3_L1.py b/Unit 3/Umaretiya_r_U3_L1.py
index 54b605a..d43c5e9 100644
--- a/Unit 3/Umaretiya_r_U3_L1.py	
+++ b/Unit 3/Umaretiya_r_U3_L1.py	
@@ -19,7 +19,7 @@ def utility(turn, tc, state):
    for li in tc:
       check_li = [state[x] for x in li]
       if len(set(check_li)) == 1 and check_li[0] != '.':
-         if turn != check_li[0]:
+         if turn == check_li[0]:
             return 1
          else:
             return -1
@@ -32,7 +32,7 @@ def minimax(state, turn, tc):
 def max_value(state, turn, tc):
    # return value and state: (val, state)
    if terminal_test(state, tc):
-      return utility('X' if turn == 'O' else 'O', tc, state), state
+      return utility(turn, tc, state), state
    v = -99999
    result = state
    for curr_state, successor in successors(state, turn):
@@ -47,7 +47,7 @@ def max_value(state, turn, tc):
 def min_value(state, turn, tc):
    # return value and state: (val, state)
    if terminal_test(state, tc):
-      return utility(turn, tc, state), state
+      return utility('X' if turn == 'O' else 'O', tc, state), state
    v = 99999
    result = state
    for curr_state, successor in successors(state, turn):
diff --git a/Unit 3/Umaretiya_r_U3_L1_test.py b/Unit 3/Umaretiya_r_U3_L1_test.py
deleted file mode 100644
index 54b605a..0000000
--- a/Unit 3/Umaretiya_r_U3_L1_test.py	
+++ /dev/null
@@ -1,123 +0,0 @@
-# Name: Rushil Umaretiya
-# Date: 12/10/2020
-
-def successors(state, turn):
-   sli = [i for i in range(len(state)) if state[i] == '.']
-   ret = [(state, state[0:i] + turn + state[i+1:]) for i in sli]
-   return ret  # [(previous state, new state), ...]
-
-def terminal_test(state, tc):
-   if state.find('.') < 0: return True    # check empty spot
-   for li in tc:
-      check_li = [state[x] for x in li]
-      if len(set(check_li)) == 1 and check_li[0] != '.':
-         return True
-   return False
-      
-def utility(turn, tc, state):
-   # return 1 (turn wins), -1 (turn loses), or 0 (tie)
-   for li in tc:
-      check_li = [state[x] for x in li]
-      if len(set(check_li)) == 1 and check_li[0] != '.':
-         if turn != check_li[0]:
-            return 1
-         else:
-            return -1
-   return 0
-
-def minimax(state, turn, tc):
-   max_val = max_value(state, turn, tc)   # returns state
-   return max_val[1]
-
-def max_value(state, turn, tc):
-   # return value and state: (val, state)
-   if terminal_test(state, tc):
-      return utility('X' if turn == 'O' else 'O', tc, state), state
-   v = -99999
-   result = state
-   for curr_state, successor in successors(state, turn):
-      min_val, min_state = min_value(successor, 'X' if turn == 'O' else 'O', tc)
-      if v < min_val:
-         if v == 1: return v, result
-         v = min_val
-         result = successor
-          
-   return v, result
-
-def min_value(state, turn, tc):
-   # return value and state: (val, state)
-   if terminal_test(state, tc):
-      return utility(turn, tc, state), state
-   v = 99999
-   result = state
-   for curr_state, successor in successors(state, turn):
-      max_val, max_state = max_value(successor, 'X' if turn == 'O' else 'O', tc)
-      if v > max_val:
-         if v == -1: return v, result
-         v = max_val
-         result = successor
-
-   return v, result
-
-def get_turn(state):
-   count = {'X': 0, 'O': 0, '.':9}
-   for s in state: count[s] += 1
-   return 'O' if count['O'] < count['X'] else 'X' 
-
-def conditions_table(n=3, n2=9):
-   ret = [[] for i in range(n*2+2)]
-   for i in range(n2):
-      ret[i//n].append(i)     # rows: [0, 1, 2], [3, 4, 5], [6, 7, 8]
-      ret[n+i%n].append(i)    # cols: [0, 3, 6], [1, 4, 7], [2, 5, 8]
-      if i//n == i % n: ret[n+n].append(i)   # diagonal \: [0, 4, 8]
-      if i // n == n - i%n - 1: ret[n+n+1].append(i)  # diagonal /: [2, 4, 6]
-   return ret
-
-def display(state, n=3, n2=9):
-   str = ""
-   for i in range(n2):
-      str += state[i] + ' '
-      if i % n == n-1: str += '\n'
-   return str
-
-def human_play(s, n, turn):
-   index_li = [x for x in range(len(s)) if s[x] == '.']
-   for i in index_li:
-      print ('[%s] (%s, %s)' % (i, i//n, i%n))
-   index = int(input("What's your input? (Type a number): "))
-   while s[index] != '.':
-      index = int(input("Invalid. What's your input? "))
-   state = s[0:index] + turn + s[index+1:]
-   return state
-   
-def main():
-   X = input("X is human or AI? (h: human, a: AI) ")
-   O = input("O is human or AI? (h: human, a: AI) ")
-   state = input("input state (ENTER if it's an empty state): ")
-   if len(state) == 0: state = '.........'
-   turn = get_turn(state)
-   tc = conditions_table(3, 9)
-   print ("Game start!")
-   print (display(state, 3, 9))
-   while terminal_test(state, tc) == False:
-      if turn == 'X':
-         print ("{}'s turn:".format(turn))
-         if X == 'a': state = minimax(state, turn, tc)
-         else: state = human_play(state, 3, turn)
-         print (display(state, 3, 9))
-         turn = 'O'
-      else:
-         print ("{}'s turn:".format(turn))
-         if O == 'a': state = minimax(state, turn, tc)
-         else: state = human_play(state, 3, turn)
-         print (display(state, 3, 9))
-         turn = 'X'
-         
-   if utility(turn, tc, state) == 0:
-      print ("Game over! Tie!")
-   else: 
-      turn = 'O' if turn == 'X' else 'X'
-      print ('Game over! ' + turn + ' win!')
-
-if __name__ =='__main__':
-   main()
\ No newline at end of file