From 71975d58891d7c650d835a541a15fe398867f7af Mon Sep 17 00:00:00 2001 From: zsq259 <2530059525@qq.com> Date: Sun, 23 Jun 2024 00:05:13 +0800 Subject: [PATCH] feat: p0 and p1 --- README.md | 180 ++++ search/VERSION | 1 + search/autograder.py | 361 ++++++++ search/eightpuzzle.py | 281 ++++++ search/game.py | 729 ++++++++++++++++ search/ghostAgents.py | 81 ++ search/grading.py | 320 +++++++ search/graphicsDisplay.py | 679 +++++++++++++++ search/graphicsUtils.py | 402 +++++++++ search/keyboardAgents.py | 84 ++ search/layout.py | 150 ++++ search/layouts/bigCorners.lay | 37 + search/layouts/bigMaze.lay | 37 + search/layouts/bigSafeSearch.lay | 8 + search/layouts/bigSearch.lay | 15 + search/layouts/boxSearch.lay | 14 + search/layouts/capsuleClassic.lay | 7 + search/layouts/contestClassic.lay | 9 + search/layouts/contoursMaze.lay | 11 + search/layouts/greedySearch.lay | 8 + search/layouts/mediumClassic.lay | 11 + search/layouts/mediumCorners.lay | 14 + search/layouts/mediumDottedMaze.lay | 18 + search/layouts/mediumMaze.lay | 18 + search/layouts/mediumSafeSearch.lay | 6 + search/layouts/mediumScaryMaze.lay | 18 + search/layouts/mediumSearch.lay | 8 + search/layouts/minimaxClassic.lay | 5 + search/layouts/oddSearch.lay | 7 + search/layouts/openClassic.lay | 9 + search/layouts/openMaze.lay | 23 + search/layouts/openSearch.lay | 7 + search/layouts/originalClassic.lay | 27 + search/layouts/powerClassic.lay | 7 + search/layouts/smallClassic.lay | 7 + search/layouts/smallMaze.lay | 10 + search/layouts/smallSafeSearch.lay | 15 + search/layouts/smallSearch.lay | 5 + search/layouts/testClassic.lay | 10 + search/layouts/testMaze.lay | 3 + search/layouts/testSearch.lay | 5 + search/layouts/tinyCorners.lay | 8 + search/layouts/tinyMaze.lay | 7 + search/layouts/tinySafeSearch.lay | 7 + search/layouts/tinySearch.lay | 7 + search/layouts/trappedClassic.lay | 5 + search/layouts/trickyClassic.lay | 13 + search/layouts/trickySearch.lay | 7 + search/pacman.py | 684 +++++++++++++++ search/pacmanAgents.py | 52 ++ search/projectParams.py | 18 + search/search.py | 119 +++ search/searchAgents.py | 543 ++++++++++++ search/searchTestClasses.py | 823 ++++++++++++++++++ search/testClasses.py | 206 +++++ search/testParser.py | 85 ++ search/test_cases/CONFIG | 1 + search/test_cases/q1/CONFIG | 2 + search/test_cases/q1/graph_backtrack.solution | 7 + search/test_cases/q1/graph_backtrack.test | 32 + .../test_cases/q1/graph_bfs_vs_dfs.solution | 7 + search/test_cases/q1/graph_bfs_vs_dfs.test | 30 + search/test_cases/q1/graph_infinite.solution | 7 + search/test_cases/q1/graph_infinite.test | 30 + search/test_cases/q1/graph_manypaths.solution | 7 + search/test_cases/q1/graph_manypaths.test | 39 + search/test_cases/q1/pacman_1.solution | 40 + search/test_cases/q1/pacman_1.test | 27 + search/test_cases/q2/CONFIG | 2 + search/test_cases/q2/graph_backtrack.solution | 7 + search/test_cases/q2/graph_backtrack.test | 32 + .../test_cases/q2/graph_bfs_vs_dfs.solution | 7 + search/test_cases/q2/graph_bfs_vs_dfs.test | 30 + search/test_cases/q2/graph_infinite.solution | 7 + search/test_cases/q2/graph_infinite.test | 30 + search/test_cases/q2/graph_manypaths.solution | 7 + search/test_cases/q2/graph_manypaths.test | 39 + search/test_cases/q2/pacman_1.solution | 22 + search/test_cases/q2/pacman_1.test | 27 + search/test_cases/q3/CONFIG | 2 + search/test_cases/q3/graph_backtrack.solution | 7 + search/test_cases/q3/graph_backtrack.test | 32 + .../test_cases/q3/graph_bfs_vs_dfs.solution | 7 + search/test_cases/q3/graph_bfs_vs_dfs.test | 30 + search/test_cases/q3/graph_infinite.solution | 7 + search/test_cases/q3/graph_infinite.test | 30 + search/test_cases/q3/graph_manypaths.solution | 7 + search/test_cases/q3/graph_manypaths.test | 39 + search/test_cases/q3/ucs_0_graph.solution | 7 + search/test_cases/q3/ucs_0_graph.test | 39 + search/test_cases/q3/ucs_1_problemC.solution | 22 + search/test_cases/q3/ucs_1_problemC.test | 28 + search/test_cases/q3/ucs_2_problemE.solution | 22 + search/test_cases/q3/ucs_2_problemE.test | 28 + search/test_cases/q3/ucs_3_problemW.solution | 34 + search/test_cases/q3/ucs_3_problemW.test | 28 + .../test_cases/q3/ucs_4_testSearch.solution | 12 + search/test_cases/q3/ucs_4_testSearch.test | 16 + .../q3/ucs_5_goalAtDequeue.solution | 7 + search/test_cases/q3/ucs_5_goalAtDequeue.test | 29 + search/test_cases/q4/CONFIG | 2 + search/test_cases/q4/astar_0.solution | 7 + search/test_cases/q4/astar_0.test | 39 + .../q4/astar_1_graph_heuristic.solution | 7 + .../q4/astar_1_graph_heuristic.test | 54 ++ .../test_cases/q4/astar_2_manhattan.solution | 22 + search/test_cases/q4/astar_2_manhattan.test | 27 + .../q4/astar_3_goalAtDequeue.solution | 7 + .../test_cases/q4/astar_3_goalAtDequeue.test | 29 + search/test_cases/q4/graph_backtrack.solution | 7 + search/test_cases/q4/graph_backtrack.test | 32 + search/test_cases/q4/graph_manypaths.solution | 7 + search/test_cases/q4/graph_manypaths.test | 39 + search/test_cases/q5/CONFIG | 3 + .../test_cases/q5/corner_tiny_corner.solution | 2 + search/test_cases/q5/corner_tiny_corner.test | 14 + search/test_cases/q6/CONFIG | 3 + search/test_cases/q6/corner_sanity_1.solution | 7 + search/test_cases/q6/corner_sanity_1.test | 12 + search/test_cases/q6/corner_sanity_2.solution | 7 + search/test_cases/q6/corner_sanity_2.test | 12 + search/test_cases/q6/corner_sanity_3.solution | 9 + search/test_cases/q6/corner_sanity_3.test | 15 + search/test_cases/q6/medium_corners.solution | 16 + search/test_cases/q6/medium_corners.test | 19 + search/test_cases/q7/CONFIG | 3 + .../test_cases/q7/food_heuristic_1.solution | 2 + search/test_cases/q7/food_heuristic_1.test | 13 + .../test_cases/q7/food_heuristic_10.solution | 2 + search/test_cases/q7/food_heuristic_10.test | 13 + .../test_cases/q7/food_heuristic_11.solution | 2 + search/test_cases/q7/food_heuristic_11.test | 13 + .../test_cases/q7/food_heuristic_12.solution | 2 + search/test_cases/q7/food_heuristic_12.test | 13 + .../test_cases/q7/food_heuristic_13.solution | 2 + search/test_cases/q7/food_heuristic_13.test | 13 + .../test_cases/q7/food_heuristic_14.solution | 2 + search/test_cases/q7/food_heuristic_14.test | 19 + .../test_cases/q7/food_heuristic_15.solution | 2 + search/test_cases/q7/food_heuristic_15.test | 32 + .../test_cases/q7/food_heuristic_16.solution | 2 + search/test_cases/q7/food_heuristic_16.test | 15 + .../test_cases/q7/food_heuristic_17.solution | 2 + search/test_cases/q7/food_heuristic_17.test | 14 + .../test_cases/q7/food_heuristic_2.solution | 2 + search/test_cases/q7/food_heuristic_2.test | 32 + .../test_cases/q7/food_heuristic_3.solution | 2 + search/test_cases/q7/food_heuristic_3.test | 15 + .../test_cases/q7/food_heuristic_4.solution | 2 + search/test_cases/q7/food_heuristic_4.test | 14 + .../test_cases/q7/food_heuristic_5.solution | 2 + search/test_cases/q7/food_heuristic_5.test | 13 + .../test_cases/q7/food_heuristic_6.solution | 2 + search/test_cases/q7/food_heuristic_6.test | 13 + .../test_cases/q7/food_heuristic_7.solution | 2 + search/test_cases/q7/food_heuristic_7.test | 13 + .../test_cases/q7/food_heuristic_8.solution | 2 + search/test_cases/q7/food_heuristic_8.test | 13 + .../test_cases/q7/food_heuristic_9.solution | 2 + search/test_cases/q7/food_heuristic_9.test | 13 + .../q7/food_heuristic_grade_tricky.solution | 2 + .../q7/food_heuristic_grade_tricky.test | 19 + search/test_cases/q8/CONFIG | 2 + search/test_cases/q8/closest_dot_1.solution | 2 + search/test_cases/q8/closest_dot_1.test | 11 + search/test_cases/q8/closest_dot_10.solution | 2 + search/test_cases/q8/closest_dot_10.test | 17 + search/test_cases/q8/closest_dot_11.solution | 2 + search/test_cases/q8/closest_dot_11.test | 30 + search/test_cases/q8/closest_dot_12.solution | 2 + search/test_cases/q8/closest_dot_12.test | 13 + search/test_cases/q8/closest_dot_13.solution | 2 + search/test_cases/q8/closest_dot_13.test | 12 + search/test_cases/q8/closest_dot_2.solution | 2 + search/test_cases/q8/closest_dot_2.test | 11 + search/test_cases/q8/closest_dot_3.solution | 2 + search/test_cases/q8/closest_dot_3.test | 11 + search/test_cases/q8/closest_dot_4.solution | 2 + search/test_cases/q8/closest_dot_4.test | 11 + search/test_cases/q8/closest_dot_5.solution | 2 + search/test_cases/q8/closest_dot_5.test | 11 + search/test_cases/q8/closest_dot_6.solution | 2 + search/test_cases/q8/closest_dot_6.test | 11 + search/test_cases/q8/closest_dot_7.solution | 2 + search/test_cases/q8/closest_dot_7.test | 11 + search/test_cases/q8/closest_dot_8.solution | 2 + search/test_cases/q8/closest_dot_8.test | 11 + search/test_cases/q8/closest_dot_9.solution | 2 + search/test_cases/q8/closest_dot_9.test | 11 + search/textDisplay.py | 81 ++ search/util.py | 672 ++++++++++++++ tutorial/addition.py | 23 + tutorial/autograder.py | 395 +++++++++ tutorial/buyLotsOfFruit.py | 46 + tutorial/grading.py | 322 +++++++ tutorial/projectParams.py | 18 + tutorial/shop.py | 60 ++ tutorial/shopAroundTown.py | 114 +++ tutorial/shopSmart.py | 46 + tutorial/submission_autograder.py | 30 + tutorial/testClasses.py | 207 +++++ tutorial/testParser.py | 86 ++ tutorial/test_cases/CONFIG | 1 + tutorial/test_cases/q1/CONFIG | 2 + tutorial/test_cases/q1/addition1.solution | 3 + tutorial/test_cases/q1/addition1.test | 7 + tutorial/test_cases/q1/addition2.solution | 3 + tutorial/test_cases/q1/addition2.test | 7 + tutorial/test_cases/q1/addition3.solution | 3 + tutorial/test_cases/q1/addition3.test | 7 + tutorial/test_cases/q2/CONFIG | 2 + tutorial/test_cases/q2/food_price1.solution | 3 + tutorial/test_cases/q2/food_price1.test | 7 + tutorial/test_cases/q2/food_price2.solution | 3 + tutorial/test_cases/q2/food_price2.test | 7 + tutorial/test_cases/q2/food_price3.solution | 3 + tutorial/test_cases/q2/food_price3.test | 7 + tutorial/test_cases/q3/CONFIG | 2 + tutorial/test_cases/q3/select_shop1.solution | 3 + tutorial/test_cases/q3/select_shop1.test | 21 + tutorial/test_cases/q3/select_shop2.solution | 3 + tutorial/test_cases/q3/select_shop2.test | 21 + tutorial/test_cases/q3/select_shop3.solution | 3 + tutorial/test_cases/q3/select_shop3.test | 23 + tutorial/textDisplay.py | 85 ++ tutorial/town.py | 105 +++ tutorial/tutorialTestClasses.py | 57 ++ tutorial/util.py | 696 +++++++++++++++ 228 files changed, 11213 insertions(+) create mode 100644 search/VERSION create mode 100644 search/autograder.py create mode 100644 search/eightpuzzle.py create mode 100644 search/game.py create mode 100644 search/ghostAgents.py create mode 100644 search/grading.py create mode 100644 search/graphicsDisplay.py create mode 100644 search/graphicsUtils.py create mode 100644 search/keyboardAgents.py create mode 100644 search/layout.py create mode 100644 search/layouts/bigCorners.lay create mode 100644 search/layouts/bigMaze.lay create mode 100644 search/layouts/bigSafeSearch.lay create mode 100644 search/layouts/bigSearch.lay create mode 100644 search/layouts/boxSearch.lay create mode 100644 search/layouts/capsuleClassic.lay create mode 100644 search/layouts/contestClassic.lay create mode 100644 search/layouts/contoursMaze.lay create mode 100644 search/layouts/greedySearch.lay create mode 100644 search/layouts/mediumClassic.lay create mode 100644 search/layouts/mediumCorners.lay create mode 100644 search/layouts/mediumDottedMaze.lay create mode 100644 search/layouts/mediumMaze.lay create mode 100644 search/layouts/mediumSafeSearch.lay create mode 100644 search/layouts/mediumScaryMaze.lay create mode 100644 search/layouts/mediumSearch.lay create mode 100644 search/layouts/minimaxClassic.lay create mode 100644 search/layouts/oddSearch.lay create mode 100644 search/layouts/openClassic.lay create mode 100644 search/layouts/openMaze.lay create mode 100644 search/layouts/openSearch.lay create mode 100644 search/layouts/originalClassic.lay create mode 100644 search/layouts/powerClassic.lay create mode 100644 search/layouts/smallClassic.lay create mode 100644 search/layouts/smallMaze.lay create mode 100644 search/layouts/smallSafeSearch.lay create mode 100644 search/layouts/smallSearch.lay create mode 100644 search/layouts/testClassic.lay create mode 100644 search/layouts/testMaze.lay create mode 100644 search/layouts/testSearch.lay create mode 100644 search/layouts/tinyCorners.lay create mode 100644 search/layouts/tinyMaze.lay create mode 100644 search/layouts/tinySafeSearch.lay create mode 100644 search/layouts/tinySearch.lay create mode 100644 search/layouts/trappedClassic.lay create mode 100644 search/layouts/trickyClassic.lay create mode 100644 search/layouts/trickySearch.lay create mode 100644 search/pacman.py create mode 100644 search/pacmanAgents.py create mode 100644 search/projectParams.py create mode 100644 search/search.py create mode 100644 search/searchAgents.py create mode 100644 search/searchTestClasses.py create mode 100644 search/testClasses.py create mode 100644 search/testParser.py create mode 100644 search/test_cases/CONFIG create mode 100644 search/test_cases/q1/CONFIG create mode 100644 search/test_cases/q1/graph_backtrack.solution create mode 100644 search/test_cases/q1/graph_backtrack.test create mode 100644 search/test_cases/q1/graph_bfs_vs_dfs.solution create mode 100644 search/test_cases/q1/graph_bfs_vs_dfs.test create mode 100644 search/test_cases/q1/graph_infinite.solution create mode 100644 search/test_cases/q1/graph_infinite.test create mode 100644 search/test_cases/q1/graph_manypaths.solution create mode 100644 search/test_cases/q1/graph_manypaths.test create mode 100644 search/test_cases/q1/pacman_1.solution create mode 100644 search/test_cases/q1/pacman_1.test create mode 100644 search/test_cases/q2/CONFIG create mode 100644 search/test_cases/q2/graph_backtrack.solution create mode 100644 search/test_cases/q2/graph_backtrack.test create mode 100644 search/test_cases/q2/graph_bfs_vs_dfs.solution create mode 100644 search/test_cases/q2/graph_bfs_vs_dfs.test create mode 100644 search/test_cases/q2/graph_infinite.solution create mode 100644 search/test_cases/q2/graph_infinite.test create mode 100644 search/test_cases/q2/graph_manypaths.solution create mode 100644 search/test_cases/q2/graph_manypaths.test create mode 100644 search/test_cases/q2/pacman_1.solution create mode 100644 search/test_cases/q2/pacman_1.test create mode 100644 search/test_cases/q3/CONFIG create mode 100644 search/test_cases/q3/graph_backtrack.solution create mode 100644 search/test_cases/q3/graph_backtrack.test create mode 100644 search/test_cases/q3/graph_bfs_vs_dfs.solution create mode 100644 search/test_cases/q3/graph_bfs_vs_dfs.test create mode 100644 search/test_cases/q3/graph_infinite.solution create mode 100644 search/test_cases/q3/graph_infinite.test create mode 100644 search/test_cases/q3/graph_manypaths.solution create mode 100644 search/test_cases/q3/graph_manypaths.test create mode 100644 search/test_cases/q3/ucs_0_graph.solution create mode 100644 search/test_cases/q3/ucs_0_graph.test create mode 100644 search/test_cases/q3/ucs_1_problemC.solution create mode 100644 search/test_cases/q3/ucs_1_problemC.test create mode 100644 search/test_cases/q3/ucs_2_problemE.solution create mode 100644 search/test_cases/q3/ucs_2_problemE.test create mode 100644 search/test_cases/q3/ucs_3_problemW.solution create mode 100644 search/test_cases/q3/ucs_3_problemW.test create mode 100644 search/test_cases/q3/ucs_4_testSearch.solution create mode 100644 search/test_cases/q3/ucs_4_testSearch.test create mode 100644 search/test_cases/q3/ucs_5_goalAtDequeue.solution create mode 100644 search/test_cases/q3/ucs_5_goalAtDequeue.test create mode 100644 search/test_cases/q4/CONFIG create mode 100644 search/test_cases/q4/astar_0.solution create mode 100644 search/test_cases/q4/astar_0.test create mode 100644 search/test_cases/q4/astar_1_graph_heuristic.solution create mode 100644 search/test_cases/q4/astar_1_graph_heuristic.test create mode 100644 search/test_cases/q4/astar_2_manhattan.solution create mode 100644 search/test_cases/q4/astar_2_manhattan.test create mode 100644 search/test_cases/q4/astar_3_goalAtDequeue.solution create mode 100644 search/test_cases/q4/astar_3_goalAtDequeue.test create mode 100644 search/test_cases/q4/graph_backtrack.solution create mode 100644 search/test_cases/q4/graph_backtrack.test create mode 100644 search/test_cases/q4/graph_manypaths.solution create mode 100644 search/test_cases/q4/graph_manypaths.test create mode 100644 search/test_cases/q5/CONFIG create mode 100644 search/test_cases/q5/corner_tiny_corner.solution create mode 100644 search/test_cases/q5/corner_tiny_corner.test create mode 100644 search/test_cases/q6/CONFIG create mode 100644 search/test_cases/q6/corner_sanity_1.solution create mode 100644 search/test_cases/q6/corner_sanity_1.test create mode 100644 search/test_cases/q6/corner_sanity_2.solution create mode 100644 search/test_cases/q6/corner_sanity_2.test create mode 100644 search/test_cases/q6/corner_sanity_3.solution create mode 100644 search/test_cases/q6/corner_sanity_3.test create mode 100644 search/test_cases/q6/medium_corners.solution create mode 100644 search/test_cases/q6/medium_corners.test create mode 100644 search/test_cases/q7/CONFIG create mode 100644 search/test_cases/q7/food_heuristic_1.solution create mode 100644 search/test_cases/q7/food_heuristic_1.test create mode 100644 search/test_cases/q7/food_heuristic_10.solution create mode 100644 search/test_cases/q7/food_heuristic_10.test create mode 100644 search/test_cases/q7/food_heuristic_11.solution create mode 100644 search/test_cases/q7/food_heuristic_11.test create mode 100644 search/test_cases/q7/food_heuristic_12.solution create mode 100644 search/test_cases/q7/food_heuristic_12.test create mode 100644 search/test_cases/q7/food_heuristic_13.solution create mode 100644 search/test_cases/q7/food_heuristic_13.test create mode 100644 search/test_cases/q7/food_heuristic_14.solution create mode 100644 search/test_cases/q7/food_heuristic_14.test create mode 100644 search/test_cases/q7/food_heuristic_15.solution create mode 100644 search/test_cases/q7/food_heuristic_15.test create mode 100644 search/test_cases/q7/food_heuristic_16.solution create mode 100644 search/test_cases/q7/food_heuristic_16.test create mode 100644 search/test_cases/q7/food_heuristic_17.solution create mode 100644 search/test_cases/q7/food_heuristic_17.test create mode 100644 search/test_cases/q7/food_heuristic_2.solution create mode 100644 search/test_cases/q7/food_heuristic_2.test create mode 100644 search/test_cases/q7/food_heuristic_3.solution create mode 100644 search/test_cases/q7/food_heuristic_3.test create mode 100644 search/test_cases/q7/food_heuristic_4.solution create mode 100644 search/test_cases/q7/food_heuristic_4.test create mode 100644 search/test_cases/q7/food_heuristic_5.solution create mode 100644 search/test_cases/q7/food_heuristic_5.test create mode 100644 search/test_cases/q7/food_heuristic_6.solution create mode 100644 search/test_cases/q7/food_heuristic_6.test create mode 100644 search/test_cases/q7/food_heuristic_7.solution create mode 100644 search/test_cases/q7/food_heuristic_7.test create mode 100644 search/test_cases/q7/food_heuristic_8.solution create mode 100644 search/test_cases/q7/food_heuristic_8.test create mode 100644 search/test_cases/q7/food_heuristic_9.solution create mode 100644 search/test_cases/q7/food_heuristic_9.test create mode 100644 search/test_cases/q7/food_heuristic_grade_tricky.solution create mode 100644 search/test_cases/q7/food_heuristic_grade_tricky.test create mode 100644 search/test_cases/q8/CONFIG create mode 100644 search/test_cases/q8/closest_dot_1.solution create mode 100644 search/test_cases/q8/closest_dot_1.test create mode 100644 search/test_cases/q8/closest_dot_10.solution create mode 100644 search/test_cases/q8/closest_dot_10.test create mode 100644 search/test_cases/q8/closest_dot_11.solution create mode 100644 search/test_cases/q8/closest_dot_11.test create mode 100644 search/test_cases/q8/closest_dot_12.solution create mode 100644 search/test_cases/q8/closest_dot_12.test create mode 100644 search/test_cases/q8/closest_dot_13.solution create mode 100644 search/test_cases/q8/closest_dot_13.test create mode 100644 search/test_cases/q8/closest_dot_2.solution create mode 100644 search/test_cases/q8/closest_dot_2.test create mode 100644 search/test_cases/q8/closest_dot_3.solution create mode 100644 search/test_cases/q8/closest_dot_3.test create mode 100644 search/test_cases/q8/closest_dot_4.solution create mode 100644 search/test_cases/q8/closest_dot_4.test create mode 100644 search/test_cases/q8/closest_dot_5.solution create mode 100644 search/test_cases/q8/closest_dot_5.test create mode 100644 search/test_cases/q8/closest_dot_6.solution create mode 100644 search/test_cases/q8/closest_dot_6.test create mode 100644 search/test_cases/q8/closest_dot_7.solution create mode 100644 search/test_cases/q8/closest_dot_7.test create mode 100644 search/test_cases/q8/closest_dot_8.solution create mode 100644 search/test_cases/q8/closest_dot_8.test create mode 100644 search/test_cases/q8/closest_dot_9.solution create mode 100644 search/test_cases/q8/closest_dot_9.test create mode 100644 search/textDisplay.py create mode 100644 search/util.py create mode 100644 tutorial/addition.py create mode 100644 tutorial/autograder.py create mode 100644 tutorial/buyLotsOfFruit.py create mode 100644 tutorial/grading.py create mode 100644 tutorial/projectParams.py create mode 100644 tutorial/shop.py create mode 100644 tutorial/shopAroundTown.py create mode 100644 tutorial/shopSmart.py create mode 100644 tutorial/submission_autograder.py create mode 100644 tutorial/testClasses.py create mode 100644 tutorial/testParser.py create mode 100644 tutorial/test_cases/CONFIG create mode 100644 tutorial/test_cases/q1/CONFIG create mode 100644 tutorial/test_cases/q1/addition1.solution create mode 100644 tutorial/test_cases/q1/addition1.test create mode 100644 tutorial/test_cases/q1/addition2.solution create mode 100644 tutorial/test_cases/q1/addition2.test create mode 100644 tutorial/test_cases/q1/addition3.solution create mode 100644 tutorial/test_cases/q1/addition3.test create mode 100644 tutorial/test_cases/q2/CONFIG create mode 100644 tutorial/test_cases/q2/food_price1.solution create mode 100644 tutorial/test_cases/q2/food_price1.test create mode 100644 tutorial/test_cases/q2/food_price2.solution create mode 100644 tutorial/test_cases/q2/food_price2.test create mode 100644 tutorial/test_cases/q2/food_price3.solution create mode 100644 tutorial/test_cases/q2/food_price3.test create mode 100644 tutorial/test_cases/q3/CONFIG create mode 100644 tutorial/test_cases/q3/select_shop1.solution create mode 100644 tutorial/test_cases/q3/select_shop1.test create mode 100644 tutorial/test_cases/q3/select_shop2.solution create mode 100644 tutorial/test_cases/q3/select_shop2.test create mode 100644 tutorial/test_cases/q3/select_shop3.solution create mode 100644 tutorial/test_cases/q3/select_shop3.test create mode 100644 tutorial/textDisplay.py create mode 100644 tutorial/town.py create mode 100644 tutorial/tutorialTestClasses.py create mode 100644 tutorial/util.py diff --git a/README.md b/README.md index 00b2756..84529ee 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,182 @@ # PPCA-AIPacMan-2024 + PPCA AI 吃豆人项目 + +本项目基于[加州大学伯克利分校的CS 188《Introduction to Artificial Intelligence》课程项目](https://inst.eecs.berkeley.edu/~cs188/sp24/projects/) + +## Week 1 + +### 环境配置 + +推荐使用 [miniconda](https://docs.anaconda.com/miniconda/) + +**创建虚拟环境**（注意在创建时要指定python版本并且自己给环境命名） + + ```cmd +conda create --name pacman python=3.9 +conda activate pacman + ``` + +**安装相关的工具包** + +``` +conda install pip +conda install numpy +conda install matplotlib +``` + +如果下载时间过长，可以使用 + + ```cmd +conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/free + ``` + +指令加载清华源或其他镜像源作为下载路径。 + +### Python 基础 + +[推荐阅读](https://www.liaoxuefeng.com/wiki/1016959663602400) + +相关文件在 [tutorial]() 文件夹下。 + +我们提供了一些小测试以供大家熟悉 Python： + +- 加法：阅读 `addition.py` 并补全代码。 +- 给定水果价格和订单列表，计算总价：阅读 `buyLotsOfFruit.py` 并实现`buyLotsOfFruit(orderList)`函数。 +- 计算最低总价：阅读 `shopSmart.py` 并补全 `shopSmart(orderList,fruitShops)` 函数。在 `shop.py` 中查看 `FruitShop` 类的实现。 + +运行 `python autograder.py` 会评估你对这三个问题的解决方案，运行 `python autograder.py -q q1` 将仅测试第一个问题。 + +### Pac-Man Agents + +>你说的对，但是《吃豆人》是由南梦宫自主研发的一款全新街机游戏。游戏发生在一个被称作「迷宫」的幻想世界，在这里，被神选中的人将被授予「能量豆」，导引元素之力。你将扮演一位名为「吃豆人」的神秘角色，在自由的旅行中邂逅性格相同、能力一致的豆子们，和他们一起击败强敌，找回失散的豆子——同时，逐步发掘「吃豆人」的真相。 + +接下来，你将进入吃豆人的世界~ + +### Search + +相关文件在 [search]() 文件夹下。 + +#### 介绍 + +接下来这段时间，你将用搜索算法实现吃豆人的行为。 + +你需要补全的代码文件有： + +- `search.py` +- `searchAgents.py` + +你可以阅读并参考来帮助你实现代码的文件有： + +- `pacman.py` +- `game.py` +- `util.py` + +运行 `python pacman.py` 即可启动吃豆人游戏，你可以用你的键盘操作吃豆人并探索。 + +在 `searchAgents.py` 中，将会存在不同的 `agent` 类来决定吃豆人的行为模式。它规划出一条吃豆人穿越迷宫的路径，然后逐步执行该路径。 + +比如 `GoWestAgent` 会让吃豆人一路向西。你可以运行 `python pacman.py --layout testMaze --pacman GoWestAgent` 查看。 + +显然他会遇到糟糕的情况：`python pacman.py --layout tinyMaze --pacman GoWestAgent`。 + +另一个 `SearchAgent` 的例子：`python pacman.py -l tinyMaze -p SearchAgent -a fn=tinyMazeSearch`。这次是 `tinyMazeSearch`。 + +但是，寻找路径的算法其实还未实现，这是你的任务。不久后，你的吃豆人 agent 或许将所向披靡！ + +运行 `python pacman.py -h` 可以查看相关参数列表。 + +#### Q1：DFS + +是时候编写成熟的通用搜索函数来帮助吃豆人规划路线了。在这个场景里，地图中只有一个目标豆子。 + +你需要实现 `search.py` 中的 `depthFirstSearch` 函数，使用深度优先搜索来规划一条吃到豆子的路线。 + +**重要提示**：所有搜索函数都需要返回一个操作列表，这些操作将引导吃豆人从起点到达目标。这些操作都必须是合法的移动（有效方向，不穿过墙壁）。 + +**重要提示**：请务必使用 `util.py` 中提供的 `Stack` , `Queue` 和 `PriorityQueue` 数据结构！这些数据结构实现具有与自动评分器兼容所需的特定属性。 + +提示：在实现前，可以仔细阅读函数内的注释，和 `SearchProblem` 类定义的接口。 + +如果你成功实现，应该可以快速解决： + +``` +python pacman.py -l tinyMaze -p SearchAgent +python pacman.py -l mediumMaze -p SearchAgent +python pacman.py -l bigMaze -z .5 -p SearchAgent +``` + +迷宫将显示已探索状态的叠加图，以及探索顺序（红色越亮表示探索越早）。探索顺序是否符合你的预期？吃豆人在到达目标的途中是否真的会经过所有已探索的方格？ + +提示：如果你使用 `Stack` 作为数据结构，则 DFS 算法找到的 `mediumMaze` 的解决方案的长度应为 130（前提是你按照 `getSuccessors` 提供的顺序探索后继者；如果按相反顺序推入它们，则可能会得到 246）。这是最低成本解决方案吗？如果不是，请考虑深度优先搜索做错了什么。 + +运行以下命令来查看你的实现是否通过了所有自动评分测试用例。 + +``` +python autograder.py -q q1 +``` + +#### Q2：BFS + +同 DFS，用深度优先搜索实现 `search.py` 中的 `breadthFirstSearch` 函数。 + +运行： + +``` +python pacman.py -l mediumMaze -p SearchAgent -a fn=bfs +python pacman.py -l bigMaze -p SearchAgent -a fn=bfs -z .5 +``` + +注意：如果你已经通用地编写了搜索代码，那么你的代码无需进行任何更改就应该同样适用于八谜题搜索问题。 + +``` +python eightpuzzle.py +``` + +运行以下命令来查看你的实现是否通过了所有自动评分测试用例。 + +``` +python autograder.py -q q2 +``` + +#### Q3：改变成本函数 + +虽然 BFS 会找到一条到达目标的最少操作路径，但我们可能希望找到其他意义上“最佳”的路径。考虑 `mediumDottedMaze` 和 `mediumScaryMaze` 这两个地图。通过改变成本函数，我们可以鼓励吃豆人寻找不同的路径。例如，我们可以对鬼魂出没地区的危险步骤收取更多费用，或对食物丰富地区的步骤收取更少费用，而理性的吃豆人代理应该会据此调整其行为。 + +你需要在 `search.py` 中的 `uniformCostSearch` 函数中实现均匀成本图搜索算法。我们鼓励你仔细查看 `util.py` 一些可能对你的实现有用的数据结构。现在你应该在以下所有三种地图中观察到成功的行为，其中下面的 agent 都是 UCS agent，它们仅在使用的成本函数上有所不同（agent 和成本函数已经为你编写好）： + +``` +python pacman.py -l mediumMaze -p SearchAgent -a fn=ucs +python pacman.py -l mediumDottedMaze -p StayEastSearchAgent +python pacman.py -l mediumScaryMaze -p StayWestSearchAgent +``` + +提示：对于 `StayEastSearchAgent` 和 `StayWestSearchAgent`， 你应该分别获得非常低和非常高的路径成本（有关详细信息，请参阅`searchAgents.py`）。 + +运行以下命令来查看你的实现是否通过了所有自动评分测试用例。 + +``` +python autograder.py -q q3 +``` + +#### Q4：A* 搜索 + +在 `search.py` 中的函数 `aStarSearch` 中实现 A\* 搜索。A\* 以启发式函数为参数。启发式函数有两个参数：搜索问题中的状态（主要参数）和问题本身（用于参考）。`search.py` 中的 `nullHeuristic` 启发式函数就是一个简单的例子。 + +你可以使用曼哈顿距离启发式算法（已在 `searchAgents.py` 中实现 `manhattanHeuristic`）测试你的 A* 实现，该算法针对原来的问题，即寻找穿过迷宫到达固定位置的路径。 + +``` +python pacman.py -l bigMaze -z .5 -p SearchAgent -a fn=astar,heuristic=manhattanHeuristic +python pacman.py -l openMaze -z .5 -p SearchAgent -a fn=astar,heuristic=m +anhattanHeuristic +``` + +你应该看到 A* 找到最佳解决方案的速度比统一成本搜索略快。 + +运行以下命令来查看你的实现是否通过了所有自动评分测试用例。 + +``` +python autograder.py -q q4 +``` + +#### diff --git a/search/VERSION b/search/VERSION new file mode 100644 index 0000000..259e855 --- /dev/null +++ b/search/VERSION @@ -0,0 +1 @@ +v1.004 diff --git a/search/autograder.py b/search/autograder.py new file mode 100644 index 0000000..6db6c07 --- /dev/null +++ b/search/autograder.py @@ -0,0 +1,361 @@ +# autograder.py +# ------------- +# Licensing Information: You are free to use or extend these projects for +# educational purposes provided that (1) you do not distribute or publish +# solutions, (2) you retain this notice, and (3) you provide clear +# attribution to UC Berkeley, including a link to http://ai.berkeley.edu. +# +# Attribution Information: The Pacman AI projects were developed at UC Berkeley. +# The core projects and autograders were primarily created by John DeNero +# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu). +# Student side autograding was added by Brad Miller, Nick Hay, and +# Pieter Abbeel (pabbeel@cs.berkeley.edu). + + +# imports from python standard library +import grading +import importlib.util +import optparse +import os +import re +import sys +import projectParams +import random +random.seed(0) +try: + from pacman import GameState +except: + pass + +# register arguments and set default values +def readCommand(argv): + parser = optparse.OptionParser(description = 'Run public tests on student code') + parser.set_defaults(generateSolutions=False, edxOutput=False, gsOutput=False, muteOutput=False, printTestCase=False, noGraphics=False) + parser.add_option('--test-directory', + dest = 'testRoot', + default = 'test_cases', + help = 'Root test directory which contains subdirectories corresponding to each question') + parser.add_option('--student-code', + dest = 'studentCode', + default = projectParams.STUDENT_CODE_DEFAULT, + help = 'comma separated list of student code files') + parser.add_option('--code-directory', + dest = 'codeRoot', + default = "", + help = 'Root directory containing the student and testClass code') + parser.add_option('--test-case-code', + dest = 'testCaseCode', + default = projectParams.PROJECT_TEST_CLASSES, + help = 'class containing testClass classes for this project') + parser.add_option('--generate-solutions', + dest = 'generateSolutions', + action = 'store_true', + help = 'Write solutions generated to .solution file') + parser.add_option('--edx-output', + dest = 'edxOutput', + action = 'store_true', + help = 'Generate edX output files') + parser.add_option('--gradescope-output', + dest = 'gsOutput', + action = 'store_true', + help = 'Generate GradeScope output files') + parser.add_option('--mute', + dest = 'muteOutput', + action = 'store_true', + help = 'Mute output from executing tests') + parser.add_option('--print-tests', '-p', + dest = 'printTestCase', + action = 'store_true', + help = 'Print each test case before running them.') + parser.add_option('--test', '-t', + dest = 'runTest', + default = None, + help = 'Run one particular test. Relative to test root.') + parser.add_option('--question', '-q', + dest = 'gradeQuestion', + default = None, + help = 'Grade one particular question.') + parser.add_option('--no-graphics', + dest = 'noGraphics', + action = 'store_true', + help = 'No graphics display for pacman games.') + (options, args) = parser.parse_args(argv) + return options + + +# confirm we should author solution files +def confirmGenerate(): + print('WARNING: this action will overwrite any solution files.') + print('Are you sure you want to proceed? (yes/no)') + while True: + ans = sys.stdin.readline().strip() + if ans == 'yes': + break + elif ans == 'no': + sys.exit(0) + else: + print('please answer either "yes" or "no"') + + +# TODO: Fix this so that it tracebacks work correctly +# Looking at source of the traceback module, presuming it works +# the same as the intepreters, it uses co_filename. This is, +# however, a readonly attribute. +def setModuleName(module, filename): + functionType = type(confirmGenerate) + classType = type(optparse.Option) + + for i in dir(module): + o = getattr(module, i) + if hasattr(o, '__file__'): continue + + if type(o) == functionType: + setattr(o, '__file__', filename) + elif type(o) == classType: + setattr(o, '__file__', filename) + # TODO: assign member __file__'s? + #print(i, type(o)) + + +#from cStringIO import StringIO + +def loadModuleString(moduleSource): + # Below broken, imp doesn't believe its being passed a file: + # ValueError: load_module arg#2 should be a file or None + # + #f = StringIO(moduleCodeDict[k]) + #tmp = imp.load_module(k, f, k, (".py", "r", imp.PY_SOURCE)) + tmp = imp.new_module(k) + exec(moduleCodeDict[k] in tmp.__dict__) + setModuleName(tmp, k) + return tmp + +import py_compile + +def loadModuleFile(moduleName, filePath): + # https://docs.python.org/3/library/importlib.html#importing-a-source-file-directly + spec = importlib.util.spec_from_file_location(moduleName, filePath) + module = importlib.util.module_from_spec(spec) + spec.loader.exec_module(module) + return module + + +def readFile(path, root=""): + "Read file from disk at specified path and return as string" + with open(os.path.join(root, path), 'r') as handle: + return handle.read() + + +####################################################################### +# Error Hint Map +####################################################################### + +# TODO: use these +ERROR_HINT_MAP = { + 'q1': { + "": """ + We noticed that your project threw an IndexError on q1. + While many things may cause this, it may have been from + assuming a certain number of successors from a state space + or assuming a certain number of actions available from a given + state. Try making your code more general (no hardcoded indices) + and submit again! + """ + }, + 'q3': { + "": """ + We noticed that your project threw an AttributeError on q3. + While many things may cause this, it may have been from assuming + a certain size or structure to the state space. For example, if you have + a line of code assuming that the state is (x, y) and we run your code + on a state space with (x, y, z), this error could be thrown. Try + making your code more general and submit again! + + """ + } +} + +import pprint + +def splitStrings(d): + d2 = dict(d) + for k in d: + if k[0:2] == "__": + del d2[k] + continue + if d2[k].find("\n") >= 0: + d2[k] = d2[k].split("\n") + return d2 + + +def printTest(testDict, solutionDict): + pp = pprint.PrettyPrinter(indent=4) + print("Test case:") + for line in testDict["__raw_lines__"]: + print(" |", line) + print("Solution:") + for line in solutionDict["__raw_lines__"]: + print(" |", line) + + +def runTest(testName, moduleDict, printTestCase=False, display=None): + import testParser + import testClasses + for module in moduleDict: + setattr(sys.modules[__name__], module, moduleDict[module]) + + testDict = testParser.TestParser(testName + ".test").parse() + solutionDict = testParser.TestParser(testName + ".solution").parse() + test_out_file = os.path.join('%s.test_output' % testName) + testDict['test_out_file'] = test_out_file + testClass = getattr(projectTestClasses, testDict['class']) + + questionClass = getattr(testClasses, 'Question') + question = questionClass({'max_points': 0}, display) + testCase = testClass(question, testDict) + + if printTestCase: + printTest(testDict, solutionDict) + + # This is a fragile hack to create a stub grades object + grades = grading.Grades(projectParams.PROJECT_NAME, [(None,0)]) + testCase.execute(grades, moduleDict, solutionDict) + + +# returns all the tests you need to run in order to run question +def getDepends(testParser, testRoot, question): + allDeps = [question] + questionDict = testParser.TestParser(os.path.join(testRoot, question, 'CONFIG')).parse() + if 'depends' in questionDict: + depends = questionDict['depends'].split() + for d in depends: + # run dependencies first + allDeps = getDepends(testParser, testRoot, d) + allDeps + return allDeps + +# get list of questions to grade +def getTestSubdirs(testParser, testRoot, questionToGrade): + problemDict = testParser.TestParser(os.path.join(testRoot, 'CONFIG')).parse() + if questionToGrade != None: + questions = getDepends(testParser, testRoot, questionToGrade) + if len(questions) > 1: + print('Note: due to dependencies, the following tests will be run: %s' % ' '.join(questions)) + return questions + if 'order' in problemDict: + return problemDict['order'].split() + return sorted(os.listdir(testRoot)) + + +# evaluate student code +def evaluate(generateSolutions, testRoot, moduleDict, exceptionMap=ERROR_HINT_MAP, + edxOutput=False, muteOutput=False, gsOutput=False, + printTestCase=False, questionToGrade=None, display=None): + # imports of testbench code. note that the testClasses import must follow + # the import of student code due to dependencies + import testParser + import testClasses + for module in moduleDict: + setattr(sys.modules[__name__], module, moduleDict[module]) + + questions = [] + questionDicts = {} + test_subdirs = getTestSubdirs(testParser, testRoot, questionToGrade) + for q in test_subdirs: + subdir_path = os.path.join(testRoot, q) + if not os.path.isdir(subdir_path) or q[0] == '.': + continue + + # create a question object + questionDict = testParser.TestParser(os.path.join(subdir_path, 'CONFIG')).parse() + questionClass = getattr(testClasses, questionDict['class']) + question = questionClass(questionDict, display) + questionDicts[q] = questionDict + + # load test cases into question + tests = filter(lambda t: re.match('[^#~.].*\.test\Z', t), os.listdir(subdir_path)) + tests = map(lambda t: re.match('(.*)\.test\Z', t).group(1), tests) + for t in sorted(tests): + test_file = os.path.join(subdir_path, '%s.test' % t) + solution_file = os.path.join(subdir_path, '%s.solution' % t) + test_out_file = os.path.join(subdir_path, '%s.test_output' % t) + testDict = testParser.TestParser(test_file).parse() + if testDict.get("disabled", "false").lower() == "true": + continue + testDict['test_out_file'] = test_out_file + testClass = getattr(projectTestClasses, testDict['class']) + testCase = testClass(question, testDict) + def makefun(testCase, solution_file): + if generateSolutions: + # write solution file to disk + return lambda grades: testCase.writeSolution(moduleDict, solution_file) + else: + # read in solution dictionary and pass as an argument + testDict = testParser.TestParser(test_file).parse() + solutionDict = testParser.TestParser(solution_file).parse() + if printTestCase: + return lambda grades: printTest(testDict, solutionDict) or testCase.execute(grades, moduleDict, solutionDict) + else: + return lambda grades: testCase.execute(grades, moduleDict, solutionDict) + question.addTestCase(testCase, makefun(testCase, solution_file)) + + # Note extra function is necessary for scoping reasons + def makefun(question): + return lambda grades: question.execute(grades) + setattr(sys.modules[__name__], q, makefun(question)) + questions.append((q, question.getMaxPoints())) + + grades = grading.Grades(projectParams.PROJECT_NAME, questions, + gsOutput=gsOutput, edxOutput=edxOutput, muteOutput=muteOutput) + if questionToGrade == None: + for q in questionDicts: + for prereq in questionDicts[q].get('depends', '').split(): + grades.addPrereq(q, prereq) + + grades.grade(sys.modules[__name__], bonusPic = projectParams.BONUS_PIC) + return grades.points + + + +def getDisplay(graphicsByDefault, options=None): + graphics = graphicsByDefault + if options is not None and options.noGraphics: + graphics = False + if graphics: + try: + import graphicsDisplay + return graphicsDisplay.PacmanGraphics(1, frameTime=.05) + except ImportError: + pass + import textDisplay + return textDisplay.NullGraphics() + + + + +if __name__ == '__main__': + options = readCommand(sys.argv) + if options.generateSolutions: + confirmGenerate() + codePaths = options.studentCode.split(',') + # moduleCodeDict = {} + # for cp in codePaths: + # moduleName = re.match('.*?([^/]*)\.py', cp).group(1) + # moduleCodeDict[moduleName] = readFile(cp, root=options.codeRoot) + # moduleCodeDict['projectTestClasses'] = readFile(options.testCaseCode, root=options.codeRoot) + # moduleDict = loadModuleDict(moduleCodeDict) + + moduleDict = {} + for cp in codePaths: + moduleName = re.match('.*?([^/]*)\.py', cp).group(1) + moduleDict[moduleName] = loadModuleFile(moduleName, os.path.join(options.codeRoot, cp)) + moduleName = re.match('.*?([^/]*)\.py', options.testCaseCode).group(1) + moduleDict['projectTestClasses'] = loadModuleFile(moduleName, os.path.join(options.codeRoot, options.testCaseCode)) + + + if options.runTest != None: + runTest(options.runTest, moduleDict, printTestCase=options.printTestCase, display=getDisplay(True, options)) + else: + evaluate(options.generateSolutions, options.testRoot, moduleDict, + gsOutput=options.gsOutput, + edxOutput=options.edxOutput, muteOutput=options.muteOutput, printTestCase=options.printTestCase, + questionToGrade=options.gradeQuestion, display=getDisplay(options.gradeQuestion!=None, options)) diff --git a/search/eightpuzzle.py b/search/eightpuzzle.py new file mode 100644 index 0000000..bb8ea6f --- /dev/null +++ b/search/eightpuzzle.py @@ -0,0 +1,281 @@ +# eightpuzzle.py +# -------------- +# Licensing Information: You are free to use or extend these projects for +# educational purposes provided that (1) you do not distribute or publish +# solutions, (2) you retain this notice, and (3) you provide clear +# attribution to UC Berkeley, including a link to http://ai.berkeley.edu. +# +# Attribution Information: The Pacman AI projects were developed at UC Berkeley. +# The core projects and autograders were primarily created by John DeNero +# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu). +# Student side autograding was added by Brad Miller, Nick Hay, and +# Pieter Abbeel (pabbeel@cs.berkeley.edu). + + +import search +import random + +# Module Classes + +class EightPuzzleState: + """ + The Eight Puzzle is described in the course textbook on + page 64. + + This class defines the mechanics of the puzzle itself. The + task of recasting this puzzle as a search problem is left to + the EightPuzzleSearchProblem class. + """ + + def __init__( self, numbers ): + """ + Constructs a new eight puzzle from an ordering of numbers. + + numbers: a list of integers from 0 to 8 representing an + instance of the eight puzzle. 0 represents the blank + space. Thus, the list + + [1, 0, 2, 3, 4, 5, 6, 7, 8] + + represents the eight puzzle: + ------------- + | 1 | | 2 | + ------------- + | 3 | 4 | 5 | + ------------- + | 6 | 7 | 8 | + ------------ + + The configuration of the puzzle is stored in a 2-dimensional + list (a list of lists) 'cells'. + """ + self.cells = [] + numbers = numbers[:] # Make a copy so as not to cause side-effects. + numbers.reverse() + for row in range( 3 ): + self.cells.append( [] ) + for col in range( 3 ): + self.cells[row].append( numbers.pop() ) + if self.cells[row][col] == 0: + self.blankLocation = row, col + + def isGoal( self ): + """ + Checks to see if the puzzle is in its goal state. + + ------------- + | | 1 | 2 | + ------------- + | 3 | 4 | 5 | + ------------- + | 6 | 7 | 8 | + ------------- + + >>> EightPuzzleState([0, 1, 2, 3, 4, 5, 6, 7, 8]).isGoal() + True + + >>> EightPuzzleState([1, 0, 2, 3, 4, 5, 6, 7, 8]).isGoal() + False + """ + current = 0 + for row in range( 3 ): + for col in range( 3 ): + if current != self.cells[row][col]: + return False + current += 1 + return True + + def legalMoves( self ): + """ + Returns a list of legal moves from the current state. + + Moves consist of moving the blank space up, down, left or right. + These are encoded as 'up', 'down', 'left' and 'right' respectively. + + >>> EightPuzzleState([0, 1, 2, 3, 4, 5, 6, 7, 8]).legalMoves() + ['down', 'right'] + """ + moves = [] + row, col = self.blankLocation + if(row != 0): + moves.append('up') + if(row != 2): + moves.append('down') + if(col != 0): + moves.append('left') + if(col != 2): + moves.append('right') + return moves + + def result(self, move): + """ + Returns a new eightPuzzle with the current state and blankLocation + updated based on the provided move. + + The move should be a string drawn from a list returned by legalMoves. + Illegal moves will raise an exception, which may be an array bounds + exception. + + NOTE: This function *does not* change the current object. Instead, + it returns a new object. + """ + row, col = self.blankLocation + if(move == 'up'): + newrow = row - 1 + newcol = col + elif(move == 'down'): + newrow = row + 1 + newcol = col + elif(move == 'left'): + newrow = row + newcol = col - 1 + elif(move == 'right'): + newrow = row + newcol = col + 1 + else: + raise "Illegal Move" + + # Create a copy of the current eightPuzzle + newPuzzle = EightPuzzleState([0, 0, 0, 0, 0, 0, 0, 0, 0]) + newPuzzle.cells = [values[:] for values in self.cells] + # And update it to reflect the move + newPuzzle.cells[row][col] = self.cells[newrow][newcol] + newPuzzle.cells[newrow][newcol] = self.cells[row][col] + newPuzzle.blankLocation = newrow, newcol + + return newPuzzle + + # Utilities for comparison and display + def __eq__(self, other): + """ + Overloads '==' such that two eightPuzzles with the same configuration + are equal. + + >>> EightPuzzleState([0, 1, 2, 3, 4, 5, 6, 7, 8]) == \ + EightPuzzleState([1, 0, 2, 3, 4, 5, 6, 7, 8]).result('left') + True + """ + for row in range( 3 ): + if self.cells[row] != other.cells[row]: + return False + return True + + def __hash__(self): + return hash(str(self.cells)) + + def __getAsciiString(self): + """ + Returns a display string for the maze + """ + lines = [] + horizontalLine = ('-' * (13)) + lines.append(horizontalLine) + for row in self.cells: + rowLine = '|' + for col in row: + if col == 0: + col = ' ' + rowLine = rowLine + ' ' + col.__str__() + ' |' + lines.append(rowLine) + lines.append(horizontalLine) + return '\n'.join(lines) + + def __str__(self): + return self.__getAsciiString() + +# TODO: Implement The methods in this class + +class EightPuzzleSearchProblem(search.SearchProblem): + """ + Implementation of a SearchProblem for the Eight Puzzle domain + + Each state is represented by an instance of an eightPuzzle. + """ + def __init__(self,puzzle): + "Creates a new EightPuzzleSearchProblem which stores search information." + self.puzzle = puzzle + + def getStartState(self): + return puzzle + + def isGoalState(self,state): + return state.isGoal() + + def getSuccessors(self,state): + """ + Returns list of (successor, action, stepCost) pairs where + each succesor is either left, right, up, or down + from the original state and the cost is 1.0 for each + """ + succ = [] + for a in state.legalMoves(): + succ.append((state.result(a), a, 1)) + return succ + + def getCostOfActions(self, actions): + """ + actions: A list of actions to take + + This method returns the total cost of a particular sequence of actions. The sequence must + be composed of legal moves + """ + return len(actions) + +EIGHT_PUZZLE_DATA = [[1, 0, 2, 3, 4, 5, 6, 7, 8], + [1, 7, 8, 2, 3, 4, 5, 6, 0], + [4, 3, 2, 7, 0, 5, 1, 6, 8], + [5, 1, 3, 4, 0, 2, 6, 7, 8], + [1, 2, 5, 7, 6, 8, 0, 4, 3], + [0, 3, 1, 6, 8, 2, 7, 5, 4]] + +def loadEightPuzzle(puzzleNumber): + """ + puzzleNumber: The number of the eight puzzle to load. + + Returns an eight puzzle object generated from one of the + provided puzzles in EIGHT_PUZZLE_DATA. + + puzzleNumber can range from 0 to 5. + + >>> print(loadEightPuzzle(0)) + ------------- + | 1 | | 2 | + ------------- + | 3 | 4 | 5 | + ------------- + | 6 | 7 | 8 | + ------------- + """ + return EightPuzzleState(EIGHT_PUZZLE_DATA[puzzleNumber]) + +def createRandomEightPuzzle(moves=100): + """ + moves: number of random moves to apply + + Creates a random eight puzzle by applying + a series of 'moves' random moves to a solved + puzzle. + """ + puzzle = EightPuzzleState([0,1,2,3,4,5,6,7,8]) + for i in range(moves): + # Execute a random legal move + puzzle = puzzle.result(random.sample(puzzle.legalMoves(), 1)[0]) + return puzzle + +if __name__ == '__main__': + puzzle = createRandomEightPuzzle(25) + print('A random puzzle:') + print(puzzle) + + problem = EightPuzzleSearchProblem(puzzle) + path = search.breadthFirstSearch(problem) + print('BFS found a path of %d moves: %s' % (len(path), str(path))) + curr = puzzle + i = 1 + for a in path: + curr = curr.result(a) + print('After %d move%s: %s' % (i, ("", "s")[i>1], a)) + print(curr) + + input("Press return for the next state...") # wait for key stroke + i += 1 diff --git a/search/game.py b/search/game.py new file mode 100644 index 0000000..3950f27 --- /dev/null +++ b/search/game.py @@ -0,0 +1,729 @@ +# game.py +# ------- +# Licensing Information: You are free to use or extend these projects for +# educational purposes provided that (1) you do not distribute or publish +# solutions, (2) you retain this notice, and (3) you provide clear +# attribution to UC Berkeley, including a link to http://ai.berkeley.edu. +# +# Attribution Information: The Pacman AI projects were developed at UC Berkeley. +# The core projects and autograders were primarily created by John DeNero +# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu). +# Student side autograding was added by Brad Miller, Nick Hay, and +# Pieter Abbeel (pabbeel@cs.berkeley.edu). + + +# game.py +# ------- +# Licensing Information: Please do not distribute or publish solutions to this +# project. You are free to use and extend these projects for educational +# purposes. The Pacman AI projects were developed at UC Berkeley, primarily by +# John DeNero (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu). +# For more info, see http://inst.eecs.berkeley.edu/~cs188/sp09/pacman.html + +from util import * +import time, os +import traceback +import sys + +####################### +# Parts worth reading # +####################### + +class Agent: + """ + An agent must define a getAction method, but may also define the + following methods which will be called if they exist: + + def registerInitialState(self, state): # inspects the starting state + """ + def __init__(self, index=0): + self.index = index + + def getAction(self, state): + """ + The Agent will receive a GameState (from either {pacman, capture, sonar}.py) and + must return an action from Directions.{North, South, East, West, Stop} + """ + raiseNotDefined() + +class Directions: + NORTH = 'North' + SOUTH = 'South' + EAST = 'East' + WEST = 'West' + STOP = 'Stop' + + LEFT = {NORTH: WEST, + SOUTH: EAST, + EAST: NORTH, + WEST: SOUTH, + STOP: STOP} + + RIGHT = dict([(y,x) for x, y in LEFT.items()]) + + REVERSE = {NORTH: SOUTH, + SOUTH: NORTH, + EAST: WEST, + WEST: EAST, + STOP: STOP} + +class Configuration: + """ + A Configuration holds the (x,y) coordinate of a character, along with its + traveling direction. + + The convention for positions, like a graph, is that (0,0) is the lower left corner, x increases + horizontally and y increases vertically. Therefore, north is the direction of increasing y, or (0,1). + """ + + def __init__(self, pos, direction): + self.pos = pos + self.direction = direction + + def getPosition(self): + return (self.pos) + + def getDirection(self): + return self.direction + + def isInteger(self): + x,y = self.pos + return x == int(x) and y == int(y) + + def __eq__(self, other): + if other == None: return False + return (self.pos == other.pos and self.direction == other.direction) + + def __hash__(self): + x = hash(self.pos) + y = hash(self.direction) + return hash(x + 13 * y) + + def __str__(self): + return "(x,y)="+str(self.pos)+", "+str(self.direction) + + def generateSuccessor(self, vector): + """ + Generates a new configuration reached by translating the current + configuration by the action vector. This is a low-level call and does + not attempt to respect the legality of the movement. + + Actions are movement vectors. + """ + x, y= self.pos + dx, dy = vector + direction = Actions.vectorToDirection(vector) + if direction == Directions.STOP: + direction = self.direction # There is no stop direction + return Configuration((x + dx, y+dy), direction) + +class AgentState: + """ + AgentStates hold the state of an agent (configuration, speed, scared, etc). + """ + + def __init__( self, startConfiguration, isPacman ): + self.start = startConfiguration + self.configuration = startConfiguration + self.isPacman = isPacman + self.scaredTimer = 0 + self.numCarrying = 0 + self.numReturned = 0 + + def __str__( self ): + if self.isPacman: + return "Pacman: " + str( self.configuration ) + else: + return "Ghost: " + str( self.configuration ) + + def __eq__( self, other ): + if other == None: + return False + return self.configuration == other.configuration and self.scaredTimer == other.scaredTimer + + def __hash__(self): + return hash(hash(self.configuration) + 13 * hash(self.scaredTimer)) + + def copy( self ): + state = AgentState( self.start, self.isPacman ) + state.configuration = self.configuration + state.scaredTimer = self.scaredTimer + state.numCarrying = self.numCarrying + state.numReturned = self.numReturned + return state + + def getPosition(self): + if self.configuration == None: return None + return self.configuration.getPosition() + + def getDirection(self): + return self.configuration.getDirection() + +class Grid: + """ + A 2-dimensional array of objects backed by a list of lists. Data is accessed + via grid[x][y] where (x,y) are positions on a Pacman map with x horizontal, + y vertical and the origin (0,0) in the bottom left corner. + + The __str__ method constructs an output that is oriented like a pacman board. + """ + def __init__(self, width, height, initialValue=False, bitRepresentation=None): + if initialValue not in [False, True]: raise Exception('Grids can only contain booleans') + self.CELLS_PER_INT = 30 + + self.width = width + self.height = height + self.data = [[initialValue for y in range(height)] for x in range(width)] + if bitRepresentation: + self._unpackBits(bitRepresentation) + + def __getitem__(self, i): + return self.data[i] + + def __setitem__(self, key, item): + self.data[key] = item + + def __str__(self): + out = [[str(self.data[x][y])[0] for x in range(self.width)] for y in range(self.height)] + out.reverse() + return '\n'.join([''.join(x) for x in out]) + + def __eq__(self, other): + if other == None: return False + return self.data == other.data + + def __hash__(self): + # return hash(str(self)) + base = 1 + h = 0 + for l in self.data: + for i in l: + if i: + h += base + base *= 2 + return hash(h) + + def copy(self): + g = Grid(self.width, self.height) + g.data = [x[:] for x in self.data] + return g + + def deepCopy(self): + return self.copy() + + def shallowCopy(self): + g = Grid(self.width, self.height) + g.data = self.data + return g + + def count(self, item =True ): + return sum([x.count(item) for x in self.data]) + + def asList(self, key = True): + list = [] + for x in range(self.width): + for y in range(self.height): + if self[x][y] == key: list.append( (x,y) ) + return list + + def packBits(self): + """ + Returns an efficient int list representation + + (width, height, bitPackedInts...) + """ + bits = [self.width, self.height] + currentInt = 0 + for i in range(self.height * self.width): + bit = self.CELLS_PER_INT - (i % self.CELLS_PER_INT) - 1 + x, y = self._cellIndexToPosition(i) + if self[x][y]: + currentInt += 2 ** bit + if (i + 1) % self.CELLS_PER_INT == 0: + bits.append(currentInt) + currentInt = 0 + bits.append(currentInt) + return tuple(bits) + + def _cellIndexToPosition(self, index): + x = index // self.height + y = index % self.height + return x, y + + def _unpackBits(self, bits): + """ + Fills in data from a bit-level representation + """ + cell = 0 + for packed in bits: + for bit in self._unpackInt(packed, self.CELLS_PER_INT): + if cell == self.width * self.height: break + x, y = self._cellIndexToPosition(cell) + self[x][y] = bit + cell += 1 + + def _unpackInt(self, packed, size): + bools = [] + if packed < 0: raise ValueError("must be a positive integer") + for i in range(size): + n = 2 ** (self.CELLS_PER_INT - i - 1) + if packed >= n: + bools.append(True) + packed -= n + else: + bools.append(False) + return bools + +def reconstituteGrid(bitRep): + if type(bitRep) is not type((1,2)): + return bitRep + width, height = bitRep[:2] + return Grid(width, height, bitRepresentation= bitRep[2:]) + +#################################### +# Parts you shouldn't have to read # +#################################### + +class Actions: + """ + A collection of static methods for manipulating move actions. + """ + # Directions + _directions = {Directions.NORTH: (0, 1), + Directions.SOUTH: (0, -1), + Directions.EAST: (1, 0), + Directions.WEST: (-1, 0), + Directions.STOP: (0, 0)} + + _directionsAsList = _directions.items() + + TOLERANCE = .001 + + def reverseDirection(action): + if action == Directions.NORTH: + return Directions.SOUTH + if action == Directions.SOUTH: + return Directions.NORTH + if action == Directions.EAST: + return Directions.WEST + if action == Directions.WEST: + return Directions.EAST + return action + reverseDirection = staticmethod(reverseDirection) + + def vectorToDirection(vector): + dx, dy = vector + if dy > 0: + return Directions.NORTH + if dy < 0: + return Directions.SOUTH + if dx < 0: + return Directions.WEST + if dx > 0: + return Directions.EAST + return Directions.STOP + vectorToDirection = staticmethod(vectorToDirection) + + def directionToVector(direction, speed = 1.0): + dx, dy = Actions._directions[direction] + return (dx * speed, dy * speed) + directionToVector = staticmethod(directionToVector) + + def getPossibleActions(config, walls): + possible = [] + x, y = config.pos + x_int, y_int = int(x + 0.5), int(y + 0.5) + + # In between grid points, all agents must continue straight + if (abs(x - x_int) + abs(y - y_int) > Actions.TOLERANCE): + return [config.getDirection()] + + for dir, vec in Actions._directionsAsList: + dx, dy = vec + next_y = y_int + dy + next_x = x_int + dx + if not walls[next_x][next_y]: possible.append(dir) + + return possible + + getPossibleActions = staticmethod(getPossibleActions) + + def getLegalNeighbors(position, walls): + x,y = position + x_int, y_int = int(x + 0.5), int(y + 0.5) + neighbors = [] + for dir, vec in Actions._directionsAsList: + dx, dy = vec + next_x = x_int + dx + if next_x < 0 or next_x == walls.width: continue + next_y = y_int + dy + if next_y < 0 or next_y == walls.height: continue + if not walls[next_x][next_y]: neighbors.append((next_x, next_y)) + return neighbors + getLegalNeighbors = staticmethod(getLegalNeighbors) + + def getSuccessor(position, action): + dx, dy = Actions.directionToVector(action) + x, y = position + return (x + dx, y + dy) + getSuccessor = staticmethod(getSuccessor) + +class GameStateData: + """ + + """ + def __init__( self, prevState = None ): + """ + Generates a new data packet by copying information from its predecessor. + """ + if prevState != None: + self.food = prevState.food.shallowCopy() + self.capsules = prevState.capsules[:] + self.agentStates = self.copyAgentStates( prevState.agentStates ) + self.layout = prevState.layout + self._eaten = prevState._eaten + self.score = prevState.score + + self._foodEaten = None + self._foodAdded = None + self._capsuleEaten = None + self._agentMoved = None + self._lose = False + self._win = False + self.scoreChange = 0 + + def deepCopy( self ): + state = GameStateData( self ) + state.food = self.food.deepCopy() + state.layout = self.layout.deepCopy() + state._agentMoved = self._agentMoved + state._foodEaten = self._foodEaten + state._foodAdded = self._foodAdded + state._capsuleEaten = self._capsuleEaten + return state + + def copyAgentStates( self, agentStates ): + copiedStates = [] + for agentState in agentStates: + copiedStates.append( agentState.copy() ) + return copiedStates + + def __eq__( self, other ): + """ + Allows two states to be compared. + """ + if other == None: return False + # TODO Check for type of other + if not self.agentStates == other.agentStates: return False + if not self.food == other.food: return False + if not self.capsules == other.capsules: return False + if not self.score == other.score: return False + return True + + def __hash__( self ): + """ + Allows states to be keys of dictionaries. + """ + for i, state in enumerate( self.agentStates ): + try: + int(hash(state)) + except TypeError as e: + print(e) + #hash(state) + return int((hash(tuple(self.agentStates)) + 13*hash(self.food) + 113* hash(tuple(self.capsules)) + 7 * hash(self.score)) % 1048575 ) + + def __str__( self ): + width, height = self.layout.width, self.layout.height + map = Grid(width, height) + if type(self.food) == type((1,2)): + self.food = reconstituteGrid(self.food) + for x in range(width): + for y in range(height): + food, walls = self.food, self.layout.walls + map[x][y] = self._foodWallStr(food[x][y], walls[x][y]) + + for agentState in self.agentStates: + if agentState == None: continue + if agentState.configuration == None: continue + x,y = [int( i ) for i in nearestPoint( agentState.configuration.pos )] + agent_dir = agentState.configuration.direction + if agentState.isPacman: + map[x][y] = self._pacStr( agent_dir ) + else: + map[x][y] = self._ghostStr( agent_dir ) + + for x, y in self.capsules: + map[x][y] = 'o' + + return str(map) + ("\nScore: %d\n" % self.score) + + def _foodWallStr( self, hasFood, hasWall ): + if hasFood: + return '.' + elif hasWall: + return '%' + else: + return ' ' + + def _pacStr( self, dir ): + if dir == Directions.NORTH: + return 'v' + if dir == Directions.SOUTH: + return '^' + if dir == Directions.WEST: + return '>' + return '<' + + def _ghostStr( self, dir ): + return 'G' + if dir == Directions.NORTH: + return 'M' + if dir == Directions.SOUTH: + return 'W' + if dir == Directions.WEST: + return '3' + return 'E' + + def initialize( self, layout, numGhostAgents ): + """ + Creates an initial game state from a layout array (see layout.py). + """ + self.food = layout.food.copy() + #self.capsules = [] + self.capsules = layout.capsules[:] + self.layout = layout + self.score = 0 + self.scoreChange = 0 + + self.agentStates = [] + numGhosts = 0 + for isPacman, pos in layout.agentPositions: + if not isPacman: + if numGhosts == numGhostAgents: continue # Max ghosts reached already + else: numGhosts += 1 + self.agentStates.append( AgentState( Configuration( pos, Directions.STOP), isPacman) ) + self._eaten = [False for a in self.agentStates] + +try: + import boinc + _BOINC_ENABLED = True +except: + _BOINC_ENABLED = False + +class Game: + """ + The Game manages the control flow, soliciting actions from agents. + """ + + def __init__( self, agents, display, rules, startingIndex=0, muteAgents=False, catchExceptions=False ): + self.agentCrashed = False + self.agents = agents + self.display = display + self.rules = rules + self.startingIndex = startingIndex + self.gameOver = False + self.muteAgents = muteAgents + self.catchExceptions = catchExceptions + self.moveHistory = [] + self.totalAgentTimes = [0 for agent in agents] + self.totalAgentTimeWarnings = [0 for agent in agents] + self.agentTimeout = False + import io + self.agentOutput = [io.StringIO() for agent in agents] + + def getProgress(self): + if self.gameOver: + return 1.0 + else: + return self.rules.getProgress(self) + + def _agentCrash( self, agentIndex, quiet=False): + "Helper method for handling agent crashes" + if not quiet: traceback.print_exc() + self.gameOver = True + self.agentCrashed = True + self.rules.agentCrash(self, agentIndex) + + OLD_STDOUT = None + OLD_STDERR = None + + def mute(self, agentIndex): + if not self.muteAgents: return + global OLD_STDOUT, OLD_STDERR + import io + OLD_STDOUT = sys.stdout + OLD_STDERR = sys.stderr + sys.stdout = self.agentOutput[agentIndex] + sys.stderr = self.agentOutput[agentIndex] + + def unmute(self): + if not self.muteAgents: return + global OLD_STDOUT, OLD_STDERR + # Revert stdout/stderr to originals + sys.stdout = OLD_STDOUT + sys.stderr = OLD_STDERR + + + def run( self ): + """ + Main control loop for game play. + """ + self.display.initialize(self.state.data) + self.numMoves = 0 + + ###self.display.initialize(self.state.makeObservation(1).data) + # inform learning agents of the game start + for i in range(len(self.agents)): + agent = self.agents[i] + if not agent: + self.mute(i) + # this is a null agent, meaning it failed to load + # the other team wins + print("Agent %d failed to load" % i, file=sys.stderr) + self.unmute() + self._agentCrash(i, quiet=True) + return + if ("registerInitialState" in dir(agent)): + self.mute(i) + if self.catchExceptions: + try: + timed_func = TimeoutFunction(agent.registerInitialState, int(self.rules.getMaxStartupTime(i))) + try: + start_time = time.time() + timed_func(self.state.deepCopy()) + time_taken = time.time() - start_time + self.totalAgentTimes[i] += time_taken + except TimeoutFunctionException: + print("Agent %d ran out of time on startup!" % i, file=sys.stderr) + self.unmute() + self.agentTimeout = True + self._agentCrash(i, quiet=True) + return + except Exception as data: + self._agentCrash(i, quiet=False) + self.unmute() + return + else: + agent.registerInitialState(self.state.deepCopy()) + ## TODO: could this exceed the total time + self.unmute() + + agentIndex = self.startingIndex + numAgents = len( self.agents ) + + while not self.gameOver: + # Fetch the next agent + agent = self.agents[agentIndex] + move_time = 0 + skip_action = False + # Generate an observation of the state + if 'observationFunction' in dir( agent ): + self.mute(agentIndex) + if self.catchExceptions: + try: + timed_func = TimeoutFunction(agent.observationFunction, int(self.rules.getMoveTimeout(agentIndex))) + try: + start_time = time.time() + observation = timed_func(self.state.deepCopy()) + except TimeoutFunctionException: + skip_action = True + move_time += time.time() - start_time + self.unmute() + except Exception as data: + self._agentCrash(agentIndex, quiet=False) + self.unmute() + return + else: + observation = agent.observationFunction(self.state.deepCopy()) + self.unmute() + else: + observation = self.state.deepCopy() + + # Solicit an action + action = None + self.mute(agentIndex) + if self.catchExceptions: + try: + timed_func = TimeoutFunction(agent.getAction, int(self.rules.getMoveTimeout(agentIndex)) - int(move_time)) + try: + start_time = time.time() + if skip_action: + raise TimeoutFunctionException() + action = timed_func( observation ) + except TimeoutFunctionException: + print("Agent %d timed out on a single move!" % agentIndex, file=sys.stderr) + self.agentTimeout = True + self._agentCrash(agentIndex, quiet=True) + self.unmute() + return + + move_time += time.time() - start_time + + if move_time > self.rules.getMoveWarningTime(agentIndex): + self.totalAgentTimeWarnings[agentIndex] += 1 + print("Agent %d took too long to make a move! This is warning %d" % (agentIndex, self.totalAgentTimeWarnings[agentIndex]), file=sys.stderr) + if self.totalAgentTimeWarnings[agentIndex] > self.rules.getMaxTimeWarnings(agentIndex): + print("Agent %d exceeded the maximum number of warnings: %d" % (agentIndex, self.totalAgentTimeWarnings[agentIndex]), file=sys.stderr) + self.agentTimeout = True + self._agentCrash(agentIndex, quiet=True) + self.unmute() + return + + self.totalAgentTimes[agentIndex] += move_time + #print("Agent: %d, time: %f, total: %f" % (agentIndex, move_time, self.totalAgentTimes[agentIndex])) + if self.totalAgentTimes[agentIndex] > self.rules.getMaxTotalTime(agentIndex): + print("Agent %d ran out of time! (time: %1.2f)" % (agentIndex, self.totalAgentTimes[agentIndex]), file=sys.stderr) + self.agentTimeout = True + self._agentCrash(agentIndex, quiet=True) + self.unmute() + return + self.unmute() + except Exception as data: + self._agentCrash(agentIndex) + self.unmute() + return + else: + action = agent.getAction(observation) + self.unmute() + + # Execute the action + self.moveHistory.append( (agentIndex, action) ) + if self.catchExceptions: + try: + self.state = self.state.generateSuccessor( agentIndex, action ) + except Exception as data: + self.mute(agentIndex) + self._agentCrash(agentIndex) + self.unmute() + return + else: + self.state = self.state.generateSuccessor( agentIndex, action ) + + # Change the display + self.display.update( self.state.data ) + ###idx = agentIndex - agentIndex % 2 + 1 + ###self.display.update( self.state.makeObservation(idx).data ) + + # Allow for game specific conditions (winning, losing, etc.) + self.rules.process(self.state, self) + # Track progress + if agentIndex == numAgents + 1: self.numMoves += 1 + # Next agent + agentIndex = ( agentIndex + 1 ) % numAgents + + if _BOINC_ENABLED: + boinc.set_fraction_done(self.getProgress()) + + # inform a learning agent of the game result + for agentIndex, agent in enumerate(self.agents): + if "final" in dir( agent ) : + try: + self.mute(agentIndex) + agent.final( self.state ) + self.unmute() + except Exception as data: + if not self.catchExceptions: raise data + self._agentCrash(agentIndex) + self.unmute() + return + self.display.finish() diff --git a/search/ghostAgents.py b/search/ghostAgents.py new file mode 100644 index 0000000..c3afe1f --- /dev/null +++ b/search/ghostAgents.py @@ -0,0 +1,81 @@ +# ghostAgents.py +# -------------- +# Licensing Information: You are free to use or extend these projects for +# educational purposes provided that (1) you do not distribute or publish +# solutions, (2) you retain this notice, and (3) you provide clear +# attribution to UC Berkeley, including a link to http://ai.berkeley.edu. +# +# Attribution Information: The Pacman AI projects were developed at UC Berkeley. +# The core projects and autograders were primarily created by John DeNero +# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu). +# Student side autograding was added by Brad Miller, Nick Hay, and +# Pieter Abbeel (pabbeel@cs.berkeley.edu). + + +from game import Agent +from game import Actions +from game import Directions +import random +from util import manhattanDistance +import util + +class GhostAgent( Agent ): + def __init__( self, index ): + self.index = index + + def getAction( self, state ): + dist = self.getDistribution(state) + if len(dist) == 0: + return Directions.STOP + else: + return util.chooseFromDistribution( dist ) + + def getDistribution(self, state): + "Returns a Counter encoding a distribution over actions from the provided state." + util.raiseNotDefined() + +class RandomGhost( GhostAgent ): + "A ghost that chooses a legal action uniformly at random." + def getDistribution( self, state ): + dist = util.Counter() + for a in state.getLegalActions( self.index ): dist[a] = 1.0 + dist.normalize() + return dist + +class DirectionalGhost( GhostAgent ): + "A ghost that prefers to rush Pacman, or flee when scared." + def __init__( self, index, prob_attack=0.8, prob_scaredFlee=0.8 ): + self.index = index + self.prob_attack = prob_attack + self.prob_scaredFlee = prob_scaredFlee + + def getDistribution( self, state ): + # Read variables from state + ghostState = state.getGhostState( self.index ) + legalActions = state.getLegalActions( self.index ) + pos = state.getGhostPosition( self.index ) + isScared = ghostState.scaredTimer > 0 + + speed = 1 + if isScared: speed = 0.5 + + actionVectors = [Actions.directionToVector( a, speed ) for a in legalActions] + newPositions = [( pos[0]+a[0], pos[1]+a[1] ) for a in actionVectors] + pacmanPosition = state.getPacmanPosition() + + # Select best actions given the state + distancesToPacman = [manhattanDistance( pos, pacmanPosition ) for pos in newPositions] + if isScared: + bestScore = max( distancesToPacman ) + bestProb = self.prob_scaredFlee + else: + bestScore = min( distancesToPacman ) + bestProb = self.prob_attack + bestActions = [action for action, distance in zip( legalActions, distancesToPacman ) if distance == bestScore] + + # Construct distribution + dist = util.Counter() + for a in bestActions: dist[a] = bestProb / len(bestActions) + for a in legalActions: dist[a] += ( 1-bestProb ) / len(legalActions) + dist.normalize() + return dist diff --git a/search/grading.py b/search/grading.py new file mode 100644 index 0000000..7a15338 --- /dev/null +++ b/search/grading.py @@ -0,0 +1,320 @@ +# grading.py +# ---------- +# Licensing Information: You are free to use or extend these projects for +# educational purposes provided that (1) you do not distribute or publish +# solutions, (2) you retain this notice, and (3) you provide clear +# attribution to UC Berkeley, including a link to http://ai.berkeley.edu. +# +# Attribution Information: The Pacman AI projects were developed at UC Berkeley. +# The core projects and autograders were primarily created by John DeNero +# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu). +# Student side autograding was added by Brad Miller, Nick Hay, and +# Pieter Abbeel (pabbeel@cs.berkeley.edu). + + +"Common code for autograders" + +from html import escape +import time +import json +import traceback +from collections import defaultdict +import util + +class Grades: + "A data structure for project grades, along with formatting code to display them" + def __init__(self, projectName, questionsAndMaxesList, + gsOutput=False, edxOutput=False, muteOutput=False): + """ + Defines the grading scheme for a project + projectName: project name + questionsAndMaxesDict: a list of (question name, max points per question) + """ + self.questions = [el[0] for el in questionsAndMaxesList] + self.maxes = dict(questionsAndMaxesList) + self.points = Counter() + self.messages = dict([(q, []) for q in self.questions]) + self.project = projectName + self.start = time.localtime()[1:6] + self.sane = True # Sanity checks + self.currentQuestion = None # Which question we're grading + self.edxOutput = edxOutput + self.gsOutput = gsOutput # GradeScope output + self.mute = muteOutput + self.prereqs = defaultdict(set) + + #print('Autograder transcript for %s' % self.project) + print('Starting on %d-%d at %d:%02d:%02d' % self.start) + + def addPrereq(self, question, prereq): + self.prereqs[question].add(prereq) + + def grade(self, gradingModule, exceptionMap = {}, bonusPic = False): + """ + Grades each question + gradingModule: the module with all the grading functions (pass in with sys.modules[__name__]) + """ + + completedQuestions = set([]) + for q in self.questions: + print('\nQuestion %s' % q) + print('=' * (9 + len(q))) + print + self.currentQuestion = q + + incompleted = self.prereqs[q].difference(completedQuestions) + if len(incompleted) > 0: + prereq = incompleted.pop() + print( +"""*** NOTE: Make sure to complete Question %s before working on Question %s, +*** because Question %s builds upon your answer for Question %s. +""" % (prereq, q, q, prereq)) + continue + + if self.mute: util.mutePrint() + try: + util.TimeoutFunction(getattr(gradingModule, q),1800)(self) # Call the question's function + #TimeoutFunction(getattr(gradingModule, q),1200)(self) # Call the question's function + except Exception as inst: + self.addExceptionMessage(q, inst, traceback) + self.addErrorHints(exceptionMap, inst, q[1]) + except: + self.fail('FAIL: Terminated with a string exception.') + finally: + if self.mute: util.unmutePrint() + + if self.points[q] >= self.maxes[q]: + completedQuestions.add(q) + + print('\n### Question %s: %d/%d ###\n' % (q, self.points[q], self.maxes[q])) + + + print('\nFinished at %d:%02d:%02d' % time.localtime()[3:6]) + print("\nProvisional grades\n==================") + + for q in self.questions: + print('Question %s: %d/%d' % (q, self.points[q], self.maxes[q])) + print('------------------') + print('Total: %d/%d' % (self.points.totalCount(), sum(self.maxes.values()))) + if bonusPic and self.points.totalCount() == 25: + print(""" + + ALL HAIL GRANDPAC. + LONG LIVE THE GHOSTBUSTING KING. + + --- ---- --- + | \ / + \ / | + | + \--/ \--/ + | + | + + | + | + + + | + @@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + \ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + \ / @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + V \ @@@@@@@@@@@@@@@@@@@@@@@@@@@@ + \ / @@@@@@@@@@@@@@@@@@@@@@@@@@ + V @@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@ + /\ @@@@@@@@@@@@@@@@@@@@@@ + / \ @@@@@@@@@@@@@@@@@@@@@@@@@ + /\ / @@@@@@@@@@@@@@@@@@@@@@@@@@@ + / \ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + / @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@ + +""") + print(""" +Your grades are NOT yet registered. To register your grades, make sure +to follow your instructor's guidelines to receive credit on your project. +""") + + if self.edxOutput: + self.produceOutput() + if self.gsOutput: + self.produceGradeScopeOutput() + + def addExceptionMessage(self, q, inst, traceback): + """ + Method to format the exception message, this is more complicated because + we need to escape the traceback but wrap the exception in a 
 tag
+    """
+    self.fail('FAIL: Exception raised: %s' % inst)
+    self.addMessage('')
+    for line in traceback.format_exc().split('\n'):
+        self.addMessage(line)
+
+  def addErrorHints(self, exceptionMap, errorInstance, questionNum):
+    typeOf = str(type(errorInstance))
+    questionName = 'q' + questionNum
+    errorHint = ''
+
+    # question specific error hints
+    if exceptionMap.get(questionName):
+      questionMap = exceptionMap.get(questionName)
+      if (questionMap.get(typeOf)):
+        errorHint = questionMap.get(typeOf)
+    # fall back to general error messages if a question specific
+    # one does not exist
+    if (exceptionMap.get(typeOf)):
+      errorHint = exceptionMap.get(typeOf)
+
+    # dont include the HTML if we have no error hint
+    if not errorHint:
+      return ''
+
+    for line in errorHint.split('\n'):
+      self.addMessage(line)
+
+  def produceGradeScopeOutput(self):
+    out_dct = {}
+
+    # total of entire submission
+    total_possible = sum(self.maxes.values())
+    total_score = sum(self.points.values())
+    out_dct['score'] = total_score
+    out_dct['max_score'] = total_possible
+    out_dct['output'] = "Total score (%d / %d)" % (total_score, total_possible)
+
+    # individual tests
+    tests_out = []
+    for name in self.questions:
+      test_out = {}
+      # test name
+      test_out['name'] = name
+      # test score
+      test_out['score'] = self.points[name]
+      test_out['max_score'] = self.maxes[name]
+      # others
+      is_correct = self.points[name] >= self.maxes[name]
+      test_out['output'] = "  Question {num} ({points}/{max}) {correct}".format(
+          num=(name[1] if len(name) == 2 else name),
+          points=test_out['score'],
+          max=test_out['max_score'],
+          correct=('X' if not is_correct else ''),
+      )
+      test_out['tags'] = []
+      tests_out.append(test_out)
+    out_dct['tests'] = tests_out
+
+    # file output
+    with open('gradescope_response.json', 'w') as outfile:
+        json.dump(out_dct, outfile)
+    return
+
+  def produceOutput(self):
+    edxOutput = open('edx_response.html', 'w')
+    edxOutput.write("
")
+
+    # first sum
+    total_possible = sum(self.maxes.values())
+    total_score = sum(self.points.values())
+    checkOrX = ''
+    if (total_score >= total_possible):
+        checkOrX = ''
+    header = """
+        

+            Total score ({total_score} / {total_possible})
+        

+    """.format(total_score = total_score,
+      total_possible = total_possible,
+      checkOrX = checkOrX
+    )
+    edxOutput.write(header)
+
+    for q in self.questions:
+      if len(q) == 2:
+          name = q[1]
+      else:
+          name = q
+      checkOrX = ''
+      if (self.points[q] >= self.maxes[q]):
+        checkOrX = ''
+      #messages = '\n
\n'.join(self.messages[q])
+      messages = "
%s
" % '\n'.join(self.messages[q])
+      output = """
+        

+          

+          

+            Question {q} ({points}/{max}) {checkOrX}
+          

+        

+          {messages}
+        

+        

+      

+      """.format(q = name,
+        max = self.maxes[q],
+        messages = messages,
+        checkOrX = checkOrX,
+        points = self.points[q]
+      )
+      # print("*** output for Question %s " % q[1])
+      # print(output)
+      edxOutput.write(output)
+    edxOutput.write("
")
+    edxOutput.close()
+    edxOutput = open('edx_grade', 'w')
+    edxOutput.write(str(self.points.totalCount()))
+    edxOutput.close()
+
+  def fail(self, message, raw=False):
+    "Sets sanity check bit to false and outputs a message"
+    self.sane = False
+    self.assignZeroCredit()
+    self.addMessage(message, raw)
+
+  def assignZeroCredit(self):
+    self.points[self.currentQuestion] = 0
+
+  def addPoints(self, amt):
+    self.points[self.currentQuestion] += amt
+
+  def deductPoints(self, amt):
+    self.points[self.currentQuestion] -= amt
+
+  def assignFullCredit(self, message="", raw=False):
+    self.points[self.currentQuestion] = self.maxes[self.currentQuestion]
+    if message != "":
+      self.addMessage(message, raw)
+
+  def addMessage(self, message, raw=False):
+    if not raw:
+        # We assume raw messages, formatted for HTML, are printed separately
+        if self.mute: util.unmutePrint()
+        print('*** ' + message)
+        if self.mute: util.mutePrint()
+        message = escape(message)
+    self.messages[self.currentQuestion].append(message)
+
+  def addMessageToEmail(self, message):
+    print("WARNING**** addMessageToEmail is deprecated %s" % message)
+    for line in message.split('\n'):
+      pass
+      #print('%%% ' + line + ' %%%')
+      #self.messages[self.currentQuestion].append(line)
+
+
+
+
+
+class Counter(dict):
+  """
+  Dict with default 0
+  """
+  def __getitem__(self, idx):
+    try:
+      return dict.__getitem__(self, idx)
+    except KeyError:
+      return 0
+
+  def totalCount(self):
+    """
+    Returns the sum of counts for all keys.
+    """
+    return sum(self.values())
diff --git a/search/graphicsDisplay.py b/search/graphicsDisplay.py
new file mode 100644
index 0000000..bd53e9a
--- /dev/null
+++ b/search/graphicsDisplay.py
@@ -0,0 +1,679 @@
+# graphicsDisplay.py
+# ------------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+from graphicsUtils import *
+import math, time
+from game import Directions
+
+###########################
+#  GRAPHICS DISPLAY CODE  #
+###########################
+
+# Most code by Dan Klein and John Denero written or rewritten for cs188, UC Berkeley.
+# Some code from a Pacman implementation by LiveWires, and used / modified with permission.
+
+DEFAULT_GRID_SIZE = 30.0
+INFO_PANE_HEIGHT = 35
+BACKGROUND_COLOR = formatColor(0,0,0)
+WALL_COLOR = formatColor(0.0/255.0, 51.0/255.0, 255.0/255.0)
+INFO_PANE_COLOR = formatColor(.4,.4,0)
+SCORE_COLOR = formatColor(.9, .9, .9)
+PACMAN_OUTLINE_WIDTH = 2
+PACMAN_CAPTURE_OUTLINE_WIDTH = 4
+
+GHOST_COLORS = []
+GHOST_COLORS.append(formatColor(.9,0,0)) # Red
+GHOST_COLORS.append(formatColor(0,.3,.9)) # Blue
+GHOST_COLORS.append(formatColor(.98,.41,.07)) # Orange
+GHOST_COLORS.append(formatColor(.1,.75,.7)) # Green
+GHOST_COLORS.append(formatColor(1.0,0.6,0.0)) # Yellow
+GHOST_COLORS.append(formatColor(.4,0.13,0.91)) # Purple
+
+TEAM_COLORS = GHOST_COLORS[:2]
+
+GHOST_SHAPE = [
+    ( 0,    0.3 ),
+    ( 0.25, 0.75 ),
+    ( 0.5,  0.3 ),
+    ( 0.75, 0.75 ),
+    ( 0.75, -0.5 ),
+    ( 0.5,  -0.75 ),
+    (-0.5,  -0.75 ),
+    (-0.75, -0.5 ),
+    (-0.75, 0.75 ),
+    (-0.5,  0.3 ),
+    (-0.25, 0.75 )
+  ]
+GHOST_SIZE = 0.65
+SCARED_COLOR = formatColor(1,1,1)
+
+GHOST_VEC_COLORS = [colorToVector(c) for c in GHOST_COLORS]
+
+PACMAN_COLOR = formatColor(255.0/255.0,255.0/255.0,61.0/255)
+PACMAN_SCALE = 0.5
+#pacman_speed = 0.25
+
+# Food
+FOOD_COLOR = formatColor(1,1,1)
+FOOD_SIZE = 0.1
+
+# Laser
+LASER_COLOR = formatColor(1,0,0)
+LASER_SIZE = 0.02
+
+# Capsule graphics
+CAPSULE_COLOR = formatColor(1,1,1)
+CAPSULE_SIZE = 0.25
+
+# Drawing walls
+WALL_RADIUS = 0.15
+
+class InfoPane:
+    def __init__(self, layout, gridSize):
+        self.gridSize = gridSize
+        self.width = (layout.width) * gridSize
+        self.base = (layout.height + 1) * gridSize
+        self.height = INFO_PANE_HEIGHT
+        self.fontSize = 24
+        self.textColor = PACMAN_COLOR
+        self.drawPane()
+
+    def toScreen(self, pos, y = None):
+        """
+          Translates a point relative from the bottom left of the info pane.
+        """
+        if y == None:
+            x,y = pos
+        else:
+            x = pos
+
+        x = self.gridSize + x # Margin
+        y = self.base + y
+        return x,y
+
+    def drawPane(self):
+        self.scoreText = text( self.toScreen(0, 0  ), self.textColor, "SCORE:    0", "Times", self.fontSize, "bold")
+
+    def initializeGhostDistances(self, distances):
+        self.ghostDistanceText = []
+
+        size = 20
+        if self.width < 240:
+            size = 12
+        if self.width < 160:
+            size = 10
+
+        for i, d in enumerate(distances):
+            t = text( self.toScreen(self.width//2 + self.width//8 * i, 0), GHOST_COLORS[i+1], d, "Times", size, "bold")
+            self.ghostDistanceText.append(t)
+
+    def updateScore(self, score):
+        changeText(self.scoreText, "SCORE: % 4d" % score)
+
+    def setTeam(self, isBlue):
+        text = "RED TEAM"
+        if isBlue: text = "BLUE TEAM"
+        self.teamText = text( self.toScreen(300, 0  ), self.textColor, text, "Times", self.fontSize, "bold")
+
+    def updateGhostDistances(self, distances):
+        if len(distances) == 0: return
+        if 'ghostDistanceText' not in dir(self): self.initializeGhostDistances(distances)
+        else:
+            for i, d in enumerate(distances):
+                changeText(self.ghostDistanceText[i], d)
+
+    def drawGhost(self):
+        pass
+
+    def drawPacman(self):
+        pass
+
+    def drawWarning(self):
+        pass
+
+    def clearIcon(self):
+        pass
+
+    def updateMessage(self, message):
+        pass
+
+    def clearMessage(self):
+        pass
+
+
+class PacmanGraphics:
+    def __init__(self, zoom=1.0, frameTime=0.0, capture=False):
+        self.have_window = 0
+        self.currentGhostImages = {}
+        self.pacmanImage = None
+        self.zoom = zoom
+        self.gridSize = DEFAULT_GRID_SIZE * zoom
+        self.capture = capture
+        self.frameTime = frameTime
+
+    def checkNullDisplay(self):
+        return False
+
+    def initialize(self, state, isBlue = False):
+        self.isBlue = isBlue
+        self.startGraphics(state)
+
+        # self.drawDistributions(state)
+        self.distributionImages = None  # Initialized lazily
+        self.drawStaticObjects(state)
+        self.drawAgentObjects(state)
+
+        # Information
+        self.previousState = state
+
+    def startGraphics(self, state):
+        self.layout = state.layout
+        layout = self.layout
+        self.width = layout.width
+        self.height = layout.height
+        self.make_window(self.width, self.height)
+        self.infoPane = InfoPane(layout, self.gridSize)
+        self.currentState = layout
+
+    def drawDistributions(self, state):
+        walls = state.layout.walls
+        dist = []
+        for x in range(walls.width):
+            distx = []
+            dist.append(distx)
+            for y in range(walls.height):
+                ( screen_x, screen_y ) = self.to_screen( (x, y) )
+                block = square( (screen_x, screen_y),
+                                0.5 * self.gridSize,
+                                color = BACKGROUND_COLOR,
+                                filled = 1, behind=2)
+                distx.append(block)
+        self.distributionImages = dist
+
+    def drawStaticObjects(self, state):
+        layout = self.layout
+        self.drawWalls(layout.walls)
+        self.food = self.drawFood(layout.food)
+        self.capsules = self.drawCapsules(layout.capsules)
+        refresh()
+
+    def drawAgentObjects(self, state):
+        self.agentImages = [] # (agentState, image)
+        for index, agent in enumerate(state.agentStates):
+            if agent.isPacman:
+                image = self.drawPacman(agent, index)
+                self.agentImages.append( (agent, image) )
+            else:
+                image = self.drawGhost(agent, index)
+                self.agentImages.append( (agent, image) )
+        refresh()
+
+    def swapImages(self, agentIndex, newState):
+        """
+          Changes an image from a ghost to a pacman or vis versa (for capture)
+        """
+        prevState, prevImage = self.agentImages[agentIndex]
+        for item in prevImage: remove_from_screen(item)
+        if newState.isPacman:
+            image = self.drawPacman(newState, agentIndex)
+            self.agentImages[agentIndex] = (newState, image )
+        else:
+            image = self.drawGhost(newState, agentIndex)
+            self.agentImages[agentIndex] = (newState, image )
+        refresh()
+
+    def update(self, newState):
+        agentIndex = newState._agentMoved
+        agentState = newState.agentStates[agentIndex]
+
+        if self.agentImages[agentIndex][0].isPacman != agentState.isPacman: self.swapImages(agentIndex, agentState)
+        prevState, prevImage = self.agentImages[agentIndex]
+        if agentState.isPacman:
+            self.animatePacman(agentState, prevState, prevImage)
+        else:
+            self.moveGhost(agentState, agentIndex, prevState, prevImage)
+        self.agentImages[agentIndex] = (agentState, prevImage)
+
+        if newState._foodEaten != None:
+            self.removeFood(newState._foodEaten, self.food)
+        if newState._capsuleEaten != None:
+            self.removeCapsule(newState._capsuleEaten, self.capsules)
+        self.infoPane.updateScore(newState.score)
+        if 'ghostDistances' in dir(newState):
+            self.infoPane.updateGhostDistances(newState.ghostDistances)
+
+    def make_window(self, width, height):
+        grid_width = (width-1) * self.gridSize
+        grid_height = (height-1) * self.gridSize
+        screen_width = 2*self.gridSize + grid_width
+        screen_height = 2*self.gridSize + grid_height + INFO_PANE_HEIGHT
+
+        begin_graphics(screen_width,
+                       screen_height,
+                       BACKGROUND_COLOR,
+                       "CS188 Pacman")
+
+    def drawPacman(self, pacman, index):
+        position = self.getPosition(pacman)
+        screen_point = self.to_screen(position)
+        endpoints = self.getEndpoints(self.getDirection(pacman))
+
+        width = PACMAN_OUTLINE_WIDTH
+        outlineColor = PACMAN_COLOR
+        fillColor = PACMAN_COLOR
+
+        if self.capture:
+            outlineColor = TEAM_COLORS[index % 2]
+            fillColor = GHOST_COLORS[index]
+            width = PACMAN_CAPTURE_OUTLINE_WIDTH
+
+        return [circle(screen_point, PACMAN_SCALE * self.gridSize,
+                       fillColor = fillColor, outlineColor = outlineColor,
+                       endpoints = endpoints,
+                       width = width)]
+
+    def getEndpoints(self, direction, position=(0,0)):
+        x, y = position
+        pos = x - int(x) + y - int(y)
+        width = 30 + 80 * math.sin(math.pi* pos)
+
+        delta = width / 2
+        if (direction == 'West'):
+            endpoints = (180+delta, 180-delta)
+        elif (direction == 'North'):
+            endpoints = (90+delta, 90-delta)
+        elif (direction == 'South'):
+            endpoints = (270+delta, 270-delta)
+        else:
+            endpoints = (0+delta, 0-delta)
+        return endpoints
+
+    def movePacman(self, position, direction, image):
+        screenPosition = self.to_screen(position)
+        endpoints = self.getEndpoints( direction, position )
+        r = PACMAN_SCALE * self.gridSize
+        moveCircle(image[0], screenPosition, r, endpoints)
+        refresh()
+
+    def animatePacman(self, pacman, prevPacman, image):
+        if self.frameTime < 0:
+            print('Press any key to step forward, "q" to play')
+            keys = wait_for_keys()
+            if 'q' in keys:
+                self.frameTime = 0.1
+        if self.frameTime > 0.01 or self.frameTime < 0:
+            start = time.time()
+            fx, fy = self.getPosition(prevPacman)
+            px, py = self.getPosition(pacman)
+            frames = 4.0
+            for i in range(1,int(frames) + 1):
+                pos = px*i/frames + fx*(frames-i)/frames, py*i/frames + fy*(frames-i)/frames
+                self.movePacman(pos, self.getDirection(pacman), image)
+                refresh()
+                sleep(abs(self.frameTime) / frames)
+        else:
+            self.movePacman(self.getPosition(pacman), self.getDirection(pacman), image)
+        refresh()
+
+    def getGhostColor(self, ghost, ghostIndex):
+        if ghost.scaredTimer > 0:
+            return SCARED_COLOR
+        else:
+            return GHOST_COLORS[ghostIndex]
+
+    def drawGhost(self, ghost, agentIndex):
+        pos = self.getPosition(ghost)
+        dir = self.getDirection(ghost)
+        (screen_x, screen_y) = (self.to_screen(pos) )
+        coords = []
+        for (x, y) in GHOST_SHAPE:
+            coords.append((x*self.gridSize*GHOST_SIZE + screen_x, y*self.gridSize*GHOST_SIZE + screen_y))
+
+        colour = self.getGhostColor(ghost, agentIndex)
+        body = polygon(coords, colour, filled = 1)
+        WHITE = formatColor(1.0, 1.0, 1.0)
+        BLACK = formatColor(0.0, 0.0, 0.0)
+
+        dx = 0
+        dy = 0
+        if dir == 'North':
+            dy = -0.2
+        if dir == 'South':
+            dy = 0.2
+        if dir == 'East':
+            dx = 0.2
+        if dir == 'West':
+            dx = -0.2
+        leftEye = circle((screen_x+self.gridSize*GHOST_SIZE*(-0.3+dx/1.5), screen_y-self.gridSize*GHOST_SIZE*(0.3-dy/1.5)), self.gridSize*GHOST_SIZE*0.2, WHITE, WHITE)
+        rightEye = circle((screen_x+self.gridSize*GHOST_SIZE*(0.3+dx/1.5), screen_y-self.gridSize*GHOST_SIZE*(0.3-dy/1.5)), self.gridSize*GHOST_SIZE*0.2, WHITE, WHITE)
+        leftPupil = circle((screen_x+self.gridSize*GHOST_SIZE*(-0.3+dx), screen_y-self.gridSize*GHOST_SIZE*(0.3-dy)), self.gridSize*GHOST_SIZE*0.08, BLACK, BLACK)
+        rightPupil = circle((screen_x+self.gridSize*GHOST_SIZE*(0.3+dx), screen_y-self.gridSize*GHOST_SIZE*(0.3-dy)), self.gridSize*GHOST_SIZE*0.08, BLACK, BLACK)
+        ghostImageParts = []
+        ghostImageParts.append(body)
+        ghostImageParts.append(leftEye)
+        ghostImageParts.append(rightEye)
+        ghostImageParts.append(leftPupil)
+        ghostImageParts.append(rightPupil)
+
+        return ghostImageParts
+
+    def moveEyes(self, pos, dir, eyes):
+        (screen_x, screen_y) = (self.to_screen(pos) )
+        dx = 0
+        dy = 0
+        if dir == 'North':
+            dy = -0.2
+        if dir == 'South':
+            dy = 0.2
+        if dir == 'East':
+            dx = 0.2
+        if dir == 'West':
+            dx = -0.2
+        moveCircle(eyes[0],(screen_x+self.gridSize*GHOST_SIZE*(-0.3+dx/1.5), screen_y-self.gridSize*GHOST_SIZE*(0.3-dy/1.5)), self.gridSize*GHOST_SIZE*0.2)
+        moveCircle(eyes[1],(screen_x+self.gridSize*GHOST_SIZE*(0.3+dx/1.5), screen_y-self.gridSize*GHOST_SIZE*(0.3-dy/1.5)), self.gridSize*GHOST_SIZE*0.2)
+        moveCircle(eyes[2],(screen_x+self.gridSize*GHOST_SIZE*(-0.3+dx), screen_y-self.gridSize*GHOST_SIZE*(0.3-dy)), self.gridSize*GHOST_SIZE*0.08)
+        moveCircle(eyes[3],(screen_x+self.gridSize*GHOST_SIZE*(0.3+dx), screen_y-self.gridSize*GHOST_SIZE*(0.3-dy)), self.gridSize*GHOST_SIZE*0.08)
+
+    def moveGhost(self, ghost, ghostIndex, prevGhost, ghostImageParts):
+        old_x, old_y = self.to_screen(self.getPosition(prevGhost))
+        new_x, new_y = self.to_screen(self.getPosition(ghost))
+        delta = new_x - old_x, new_y - old_y
+
+        for ghostImagePart in ghostImageParts:
+            move_by(ghostImagePart, delta)
+        refresh()
+
+        if ghost.scaredTimer > 0:
+            color = SCARED_COLOR
+        else:
+            color = GHOST_COLORS[ghostIndex]
+        edit(ghostImageParts[0], ('fill', color), ('outline', color))
+        self.moveEyes(self.getPosition(ghost), self.getDirection(ghost), ghostImageParts[-4:])
+        refresh()
+
+    def getPosition(self, agentState):
+        if agentState.configuration == None: return (-1000, -1000)
+        return agentState.getPosition()
+
+    def getDirection(self, agentState):
+        if agentState.configuration == None: return Directions.STOP
+        return agentState.configuration.getDirection()
+
+    def finish(self):
+        end_graphics()
+
+    def to_screen(self, point):
+        ( x, y ) = point
+        #y = self.height - y
+        x = (x + 1)*self.gridSize
+        y = (self.height  - y)*self.gridSize
+        return ( x, y )
+
+    # Fixes some TK issue with off-center circles
+    def to_screen2(self, point):
+        ( x, y ) = point
+        #y = self.height - y
+        x = (x + 1)*self.gridSize
+        y = (self.height  - y)*self.gridSize
+        return ( x, y )
+
+    def drawWalls(self, wallMatrix):
+        wallColor = WALL_COLOR
+        for xNum, x in enumerate(wallMatrix):
+            if self.capture and (xNum * 2) < wallMatrix.width: wallColor = TEAM_COLORS[0]
+            if self.capture and (xNum * 2) >= wallMatrix.width: wallColor = TEAM_COLORS[1]
+
+            for yNum, cell in enumerate(x):
+                if cell: # There's a wall here
+                    pos = (xNum, yNum)
+                    screen = self.to_screen(pos)
+                    screen2 = self.to_screen2(pos)
+
+                    # draw each quadrant of the square based on adjacent walls
+                    wIsWall = self.isWall(xNum-1, yNum, wallMatrix)
+                    eIsWall = self.isWall(xNum+1, yNum, wallMatrix)
+                    nIsWall = self.isWall(xNum, yNum+1, wallMatrix)
+                    sIsWall = self.isWall(xNum, yNum-1, wallMatrix)
+                    nwIsWall = self.isWall(xNum-1, yNum+1, wallMatrix)
+                    swIsWall = self.isWall(xNum-1, yNum-1, wallMatrix)
+                    neIsWall = self.isWall(xNum+1, yNum+1, wallMatrix)
+                    seIsWall = self.isWall(xNum+1, yNum-1, wallMatrix)
+
+                    # NE quadrant
+                    if (not nIsWall) and (not eIsWall):
+                        # inner circle
+                        circle(screen2, WALL_RADIUS * self.gridSize, wallColor, wallColor, (0,91), 'arc')
+                    if (nIsWall) and (not eIsWall):
+                        # vertical line
+                        line(add(screen, (self.gridSize*WALL_RADIUS, 0)), add(screen, (self.gridSize*WALL_RADIUS, self.gridSize*(-0.5)-1)), wallColor)
+                    if (not nIsWall) and (eIsWall):
+                        # horizontal line
+                        line(add(screen, (0, self.gridSize*(-1)*WALL_RADIUS)), add(screen, (self.gridSize*0.5+1, self.gridSize*(-1)*WALL_RADIUS)), wallColor)
+                    if (nIsWall) and (eIsWall) and (not neIsWall):
+                        # outer circle
+                        circle(add(screen2, (self.gridSize*2*WALL_RADIUS, self.gridSize*(-2)*WALL_RADIUS)), WALL_RADIUS * self.gridSize-1, wallColor, wallColor, (180,271), 'arc')
+                        line(add(screen, (self.gridSize*2*WALL_RADIUS-1, self.gridSize*(-1)*WALL_RADIUS)), add(screen, (self.gridSize*0.5+1, self.gridSize*(-1)*WALL_RADIUS)), wallColor)
+                        line(add(screen, (self.gridSize*WALL_RADIUS, self.gridSize*(-2)*WALL_RADIUS+1)), add(screen, (self.gridSize*WALL_RADIUS, self.gridSize*(-0.5))), wallColor)
+
+                    # NW quadrant
+                    if (not nIsWall) and (not wIsWall):
+                        # inner circle
+                        circle(screen2, WALL_RADIUS * self.gridSize, wallColor, wallColor, (90,181), 'arc')
+                    if (nIsWall) and (not wIsWall):
+                        # vertical line
+                        line(add(screen, (self.gridSize*(-1)*WALL_RADIUS, 0)), add(screen, (self.gridSize*(-1)*WALL_RADIUS, self.gridSize*(-0.5)-1)), wallColor)
+                    if (not nIsWall) and (wIsWall):
+                        # horizontal line
+                        line(add(screen, (0, self.gridSize*(-1)*WALL_RADIUS)), add(screen, (self.gridSize*(-0.5)-1, self.gridSize*(-1)*WALL_RADIUS)), wallColor)
+                    if (nIsWall) and (wIsWall) and (not nwIsWall):
+                        # outer circle
+                        circle(add(screen2, (self.gridSize*(-2)*WALL_RADIUS, self.gridSize*(-2)*WALL_RADIUS)), WALL_RADIUS * self.gridSize-1, wallColor, wallColor, (270,361), 'arc')
+                        line(add(screen, (self.gridSize*(-2)*WALL_RADIUS+1, self.gridSize*(-1)*WALL_RADIUS)), add(screen, (self.gridSize*(-0.5), self.gridSize*(-1)*WALL_RADIUS)), wallColor)
+                        line(add(screen, (self.gridSize*(-1)*WALL_RADIUS, self.gridSize*(-2)*WALL_RADIUS+1)), add(screen, (self.gridSize*(-1)*WALL_RADIUS, self.gridSize*(-0.5))), wallColor)
+
+                    # SE quadrant
+                    if (not sIsWall) and (not eIsWall):
+                        # inner circle
+                        circle(screen2, WALL_RADIUS * self.gridSize, wallColor, wallColor, (270,361), 'arc')
+                    if (sIsWall) and (not eIsWall):
+                        # vertical line
+                        line(add(screen, (self.gridSize*WALL_RADIUS, 0)), add(screen, (self.gridSize*WALL_RADIUS, self.gridSize*(0.5)+1)), wallColor)
+                    if (not sIsWall) and (eIsWall):
+                        # horizontal line
+                        line(add(screen, (0, self.gridSize*(1)*WALL_RADIUS)), add(screen, (self.gridSize*0.5+1, self.gridSize*(1)*WALL_RADIUS)), wallColor)
+                    if (sIsWall) and (eIsWall) and (not seIsWall):
+                        # outer circle
+                        circle(add(screen2, (self.gridSize*2*WALL_RADIUS, self.gridSize*(2)*WALL_RADIUS)), WALL_RADIUS * self.gridSize-1, wallColor, wallColor, (90,181), 'arc')
+                        line(add(screen, (self.gridSize*2*WALL_RADIUS-1, self.gridSize*(1)*WALL_RADIUS)), add(screen, (self.gridSize*0.5, self.gridSize*(1)*WALL_RADIUS)), wallColor)
+                        line(add(screen, (self.gridSize*WALL_RADIUS, self.gridSize*(2)*WALL_RADIUS-1)), add(screen, (self.gridSize*WALL_RADIUS, self.gridSize*(0.5))), wallColor)
+
+                    # SW quadrant
+                    if (not sIsWall) and (not wIsWall):
+                        # inner circle
+                        circle(screen2, WALL_RADIUS * self.gridSize, wallColor, wallColor, (180,271), 'arc')
+                    if (sIsWall) and (not wIsWall):
+                        # vertical line
+                        line(add(screen, (self.gridSize*(-1)*WALL_RADIUS, 0)), add(screen, (self.gridSize*(-1)*WALL_RADIUS, self.gridSize*(0.5)+1)), wallColor)
+                    if (not sIsWall) and (wIsWall):
+                        # horizontal line
+                        line(add(screen, (0, self.gridSize*(1)*WALL_RADIUS)), add(screen, (self.gridSize*(-0.5)-1, self.gridSize*(1)*WALL_RADIUS)), wallColor)
+                    if (sIsWall) and (wIsWall) and (not swIsWall):
+                        # outer circle
+                        circle(add(screen2, (self.gridSize*(-2)*WALL_RADIUS, self.gridSize*(2)*WALL_RADIUS)), WALL_RADIUS * self.gridSize-1, wallColor, wallColor, (0,91), 'arc')
+                        line(add(screen, (self.gridSize*(-2)*WALL_RADIUS+1, self.gridSize*(1)*WALL_RADIUS)), add(screen, (self.gridSize*(-0.5), self.gridSize*(1)*WALL_RADIUS)), wallColor)
+                        line(add(screen, (self.gridSize*(-1)*WALL_RADIUS, self.gridSize*(2)*WALL_RADIUS-1)), add(screen, (self.gridSize*(-1)*WALL_RADIUS, self.gridSize*(0.5))), wallColor)
+
+    def isWall(self, x, y, walls):
+        if x < 0 or y < 0:
+            return False
+        if x >= walls.width or y >= walls.height:
+            return False
+        return walls[x][y]
+
+    def drawFood(self, foodMatrix ):
+        foodImages = []
+        color = FOOD_COLOR
+        for xNum, x in enumerate(foodMatrix):
+            if self.capture and (xNum * 2) <= foodMatrix.width: color = TEAM_COLORS[0]
+            if self.capture and (xNum * 2) > foodMatrix.width: color = TEAM_COLORS[1]
+            imageRow = []
+            foodImages.append(imageRow)
+            for yNum, cell in enumerate(x):
+                if cell: # There's food here
+                    screen = self.to_screen((xNum, yNum ))
+                    dot = circle( screen,
+                                  FOOD_SIZE * self.gridSize,
+                                  outlineColor = color, fillColor = color,
+                                  width = 1)
+                    imageRow.append(dot)
+                else:
+                    imageRow.append(None)
+        return foodImages
+
+    def drawCapsules(self, capsules ):
+        capsuleImages = {}
+        for capsule in capsules:
+            ( screen_x, screen_y ) = self.to_screen(capsule)
+            dot = circle( (screen_x, screen_y),
+                              CAPSULE_SIZE * self.gridSize,
+                              outlineColor = CAPSULE_COLOR,
+                              fillColor = CAPSULE_COLOR,
+                              width = 1)
+            capsuleImages[capsule] = dot
+        return capsuleImages
+
+    def removeFood(self, cell, foodImages ):
+        x, y = cell
+        remove_from_screen(foodImages[x][y])
+
+    def removeCapsule(self, cell, capsuleImages ):
+        x, y = cell
+        remove_from_screen(capsuleImages[(x, y)])
+
+    def drawExpandedCells(self, cells):
+        """
+        Draws an overlay of expanded grid positions for search agents
+        """
+        n = float(len(cells))
+        baseColor = [1.0, 0.0, 0.0]
+        self.clearExpandedCells()
+        self.expandedCells = []
+        for k, cell in enumerate(cells):
+            screenPos = self.to_screen( cell)
+            cellColor = formatColor(*[(n-k) * c * .5 / n + .25 for c in baseColor])
+            block = square(screenPos,
+                     0.5 * self.gridSize,
+                     color = cellColor,
+                     filled = 1, behind=2)
+            self.expandedCells.append(block)
+            if self.frameTime < 0:
+                refresh()
+
+    def clearExpandedCells(self):
+        if 'expandedCells' in dir(self) and len(self.expandedCells) > 0:
+            for cell in self.expandedCells:
+                remove_from_screen(cell)
+
+
+    def updateDistributions(self, distributions):
+        "Draws an agent's belief distributions"
+        # copy all distributions so we don't change their state
+        distributions = map(lambda x: x.copy(), distributions)
+        if self.distributionImages == None:
+            self.drawDistributions(self.previousState)
+        for x in range(len(self.distributionImages)):
+            for y in range(len(self.distributionImages[0])):
+                image = self.distributionImages[x][y]
+                weights = [dist[ (x,y) ] for dist in distributions]
+
+                if sum(weights) != 0:
+                    pass
+                # Fog of war
+                color = [0.0,0.0,0.0]
+                colors = GHOST_VEC_COLORS[1:] # With Pacman
+                if self.capture: colors = GHOST_VEC_COLORS
+                for weight, gcolor in zip(weights, colors):
+                    color = [min(1.0, c + 0.95 * g * weight ** .3) for c,g in zip(color, gcolor)]
+                changeColor(image, formatColor(*color))
+        refresh()
+
+class FirstPersonPacmanGraphics(PacmanGraphics):
+    def __init__(self, zoom = 1.0, showGhosts = True, capture = False, frameTime=0):
+        PacmanGraphics.__init__(self, zoom, frameTime=frameTime)
+        self.showGhosts = showGhosts
+        self.capture = capture
+
+    def initialize(self, state, isBlue = False):
+
+        self.isBlue = isBlue
+        PacmanGraphics.startGraphics(self, state)
+        # Initialize distribution images
+        walls = state.layout.walls
+        dist = []
+        self.layout = state.layout
+
+        # Draw the rest
+        self.distributionImages = None  # initialize lazily
+        self.drawStaticObjects(state)
+        self.drawAgentObjects(state)
+
+        # Information
+        self.previousState = state
+
+    def lookAhead(self, config, state):
+        if config.getDirection() == 'Stop':
+            return
+        else:
+            pass
+            # Draw relevant ghosts
+            allGhosts = state.getGhostStates()
+            visibleGhosts = state.getVisibleGhosts()
+            for i, ghost in enumerate(allGhosts):
+                if ghost in visibleGhosts:
+                    self.drawGhost(ghost, i)
+                else:
+                    self.currentGhostImages[i] = None
+
+    def getGhostColor(self, ghost, ghostIndex):
+        return GHOST_COLORS[ghostIndex]
+
+    def getPosition(self, ghostState):
+        if not self.showGhosts and not ghostState.isPacman and ghostState.getPosition()[1] > 1:
+            return (-1000, -1000)
+        else:
+            return PacmanGraphics.getPosition(self, ghostState)
+
+def add(x, y):
+    return (x[0] + y[0], x[1] + y[1])
+
+
+# Saving graphical output
+# -----------------------
+# Note: to make an animated gif from this postscript output, try the command:
+# convert -delay 7 -loop 1 -compress lzw -layers optimize frame* out.gif
+# convert is part of imagemagick (freeware)
+
+SAVE_POSTSCRIPT = False
+POSTSCRIPT_OUTPUT_DIR = 'frames'
+FRAME_NUMBER = 0
+import os
+
+def saveFrame():
+    "Saves the current graphical output as a postscript file"
+    global SAVE_POSTSCRIPT, FRAME_NUMBER, POSTSCRIPT_OUTPUT_DIR
+    if not SAVE_POSTSCRIPT: return
+    if not os.path.exists(POSTSCRIPT_OUTPUT_DIR): os.mkdir(POSTSCRIPT_OUTPUT_DIR)
+    name = os.path.join(POSTSCRIPT_OUTPUT_DIR, 'frame_%08d.ps' % FRAME_NUMBER)
+    FRAME_NUMBER += 1
+    writePostscript(name) # writes the current canvas
diff --git a/search/graphicsUtils.py b/search/graphicsUtils.py
new file mode 100644
index 0000000..22e6ae1
--- /dev/null
+++ b/search/graphicsUtils.py
@@ -0,0 +1,402 @@
+# graphicsUtils.py
+# ----------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+import sys
+import math
+import random
+import string
+import time
+import types
+import tkinter
+import os.path
+
+_Windows = sys.platform == 'win32'  # True if on Win95/98/NT
+
+_root_window = None      # The root window for graphics output
+_canvas = None      # The canvas which holds graphics
+_canvas_xs = None      # Size of canvas object
+_canvas_ys = None
+_canvas_x = None      # Current position on canvas
+_canvas_y = None
+_canvas_col = None      # Current colour (set to black below)
+_canvas_tsize = 12
+_canvas_tserifs = 0
+
+def formatColor(r, g, b):
+    return '#%02x%02x%02x' % (int(r * 255), int(g * 255), int(b * 255))
+
+def colorToVector(color):
+    return list(map(lambda x: int(x, 16) / 256.0, [color[1:3], color[3:5], color[5:7]]))
+
+if _Windows:
+    _canvas_tfonts = ['times new roman', 'lucida console']
+else:
+    _canvas_tfonts = ['times', 'lucidasans-24']
+    pass # XXX need defaults here
+
+def sleep(secs):
+    global _root_window
+    if _root_window == None:
+        time.sleep(secs)
+    else:
+        _root_window.update_idletasks()
+        _root_window.after(int(1000 * secs), _root_window.quit)
+        _root_window.mainloop()
+
+def begin_graphics(width=640, height=480, color=formatColor(0, 0, 0), title=None):
+
+    global _root_window, _canvas, _canvas_x, _canvas_y, _canvas_xs, _canvas_ys, _bg_color
+
+    # Check for duplicate call
+    if _root_window is not None:
+        # Lose the window.
+        _root_window.destroy()
+
+    # Save the canvas size parameters
+    _canvas_xs, _canvas_ys = width - 1, height - 1
+    _canvas_x, _canvas_y = 0, _canvas_ys
+    _bg_color = color
+
+    # Create the root window
+    _root_window = tkinter.Tk()
+    _root_window.protocol('WM_DELETE_WINDOW', _destroy_window)
+    _root_window.title(title or 'Graphics Window')
+    _root_window.resizable(0, 0)
+
+    # Create the canvas object
+    try:
+        _canvas = tkinter.Canvas(_root_window, width=width, height=height)
+        _canvas.pack()
+        draw_background()
+        _canvas.update()
+    except:
+        _root_window = None
+        raise
+
+    # Bind to key-down and key-up events
+    _root_window.bind( "", _keypress )
+    _root_window.bind( "", _keyrelease )
+    _root_window.bind( "", _clear_keys )
+    _root_window.bind( "", _clear_keys )
+    _root_window.bind( "", _leftclick )
+    _root_window.bind( "", _rightclick )
+    _root_window.bind( "", _rightclick )
+    _root_window.bind( "", _ctrl_leftclick)
+    _clear_keys()
+
+_leftclick_loc = None
+_rightclick_loc = None
+_ctrl_leftclick_loc = None
+
+def _leftclick(event):
+    global _leftclick_loc
+    _leftclick_loc = (event.x, event.y)
+
+def _rightclick(event):
+    global _rightclick_loc
+    _rightclick_loc = (event.x, event.y)
+
+def _ctrl_leftclick(event):
+    global _ctrl_leftclick_loc
+    _ctrl_leftclick_loc = (event.x, event.y)
+
+def wait_for_click():
+    while True:
+        global _leftclick_loc
+        global _rightclick_loc
+        global _ctrl_leftclick_loc
+        if _leftclick_loc != None:
+            val = _leftclick_loc
+            _leftclick_loc = None
+            return val, 'left'
+        if _rightclick_loc != None:
+            val = _rightclick_loc
+            _rightclick_loc = None
+            return val, 'right'
+        if _ctrl_leftclick_loc != None:
+            val = _ctrl_leftclick_loc
+            _ctrl_leftclick_loc = None
+            return val, 'ctrl_left'
+        sleep(0.05)
+
+def draw_background():
+    corners = [(0,0), (0, _canvas_ys), (_canvas_xs, _canvas_ys), (_canvas_xs, 0)]
+    polygon(corners, _bg_color, fillColor=_bg_color, filled=True, smoothed=False)
+
+def _destroy_window(event=None):
+    sys.exit(0)
+#    global _root_window
+#    _root_window.destroy()
+#    _root_window = None
+    #print("DESTROY")
+
+def end_graphics():
+    global _root_window, _canvas, _mouse_enabled
+    try:
+        try:
+            sleep(1)
+            if _root_window != None:
+                _root_window.destroy()
+        except SystemExit as e:
+            print('Ending graphics raised an exception:', e)
+    finally:
+        _root_window = None
+        _canvas = None
+        _mouse_enabled = 0
+        _clear_keys()
+
+def clear_screen(background=None):
+    global _canvas_x, _canvas_y
+    _canvas.delete('all')
+    draw_background()
+    _canvas_x, _canvas_y = 0, _canvas_ys
+
+def polygon(coords, outlineColor, fillColor=None, filled=1, smoothed=1, behind=0, width=1):
+    c = []
+    for coord in coords:
+        c.append(coord[0])
+        c.append(coord[1])
+    if fillColor == None: fillColor = outlineColor
+    if filled == 0: fillColor = ""
+    poly = _canvas.create_polygon(c, outline=outlineColor, fill=fillColor, smooth=smoothed, width=width)
+    if behind > 0:
+        _canvas.tag_lower(poly, behind) # Higher should be more visible
+    return poly
+
+def square(pos, r, color, filled=1, behind=0):
+    x, y = pos
+    coords = [(x - r, y - r), (x + r, y - r), (x + r, y + r), (x - r, y + r)]
+    return polygon(coords, color, color, filled, 0, behind=behind)
+
+def circle(pos, r, outlineColor, fillColor=None, endpoints=None, style='pieslice', width=2):
+    x, y = pos
+    x0, x1 = x - r - 1, x + r
+    y0, y1 = y - r - 1, y + r
+    if endpoints == None:
+        e = [0, 359]
+    else:
+        e = list(endpoints)
+    while e[0] > e[1]: e[1] = e[1] + 360
+
+    return _canvas.create_arc(x0, y0, x1, y1, outline=outlineColor, fill=fillColor or outlineColor,
+                              extent=e[1] - e[0], start=e[0], style=style, width=width)
+
+def image(pos, file="../../blueghost.gif"):
+    x, y = pos
+    # img = PhotoImage(file=file)
+    return _canvas.create_image(x, y, image = tkinter.PhotoImage(file=file), anchor = tkinter.NW)
+
+
+def refresh():
+    _canvas.update_idletasks()
+
+def moveCircle(id, pos, r, endpoints=None):
+    global _canvas_x, _canvas_y
+
+    x, y = pos
+#    x0, x1 = x - r, x + r + 1
+#    y0, y1 = y - r, y + r + 1
+    x0, x1 = x - r - 1, x + r
+    y0, y1 = y - r - 1, y + r
+    if endpoints == None:
+        e = [0, 359]
+    else:
+        e = list(endpoints)
+    while e[0] > e[1]: e[1] = e[1] + 360
+
+    if os.path.isfile('flag'):
+        edit(id, ('extent', e[1] - e[0]))
+    else:
+        edit(id, ('start', e[0]), ('extent', e[1] - e[0]))
+    move_to(id, x0, y0)
+
+def edit(id, *args):
+    _canvas.itemconfigure(id, **dict(args))
+
+def text(pos, color, contents, font='Helvetica', size=12, style='normal', anchor="nw"):
+    global _canvas_x, _canvas_y
+    x, y = pos
+    font = (font, str(size), style)
+    return _canvas.create_text(x, y, fill=color, text=contents, font=font, anchor=anchor)
+
+def changeText(id, newText, font=None, size=12, style='normal'):
+    _canvas.itemconfigure(id, text=newText)
+    if font != None:
+        _canvas.itemconfigure(id, font=(font, '-%d' % size, style))
+
+def changeColor(id, newColor):
+    _canvas.itemconfigure(id, fill=newColor)
+
+def line(here, there, color=formatColor(0, 0, 0), width=2):
+    x0, y0 = here[0], here[1]
+    x1, y1 = there[0], there[1]
+    return _canvas.create_line(x0, y0, x1, y1, fill=color, width=width)
+
+##############################################################################
+### Keypress handling ########################################################
+##############################################################################
+
+# We bind to key-down and key-up events.
+
+_keysdown = {}
+_keyswaiting = {}
+# This holds an unprocessed key release.  We delay key releases by up to
+# one call to keys_pressed() to get round a problem with auto repeat.
+_got_release = None
+
+def _keypress(event):
+    global _got_release
+    #remap_arrows(event)
+    _keysdown[event.keysym] = 1
+    _keyswaiting[event.keysym] = 1
+#    print(event.char, event.keycode)
+    _got_release = None
+
+def _keyrelease(event):
+    global _got_release
+    #remap_arrows(event)
+    try:
+        del _keysdown[event.keysym]
+    except:
+        pass
+    _got_release = 1
+
+def remap_arrows(event):
+    # TURN ARROW PRESSES INTO LETTERS (SHOULD BE IN KEYBOARD AGENT)
+    if event.char in ['a', 's', 'd', 'w']:
+        return
+    if event.keycode in [37, 101]: # LEFT ARROW (win / x)
+        event.char = 'a'
+    if event.keycode in [38, 99]: # UP ARROW
+        event.char = 'w'
+    if event.keycode in [39, 102]: # RIGHT ARROW
+        event.char = 'd'
+    if event.keycode in [40, 104]: # DOWN ARROW
+        event.char = 's'
+
+def _clear_keys(event=None):
+    global _keysdown, _got_release, _keyswaiting
+    _keysdown = {}
+    _keyswaiting = {}
+    _got_release = None
+
+def keys_pressed(d_o_e=lambda arg: _root_window.dooneevent(arg),
+                 d_w=tkinter._tkinter.DONT_WAIT):
+    d_o_e(d_w)
+    if _got_release:
+        d_o_e(d_w)
+    return _keysdown.keys()
+
+def keys_waiting():
+    global _keyswaiting
+    keys = _keyswaiting.keys()
+    _keyswaiting = {}
+    return keys
+
+# Block for a list of keys...
+
+def wait_for_keys():
+    keys = []
+    while keys == []:
+        keys = keys_pressed()
+        sleep(0.05)
+    return keys
+
+def remove_from_screen(x,
+                       d_o_e=lambda arg: _root_window.dooneevent(arg),
+                       d_w=tkinter._tkinter.DONT_WAIT):
+    _canvas.delete(x)
+    d_o_e(d_w)
+
+def _adjust_coords(coord_list, x, y):
+    for i in range(0, len(coord_list), 2):
+        coord_list[i] = coord_list[i] + x
+        coord_list[i + 1] = coord_list[i + 1] + y
+    return coord_list
+
+def move_to(object, x, y=None,
+            d_o_e=lambda arg: _root_window.dooneevent(arg),
+            d_w=tkinter._tkinter.DONT_WAIT):
+    if y is None:
+        try: x, y = x
+        except: raise  'incomprehensible coordinates'
+
+    horiz = True
+    newCoords = []
+    current_x, current_y = _canvas.coords(object)[0:2] # first point
+    for coord in  _canvas.coords(object):
+        if horiz:
+            inc = x - current_x
+        else:
+            inc = y - current_y
+        horiz = not horiz
+
+        newCoords.append(coord + inc)
+
+    _canvas.coords(object, *newCoords)
+    d_o_e(d_w)
+
+def move_by(object, x, y=None,
+            d_o_e=lambda arg: _root_window.dooneevent(arg),
+            d_w=tkinter._tkinter.DONT_WAIT, lift=False):
+    if y is None:
+        try: x, y = x
+        except: raise Exception('incomprehensible coordinates')
+
+    horiz = True
+    newCoords = []
+    for coord in  _canvas.coords(object):
+        if horiz:
+            inc = x
+        else:
+            inc = y
+        horiz = not horiz
+
+        newCoords.append(coord + inc)
+
+    _canvas.coords(object, *newCoords)
+    d_o_e(d_w)
+    if lift:
+        _canvas.tag_raise(object)
+
+def writePostscript(filename):
+    "Writes the current canvas to a postscript file."
+    psfile = open(filename, 'w')
+    psfile.write(_canvas.postscript(pageanchor='sw',
+                     y='0.c',
+                     x='0.c'))
+    psfile.close()
+
+ghost_shape = [
+    (0, - 0.5),
+    (0.25, - 0.75),
+    (0.5, - 0.5),
+    (0.75, - 0.75),
+    (0.75, 0.5),
+    (0.5, 0.75),
+    (- 0.5, 0.75),
+    (- 0.75, 0.5),
+    (- 0.75, - 0.75),
+    (- 0.5, - 0.5),
+    (- 0.25, - 0.75)
+  ]
+
+if __name__ == '__main__':
+    begin_graphics()
+    clear_screen()
+    ghost_shape = [(x * 10 + 20, y * 10 + 20) for x, y in ghost_shape]
+    g = polygon(ghost_shape, formatColor(1, 1, 1))
+    move_to(g, (50, 50))
+    circle((150, 150), 20, formatColor(0.7, 0.3, 0.0), endpoints=[15, - 15])
+    sleep(2)
diff --git a/search/keyboardAgents.py b/search/keyboardAgents.py
new file mode 100644
index 0000000..624021d
--- /dev/null
+++ b/search/keyboardAgents.py
@@ -0,0 +1,84 @@
+# keyboardAgents.py
+# -----------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+from game import Agent
+from game import Directions
+import random
+
+class KeyboardAgent(Agent):
+    """
+    An agent controlled by the keyboard.
+    """
+    # NOTE: Arrow keys also work.
+    WEST_KEY  = 'a'
+    EAST_KEY  = 'd'
+    NORTH_KEY = 'w'
+    SOUTH_KEY = 's'
+    STOP_KEY = 'q'
+
+    def __init__( self, index = 0 ):
+
+        self.lastMove = Directions.STOP
+        self.index = index
+        self.keys = []
+
+    def getAction( self, state):
+        from graphicsUtils import keys_waiting
+        from graphicsUtils import keys_pressed
+        keys = list(keys_waiting()) + list(keys_pressed())
+        if keys != []:
+            self.keys = keys
+
+        legal = state.getLegalActions(self.index)
+        move = self.getMove(legal)
+
+        if move == Directions.STOP:
+            # Try to move in the same direction as before
+            if self.lastMove in legal:
+                move = self.lastMove
+
+        if (self.STOP_KEY in self.keys) and Directions.STOP in legal: move = Directions.STOP
+
+        if move not in legal:
+            move = random.choice(legal)
+
+        self.lastMove = move
+        return move
+
+    def getMove(self, legal):
+        move = Directions.STOP
+        if   (self.WEST_KEY in self.keys or 'Left' in self.keys) and Directions.WEST in legal:  move = Directions.WEST
+        if   (self.EAST_KEY in self.keys or 'Right' in self.keys) and Directions.EAST in legal: move = Directions.EAST
+        if   (self.NORTH_KEY in self.keys or 'Up' in self.keys) and Directions.NORTH in legal:   move = Directions.NORTH
+        if   (self.SOUTH_KEY in self.keys or 'Down' in self.keys) and Directions.SOUTH in legal: move = Directions.SOUTH
+        return move
+
+class KeyboardAgent2(KeyboardAgent):
+    """
+    A second agent controlled by the keyboard.
+    """
+    # NOTE: Arrow keys also work.
+    WEST_KEY  = 'j'
+    EAST_KEY  = "l"
+    NORTH_KEY = 'i'
+    SOUTH_KEY = 'k'
+    STOP_KEY = 'u'
+
+    def getMove(self, legal):
+        move = Directions.STOP
+        if   (self.WEST_KEY in self.keys) and Directions.WEST in legal:  move = Directions.WEST
+        if   (self.EAST_KEY in self.keys) and Directions.EAST in legal: move = Directions.EAST
+        if   (self.NORTH_KEY in self.keys) and Directions.NORTH in legal:   move = Directions.NORTH
+        if   (self.SOUTH_KEY in self.keys) and Directions.SOUTH in legal: move = Directions.SOUTH
+        return move
diff --git a/search/layout.py b/search/layout.py
new file mode 100644
index 0000000..ebba32a
--- /dev/null
+++ b/search/layout.py
@@ -0,0 +1,150 @@
+# layout.py
+# ---------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+from util import manhattanDistance
+from game import Grid
+import os
+import random
+from functools import reduce
+
+VISIBILITY_MATRIX_CACHE = {}
+
+class Layout:
+    """
+    A Layout manages the static information about the game board.
+    """
+
+    def __init__(self, layoutText):
+        self.width = len(layoutText[0])
+        self.height= len(layoutText)
+        self.walls = Grid(self.width, self.height, False)
+        self.food = Grid(self.width, self.height, False)
+        self.capsules = []
+        self.agentPositions = []
+        self.numGhosts = 0
+        self.processLayoutText(layoutText)
+        self.layoutText = layoutText
+        self.totalFood = len(self.food.asList())
+        # self.initializeVisibilityMatrix()
+
+    def getNumGhosts(self):
+        return self.numGhosts
+
+    def initializeVisibilityMatrix(self):
+        global VISIBILITY_MATRIX_CACHE
+        if reduce(str.__add__, self.layoutText) not in VISIBILITY_MATRIX_CACHE:
+            from game import Directions
+            vecs = [(-0.5,0), (0.5,0),(0,-0.5),(0,0.5)]
+            dirs = [Directions.NORTH, Directions.SOUTH, Directions.WEST, Directions.EAST]
+            vis = Grid(self.width, self.height, {Directions.NORTH:set(), Directions.SOUTH:set(), Directions.EAST:set(), Directions.WEST:set(), Directions.STOP:set()})
+            for x in range(self.width):
+                for y in range(self.height):
+                    if self.walls[x][y] == False:
+                        for vec, direction in zip(vecs, dirs):
+                            dx, dy = vec
+                            nextx, nexty = x + dx, y + dy
+                            while (nextx + nexty) != int(nextx) + int(nexty) or not self.walls[int(nextx)][int(nexty)] :
+                                vis[x][y][direction].add((nextx, nexty))
+                                nextx, nexty = x + dx, y + dy
+            self.visibility = vis
+            VISIBILITY_MATRIX_CACHE[reduce(str.__add__, self.layoutText)] = vis
+        else:
+            self.visibility = VISIBILITY_MATRIX_CACHE[reduce(str.__add__, self.layoutText)]
+
+    def isWall(self, pos):
+        x, col = pos
+        return self.walls[x][col]
+
+    def getRandomLegalPosition(self):
+        x = random.choice(range(self.width))
+        y = random.choice(range(self.height))
+        while self.isWall( (x, y) ):
+            x = random.choice(range(self.width))
+            y = random.choice(range(self.height))
+        return (x,y)
+
+    def getRandomCorner(self):
+        poses = [(1,1), (1, self.height - 2), (self.width - 2, 1), (self.width - 2, self.height - 2)]
+        return random.choice(poses)
+
+    def getFurthestCorner(self, pacPos):
+        poses = [(1,1), (1, self.height - 2), (self.width - 2, 1), (self.width - 2, self.height - 2)]
+        dist, pos = max([(manhattanDistance(p, pacPos), p) for p in poses])
+        return pos
+
+    def isVisibleFrom(self, ghostPos, pacPos, pacDirection):
+        row, col = [int(x) for x in pacPos]
+        return ghostPos in self.visibility[row][col][pacDirection]
+
+    def __str__(self):
+        return "\n".join(self.layoutText)
+
+    def deepCopy(self):
+        return Layout(self.layoutText[:])
+
+    def processLayoutText(self, layoutText):
+        """
+        Coordinates are flipped from the input format to the (x,y) convention here
+
+        The shape of the maze.  Each character
+        represents a different type of object.
+         % - Wall
+         . - Food
+         o - Capsule
+         G - Ghost
+         P - Pacman
+        Other characters are ignored.
+        """
+        maxY = self.height - 1
+        for y in range(self.height):
+            for x in range(self.width):
+                layoutChar = layoutText[maxY - y][x]
+                self.processLayoutChar(x, y, layoutChar)
+        self.agentPositions.sort()
+        self.agentPositions = [ ( i == 0, pos) for i, pos in self.agentPositions]
+
+    def processLayoutChar(self, x, y, layoutChar):
+        if layoutChar == '%':
+            self.walls[x][y] = True
+        elif layoutChar == '.':
+            self.food[x][y] = True
+        elif layoutChar == 'o':
+            self.capsules.append((x, y))
+        elif layoutChar == 'P':
+            self.agentPositions.append( (0, (x, y) ) )
+        elif layoutChar in ['G']:
+            self.agentPositions.append( (1, (x, y) ) )
+            self.numGhosts += 1
+        elif layoutChar in  ['1', '2', '3', '4']:
+            self.agentPositions.append( (int(layoutChar), (x,y)))
+            self.numGhosts += 1
+def getLayout(name, back = 2):
+    if name.endswith('.lay'):
+        layout = tryToLoad('layouts/' + name)
+        if layout == None: layout = tryToLoad(name)
+    else:
+        layout = tryToLoad('layouts/' + name + '.lay')
+        if layout == None: layout = tryToLoad(name + '.lay')
+    if layout == None and back >= 0:
+        curdir = os.path.abspath('.')
+        os.chdir('..')
+        layout = getLayout(name, back -1)
+        os.chdir(curdir)
+    return layout
+
+def tryToLoad(fullname):
+    if(not os.path.exists(fullname)): return None
+    f = open(fullname)
+    try: return Layout([line.strip() for line in f])
+    finally: f.close()
diff --git a/search/layouts/bigCorners.lay b/search/layouts/bigCorners.lay
new file mode 100644
index 0000000..4d89d7b
--- /dev/null
+++ b/search/layouts/bigCorners.lay
@@ -0,0 +1,37 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%.      %                         %.%
+%         %%%%% % %%% %%% %%%%%%% % %
+%       %       % %     %     % %   %
+%%%%% %%%%% %%% % % % %%% %%%%% % %%%
+%   % % % %   % % % %   % %     %   %
+% %%% % % % %%% %%%%% %%% % %%% %%% %
+%       %     %   %   %     % % %   %
+%%% %%%%%%%%% %%%%%%% %%% %%% % % % %
+%             %       % %   %     % %
+% % %%%%% % %%% % % %%% % %%% %%% % %
+% % %     % % % % %     %   % % % % %
+% % % %%%%%%% % %%%%%%%%% %%% % %%% %
+% % % %     %   %     %     %   %   %
+%%% %%% % %%%%% %%%%% %%% %%% %%%%% %
+%     % %               % %   % % % %
+% % % % %  %  %%% %%% %%% % % % % % %
+% % % % % %%  % % % % %   % % %     %
+% % %%%%%  %  %%% %%% % %%% %%% %%%%%
+%       %  %  % % % % %       % %   %
+% %%% % %  %  %%% %%% %%%%%%%%% % %%%
+%   % %                   %   % %   %
+% %%% %%%%%%%%%%%%%%%%%%%%% % % %%% %
+% %                         %       %
+% % % %%%%% %%% % % % % %%%%%%%%%%%%%
+% % %   %     % % % %       %   % % %
+% % %%% %%% % % % %%%%%%%%% %%% % % %
+% %   % %   % % %P  % %   % % %     %
+% %%% %%% %%% % %%% % % %%%%% % %%%%%
+%       %   %     %       %   % %   %
+%%% % %%%%% %%%%% %%% %%% % %%% % %%%
+% % % % % % % %     % %   % %   % % %
+% % %%% % % % % %%%%%%%%% % % % % % %
+%       %                     %     %
+% %   % %%% %%% %%%%%%% %%% %%% %%% %
+%.%   %       %           %     %  .%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ No newline at end of file
diff --git a/search/layouts/bigMaze.lay b/search/layouts/bigMaze.lay
new file mode 100644
index 0000000..e11fade
--- /dev/null
+++ b/search/layouts/bigMaze.lay
@@ -0,0 +1,37 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%       % % %           %   %     % %
+% %%%%%%% % %%% % %%% %%% %%%%%%% % %
+%       %       % %     %     % %   %
+%%%%% %%%%% %%% % % % %%% %%%%% % %%%
+%   % % % %   % % % %   % %   % %   %
+% %%% % % % %%% %%%%% %%% % %%% %%% %
+%       %     %   %   %     % % %   %
+%%% %%%%%%%%% %%%%%%% %%% %%% % % % %
+%             %       % %   %     % %
+% % %%%%% % %%% % % %%% % %%% %%% % %
+% % %     % % % % %     %   % % % % %
+% % % %%%%%%% % %%%%%%%%% %%% % %%% %
+% % % %     %   %     %     %   %   %
+%%% %%% % %%%%% %%%%% %%% %%% %%%%% %
+%     % % %     % %     % %   % % % %
+% % % % % %%% %%% %%% %%% % % % % % %
+% % % % %                 % % %     %
+%%% %%%%%%% % % %%%%% %%% % %%% %%%%%
+%       % % % %     %   %     % %   %
+%%%%% % % %%%%%%%%% %%%%%%%%%%% % %%%
+%   % %           % %     %   % %   %
+% %%% %%%%% %%%%%%%%% %%%%% % % %%% %
+% %   %      %        %     %       %
+% % % %%%%% %%% % % % % %%%%%%%%%%%%%
+% % %   %     % % % %       %   % % %
+% % %%% %%% % % % %%%%%%%%% %%% % % %
+% %   % %   % % %   % %   % % %     %
+% %%% %%% %%%%% %%% % % %%%%% % %%%%%
+%       %   %     % %     %   % %   %
+%%% % %%%%% %%%%% %%% %%% % %%% % %%%
+% % % % % % % %     % %   % %   % % %
+% % %%% % % % % %%%%%%%%% % % % % % %
+%   %   %   %                 %     %
+% % % % %%% %%% %%%%%%% %%% %%% %%% %
+%.% % %       %   %       %   % %  P%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ No newline at end of file
diff --git a/search/layouts/bigSafeSearch.lay b/search/layouts/bigSafeSearch.lay
new file mode 100644
index 0000000..b5fd414
--- /dev/null
+++ b/search/layouts/bigSafeSearch.lay
@@ -0,0 +1,8 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%.%.........%% G %  o%%%%.....%
+%.%.%%%%%%%.%%%%%% %%%%%%%.%%.%
+%............%...%............%
+%%%%%...%%%..     ..%.%...%.%%%
+%o%%%.%%%%%.%%%%%%%.%%%.%.%%%%%
+%    ..........Po...%...%.   o%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/bigSearch.lay b/search/layouts/bigSearch.lay
new file mode 100644
index 0000000..bb59eb8
--- /dev/null
+++ b/search/layouts/bigSearch.lay
@@ -0,0 +1,15 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%.....%.................%.....%
+%.%%%.%.%%%.%%%%%%%.%%%.%.....%
+%.%...%.%......%......%.%.....%
+%...%%%.%.%%%%.%.%%%%...%%%...%
+%%%.%.%.%.%......%..%.%...%.%%%
+%...%.%%%.%.%%% %%%.%.%%%.%...%
+%.%%%.......%     %.......%%%.%
+%...%.%%%%%.%%%%%%%.%.%%%.%...%
+%%%.%...%.%....%....%.%...%.%%%
+%...%%%.%.%%%%.%.%%%%.%.%%%...%
+%.......%......%......%.....%.%
+%.....%.%%%.%%%%%%%.%%%.%.%%%.%
+%.....%........P....%...%.....%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/boxSearch.lay b/search/layouts/boxSearch.lay
new file mode 100644
index 0000000..4a113fc
--- /dev/null
+++ b/search/layouts/boxSearch.lay
@@ -0,0 +1,14 @@
+%%%%%%%%%%%%%%
+%. . . . . % %
+%          % %
+%. . . . . %G%
+%          % %
+%. . . . . % %
+%          % %
+%. . . . . % %
+%     P    %G%
+%. . . . . % %
+%          % %
+%. . . . . % %
+%          % %
+%%%%%%%%%%%%%%
diff --git a/search/layouts/capsuleClassic.lay b/search/layouts/capsuleClassic.lay
new file mode 100644
index 0000000..06a5c51
--- /dev/null
+++ b/search/layouts/capsuleClassic.lay
@@ -0,0 +1,7 @@
+%%%%%%%%%%%%%%%%%%%
+%G.       G   ....%
+%.% % %%%%%% %.%%.%
+%.%o% %   o% %.o%.%
+%.%%%.%  %%% %..%.%
+%.....  P    %..%G%
+%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/contestClassic.lay b/search/layouts/contestClassic.lay
new file mode 100644
index 0000000..84c8733
--- /dev/null
+++ b/search/layouts/contestClassic.lay
@@ -0,0 +1,9 @@
+%%%%%%%%%%%%%%%%%%%%
+%o...%........%...o%
+%.%%.%.%%..%%.%.%%.%
+%...... G GG%......%
+%.%.%%.%% %%%.%%.%.%
+%.%....% ooo%.%..%.%
+%.%.%%.% %% %.%.%%.%
+%o%......P....%....%
+%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/contoursMaze.lay b/search/layouts/contoursMaze.lay
new file mode 100644
index 0000000..a068956
--- /dev/null
+++ b/search/layouts/contoursMaze.lay
@@ -0,0 +1,11 @@
+%%%%%%%%%%%%%%%%%%%%%
+%                   %
+%                   %
+%                   %
+%                   %
+%         P         %
+%                   %
+%                   %
+%                   %
+%.                  %
+%%%%%%%%%%%%%%%%%%%%%
\ No newline at end of file
diff --git a/search/layouts/greedySearch.lay b/search/layouts/greedySearch.lay
new file mode 100644
index 0000000..4072363
--- /dev/null
+++ b/search/layouts/greedySearch.lay
@@ -0,0 +1,8 @@
+%%%%%%
+%....%
+% %%.%
+% %%.%
+%.P .%
+%.%%%%
+%....%
+%%%%%%
\ No newline at end of file
diff --git a/search/layouts/mediumClassic.lay b/search/layouts/mediumClassic.lay
new file mode 100644
index 0000000..33c5db8
--- /dev/null
+++ b/search/layouts/mediumClassic.lay
@@ -0,0 +1,11 @@
+%%%%%%%%%%%%%%%%%%%%
+%o...%........%....%
+%.%%.%.%%%%%%.%.%%.%
+%.%..............%.%
+%.%.%%.%%  %%.%%.%.%
+%......%G  G%......%
+%.%.%%.%%%%%%.%%.%.%
+%.%..............%.%
+%.%%.%.%%%%%%.%.%%.%
+%....%...P....%...o%
+%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/mediumCorners.lay b/search/layouts/mediumCorners.lay
new file mode 100644
index 0000000..6a39756
--- /dev/null
+++ b/search/layouts/mediumCorners.lay
@@ -0,0 +1,14 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%.      % % %              %.%
+%       % % %%%%%% %%%%%%% % %
+%       %        %     % %   %
+%%%%% %%%%% %%% %% %%%%% % %%%
+%   % % % %   %    %     %   %
+% %%% % % % %%%%%%%% %%% %%% %
+%       %     %%     % % %   %
+%%% % %%%%%%% %%%% %%% % % % %
+% %           %%     %     % %
+% % %%%%% % %%%% % %%% %%% % %
+%   %     %      % %   % %%% %
+%.  %P%%%%%      % %%% %    .%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ No newline at end of file
diff --git a/search/layouts/mediumDottedMaze.lay b/search/layouts/mediumDottedMaze.lay
new file mode 100644
index 0000000..103f818
--- /dev/null
+++ b/search/layouts/mediumDottedMaze.lay
@@ -0,0 +1,18 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                 P%
+% %%%%%%%%%%%%%%%%%%% %%% %%%%%%%% %
+% %%   %   %      %%% %%%   %% ... %
+% %% % % % % %%%% %%%%%%%%% %% %%%%%
+% %% % % % % %    %%     %% %% ... %
+% %% % % % % % %%%%  %%%    %%%%%% %
+% %  % % %   %    %% %%%%%%%%  ... % 
+% %% % % %%%%%%%% %%        %% %%%%%
+% %% %   %%       %%%%%%%%% %% ... %
+%    %%%%%% %%%%%%%      %% %%%%%% %
+%%%%%%      %       %%%% %% %  ... %
+%      %%%%%% %%%%% %    %% %% %%%%%
+% %%%%%%      %       %%%%% %%     %
+%        %%%%%% %%%%%%%%%%% %%  %% %
+%%%%%%%%%%                  %%%%%% %
+%.         %%%%%%%%%%%%%%%% ...... %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ No newline at end of file
diff --git a/search/layouts/mediumMaze.lay b/search/layouts/mediumMaze.lay
new file mode 100644
index 0000000..55c1236
--- /dev/null
+++ b/search/layouts/mediumMaze.lay
@@ -0,0 +1,18 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                 P%
+% %%%%%%%%%%%%%%%%%%%%%%% %%%%%%%% %
+% %%   %   %      %%%%%%%   %%     %
+% %% % % % % %%%% %%%%%%%%% %% %%%%%
+% %% % % % %             %% %%     %
+% %% % % % % % %%%%  %%%    %%%%%% %
+% %  % % %   %    %% %%%%%%%%      % 
+% %% % % %%%%%%%% %%        %% %%%%%
+% %% %   %%       %%%%%%%%% %%     %
+%    %%%%%% %%%%%%%      %% %%%%%% %
+%%%%%%      %       %%%% %% %      %
+%      %%%%%% %%%%% %    %% %% %%%%%
+% %%%%%%      %       %%%%% %%     %
+%        %%%%%% %%%%%%%%%%% %%  %% %
+%%%%%%%%%%                  %%%%%% %
+%.         %%%%%%%%%%%%%%%%        %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ No newline at end of file
diff --git a/search/layouts/mediumSafeSearch.lay b/search/layouts/mediumSafeSearch.lay
new file mode 100644
index 0000000..e7d6b1c
--- /dev/null
+++ b/search/layouts/mediumSafeSearch.lay
@@ -0,0 +1,6 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%.%     ....%% G %%%%%%   o%%.%
+%.%o%%%%%%%.%%%%%%%     %%%%%.%
+% %%%.%%%%%.%%%%%%%.%%%.%.%%%.%
+%    ..........Po...%.........%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/mediumScaryMaze.lay b/search/layouts/mediumScaryMaze.lay
new file mode 100644
index 0000000..65d4c33
--- /dev/null
+++ b/search/layouts/mediumScaryMaze.lay
@@ -0,0 +1,18 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                   P%
+% %%%%%%%%%%%%%%%%%%% %%%  %%%%%%%%  %
+% %%   %   %      %%% %%%    %%GG    %
+% %% % % % % %%%% %%%%%%%%%  %%  %%%%%
+% %% % % % % %    %%GG       %%      %
+% %% % % % % % %%%%%  %%%    %%%%%%  %
+% %% % % %   %    %%  %%%%%%%%%      % 
+% %% % % %%%%%%%% %%         %%  %%%%%
+% %% %   %%       %%%%%%%%%  %%      %
+%    %%% %% %%%%%%%      %%  %%%%%%  %
+%%%%%%      %       %    %%  %%      %
+%      %%%%%% %%   %%    %%  %%  %%%%%
+% %%%%%%      %       %%%%%  %%      %
+%          %%%%       %%%%%  %%%%%%  %
+%%%%%%%%   %                 %%%%%%  %
+%.         %%%%%%%%%%%%%%%%          %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ No newline at end of file
diff --git a/search/layouts/mediumSearch.lay b/search/layouts/mediumSearch.lay
new file mode 100644
index 0000000..2f8af42
--- /dev/null
+++ b/search/layouts/mediumSearch.lay
@@ -0,0 +1,8 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%............%%%%%............%
+%%%.%...%%%.........%.%...%.%%%
+%...%%%.%.%%%%.%.%%%%%%.%%%...%
+%.%.....%......%......%.....%.%
+%.%%%.%%%%%.%%%%%%%.%%%.%.%%%%%
+%.....%........P....%...%.....%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/minimaxClassic.lay b/search/layouts/minimaxClassic.lay
new file mode 100644
index 0000000..a547397
--- /dev/null
+++ b/search/layouts/minimaxClassic.lay
@@ -0,0 +1,5 @@
+%%%%%%%%%
+%.P    G% 
+% %.%G%%%  
+%G    %%% 
+%%%%%%%%%
diff --git a/search/layouts/oddSearch.lay b/search/layouts/oddSearch.lay
new file mode 100644
index 0000000..2ddbc9a
--- /dev/null
+++ b/search/layouts/oddSearch.lay
@@ -0,0 +1,7 @@
+%%%%%%%%%%%%%%%%%%%%
+%...%.........%%...%
+%.%.%.%%%%%%%%%%.%.%
+%..................%
+%%%%%%%%.%.%%%%%%%P%
+%%%%%%%%.......    %
+%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/openClassic.lay b/search/layouts/openClassic.lay
new file mode 100644
index 0000000..6760b42
--- /dev/null
+++ b/search/layouts/openClassic.lay
@@ -0,0 +1,9 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%
+%.. P  ....      ....   %
+%..  ...  ...  ...  ... %
+%..  ...  ...  ...  ... %
+%..    ....      .... G %
+%..  ...  ...  ...  ... %
+%..  ...  ...  ...  ... %
+%..    ....      ....  o%
+%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/openMaze.lay b/search/layouts/openMaze.lay
new file mode 100644
index 0000000..5dee689
--- /dev/null
+++ b/search/layouts/openMaze.lay
@@ -0,0 +1,23 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                  P%
+%            %                      %
+%            %                      %
+%            %                      %
+%            %                      %
+%            %                      %
+%            %      %               %
+%            %      %               %
+%            %      %               %
+%            %      %               %
+%            %      %               %
+%            %      %               %
+%            %      %               %
+%%%%%%%%%%%%%%      %%%%%%%%%%%%%%%%%
+%            %                      %
+%            %                      %
+%            %                      %
+%                                   %
+%                                   %
+%                                   %
+%.                                  %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ No newline at end of file
diff --git a/search/layouts/openSearch.lay b/search/layouts/openSearch.lay
new file mode 100644
index 0000000..f02d21d
--- /dev/null
+++ b/search/layouts/openSearch.lay
@@ -0,0 +1,7 @@
+%%%%%%%%%%%%%%%%%%%%
+%..................%
+%..................%
+%........P.........%
+%..................%
+%..................%
+%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/originalClassic.lay b/search/layouts/originalClassic.lay
new file mode 100644
index 0000000..b2770c5
--- /dev/null
+++ b/search/layouts/originalClassic.lay
@@ -0,0 +1,27 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%............%%............%
+%.%%%%.%%%%%.%%.%%%%%.%%%%.%
+%o%%%%.%%%%%.%%.%%%%%.%%%%o%
+%.%%%%.%%%%%.%%.%%%%%.%%%%.%
+%..........................%
+%.%%%%.%%.%%%%%%%%.%%.%%%%.%
+%.%%%%.%%.%%%%%%%%.%%.%%%%.%
+%......%%....%%....%%......%
+%%%%%%.%%%%% %% %%%%%.%%%%%%
+%%%%%%.%%%%% %% %%%%%.%%%%%%
+%%%%%%.%            %.%%%%%%
+%%%%%%.% %%%%  %%%% %.%%%%%%
+%     .  %G  GG  G%  .     %
+%%%%%%.% %%%%%%%%%% %.%%%%%%
+%%%%%%.%            %.%%%%%%
+%%%%%%.% %%%%%%%%%% %.%%%%%%
+%............%%............%
+%.%%%%.%%%%%.%%.%%%%%.%%%%.%
+%.%%%%.%%%%%.%%.%%%%%.%%%%.%
+%o..%%.......  .......%%..o%
+%%%.%%.%%.%%%%%%%%.%%.%%.%%%
+%%%.%%.%%.%%%%%%%%.%%.%%.%%%
+%......%%....%%....%%......%
+%.%%%%%%%%%%.%%.%%%%%%%%%%.%
+%.............P............%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/powerClassic.lay b/search/layouts/powerClassic.lay
new file mode 100644
index 0000000..3f3d983
--- /dev/null
+++ b/search/layouts/powerClassic.lay
@@ -0,0 +1,7 @@
+%%%%%%%%%%%%%%%%%%%%
+%o....o%GGGG%o....o%
+%..%...%%  %%...%..%
+%.%o.%........%.o%.%
+%.o%.%.%%%%%%.%.%o.%
+%........P.........%
+%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/smallClassic.lay b/search/layouts/smallClassic.lay
new file mode 100644
index 0000000..ce6c1d9
--- /dev/null
+++ b/search/layouts/smallClassic.lay
@@ -0,0 +1,7 @@
+%%%%%%%%%%%%%%%%%%%%
+%......%G  G%......%
+%.%%...%%  %%...%%.%
+%.%o.%........%.o%.%
+%.%%.%.%%%%%%.%.%%.%
+%........P.........%
+%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/smallMaze.lay b/search/layouts/smallMaze.lay
new file mode 100644
index 0000000..72d3ffc
--- /dev/null
+++ b/search/layouts/smallMaze.lay
@@ -0,0 +1,10 @@
+%%%%%%%%%%%%%%%%%%%%%%
+% %%        % %      %
+%    %%%%%% % %%%%%% %
+%%%%%%     P  %      %
+%    % %%%%%% %% %%%%%
+% %%%% %         %   %
+%        %%% %%%   % %
+%%%%%%%%%%    %%%%%% %
+%.         %%        %
+%%%%%%%%%%%%%%%%%%%%%%
\ No newline at end of file
diff --git a/search/layouts/smallSafeSearch.lay b/search/layouts/smallSafeSearch.lay
new file mode 100644
index 0000000..b97feaa
--- /dev/null
+++ b/search/layouts/smallSafeSearch.lay
@@ -0,0 +1,15 @@
+%%%%%%%%%
+%.. % G %
+%%% %%%%%
+%       %
+%%%%%%% %
+%       %
+% %%%%% %
+%     % %
+%%%%% % %
+%     %o%
+% %%%%%%%
+%      .%
+%%%%%%%.%
+%Po    .%
+%%%%%%%%%
diff --git a/search/layouts/smallSearch.lay b/search/layouts/smallSearch.lay
new file mode 100644
index 0000000..c2321d4
--- /dev/null
+++ b/search/layouts/smallSearch.lay
@@ -0,0 +1,5 @@
+%%%%%%%%%%%%%%%%%%%%
+%.           ...P .%
+%.%%.%%.%%.%%.%% %.%
+% %% %.....      %.%
+%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/testClassic.lay b/search/layouts/testClassic.lay
new file mode 100644
index 0000000..4b3ffca
--- /dev/null
+++ b/search/layouts/testClassic.lay
@@ -0,0 +1,10 @@
+%%%%%
+% . %
+%.G.%
+% . %
+%. .%
+%   %
+%  .%
+%   %
+%P .%
+%%%%%
diff --git a/search/layouts/testMaze.lay b/search/layouts/testMaze.lay
new file mode 100644
index 0000000..4d259a4
--- /dev/null
+++ b/search/layouts/testMaze.lay
@@ -0,0 +1,3 @@
+%%%%%%%%%%
+%.      P%
+%%%%%%%%%%
diff --git a/search/layouts/testSearch.lay b/search/layouts/testSearch.lay
new file mode 100644
index 0000000..25bad23
--- /dev/null
+++ b/search/layouts/testSearch.lay
@@ -0,0 +1,5 @@
+%%%%%
+%.P %
+%%% %
+%.  %
+%%%%%
diff --git a/search/layouts/tinyCorners.lay b/search/layouts/tinyCorners.lay
new file mode 100644
index 0000000..526c880
--- /dev/null
+++ b/search/layouts/tinyCorners.lay
@@ -0,0 +1,8 @@
+%%%%%%%%
+%.    .%
+%   P  %
+% %%%% %
+% %    %
+% % %%%%
+%.%   .%
+%%%%%%%%
diff --git a/search/layouts/tinyMaze.lay b/search/layouts/tinyMaze.lay
new file mode 100644
index 0000000..f7035a5
--- /dev/null
+++ b/search/layouts/tinyMaze.lay
@@ -0,0 +1,7 @@
+%%%%%%%
+%    P%
+% %%% %
+%  %  %
+%%   %%
+%. %%%%
+%%%%%%%
diff --git a/search/layouts/tinySafeSearch.lay b/search/layouts/tinySafeSearch.lay
new file mode 100644
index 0000000..fea6860
--- /dev/null
+++ b/search/layouts/tinySafeSearch.lay
@@ -0,0 +1,7 @@
+%%%%%%%%%
+% G %...%
+%%%%%%% %
+%Po     %
+%.%%.%%.%
+%.%%....%
+%%%%%%%%%
diff --git a/search/layouts/tinySearch.lay b/search/layouts/tinySearch.lay
new file mode 100644
index 0000000..c51f4b0
--- /dev/null
+++ b/search/layouts/tinySearch.lay
@@ -0,0 +1,7 @@
+%%%%%%%%%
+%..   ..%
+%%%%.%% %
+%   P   %
+%.%% %%.%
+%.%.   .%
+%%%%%%%%%
diff --git a/search/layouts/trappedClassic.lay b/search/layouts/trappedClassic.lay
new file mode 100644
index 0000000..289557f
--- /dev/null
+++ b/search/layouts/trappedClassic.lay
@@ -0,0 +1,5 @@
+%%%%%%%%
+%   P G%
+%G%%%%%%
+%....  %
+%%%%%%%%
diff --git a/search/layouts/trickyClassic.lay b/search/layouts/trickyClassic.lay
new file mode 100644
index 0000000..ffa156c
--- /dev/null
+++ b/search/layouts/trickyClassic.lay
@@ -0,0 +1,13 @@
+%%%%%%%%%%%%%%%%%%%%
+%o...%........%...o%
+%.%%.%.%%..%%.%.%%.%
+%.%.....%..%.....%.%
+%.%.%%.%%  %%.%%.%.%
+%...... GGGG%.%....%
+%.%....%%%%%%.%..%.%
+%.%....%  oo%.%..%.%
+%.%....% %%%%.%..%.%
+%.%...........%..%.%
+%.%%.%.%%%%%%.%.%%.%
+%o...%...P....%...o%
+%%%%%%%%%%%%%%%%%%%%
diff --git a/search/layouts/trickySearch.lay b/search/layouts/trickySearch.lay
new file mode 100644
index 0000000..4a607e6
--- /dev/null
+++ b/search/layouts/trickySearch.lay
@@ -0,0 +1,7 @@
+%%%%%%%%%%%%%%%%%%%%
+%.           ..%   %
+%.%%.%%.%%.%%.%% % %
+%        P       % %
+%%%%%%%%%%%%%%%%%% %
+%.....             %
+%%%%%%%%%%%%%%%%%%%%
diff --git a/search/pacman.py b/search/pacman.py
new file mode 100644
index 0000000..0a527c2
--- /dev/null
+++ b/search/pacman.py
@@ -0,0 +1,684 @@
+# pacman.py
+# ---------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+"""
+Pacman.py holds the logic for the classic pacman game along with the main
+code to run a game.  This file is divided into three sections:
+
+  (i)  Your interface to the pacman world:
+          Pacman is a complex environment.  You probably don't want to
+          read through all of the code we wrote to make the game runs
+          correctly.  This section contains the parts of the code
+          that you will need to understand in order to complete the
+          project.  There is also some code in game.py that you should
+          understand.
+
+  (ii)  The hidden secrets of pacman:
+          This section contains all of the logic code that the pacman
+          environment uses to decide who can move where, who dies when
+          things collide, etc.  You shouldn't need to read this section
+          of code, but you can if you want.
+
+  (iii) Framework to start a game:
+          The final section contains the code for reading the command
+          you use to set up the game, then starting up a new game, along with
+          linking in all the external parts (agent functions, graphics).
+          Check this section out to see all the options available to you.
+
+To play your first game, type 'python pacman.py' from the command line.
+The keys are 'a', 's', 'd', and 'w' to move (or arrow keys).  Have fun!
+"""
+from game import GameStateData
+from game import Game
+from game import Directions
+from game import Actions
+from util import nearestPoint
+from util import manhattanDistance
+import util, layout
+import sys, types, time, random, os
+
+###################################################
+# YOUR INTERFACE TO THE PACMAN WORLD: A GameState #
+###################################################
+
+class GameState:
+    """
+    A GameState specifies the full game state, including the food, capsules,
+    agent configurations and score changes.
+
+    GameStates are used by the Game object to capture the actual state of the game and
+    can be used by agents to reason about the game.
+
+    Much of the information in a GameState is stored in a GameStateData object.  We
+    strongly suggest that you access that data via the accessor methods below rather
+    than referring to the GameStateData object directly.
+
+    Note that in classic Pacman, Pacman is always agent 0.
+    """
+
+    ####################################################
+    # Accessor methods: use these to access state data #
+    ####################################################
+
+    # static variable keeps track of which states have had getLegalActions called
+    explored = set()
+    def getAndResetExplored():
+        tmp = GameState.explored.copy()
+        GameState.explored = set()
+        return tmp
+    getAndResetExplored = staticmethod(getAndResetExplored)
+
+    def getLegalActions( self, agentIndex=0 ):
+        """
+        Returns the legal actions for the agent specified.
+        """
+#        GameState.explored.add(self)
+        if self.isWin() or self.isLose(): return []
+
+        if agentIndex == 0:  # Pacman is moving
+            return PacmanRules.getLegalActions( self )
+        else:
+            return GhostRules.getLegalActions( self, agentIndex )
+
+    def generateSuccessor( self, agentIndex, action):
+        """
+        Returns the successor state after the specified agent takes the action.
+        """
+        # Check that successors exist
+        if self.isWin() or self.isLose(): raise Exception('Can\'t generate a successor of a terminal state.')
+
+        # Copy current state
+        state = GameState(self)
+
+        # Let agent's logic deal with its action's effects on the board
+        if agentIndex == 0:  # Pacman is moving
+            state.data._eaten = [False for i in range(state.getNumAgents())]
+            PacmanRules.applyAction( state, action )
+        else:                # A ghost is moving
+            GhostRules.applyAction( state, action, agentIndex )
+
+        # Time passes
+        if agentIndex == 0:
+            state.data.scoreChange += -TIME_PENALTY # Penalty for waiting around
+        else:
+            GhostRules.decrementTimer( state.data.agentStates[agentIndex] )
+
+        # Resolve multi-agent effects
+        GhostRules.checkDeath( state, agentIndex )
+
+        # Book keeping
+        state.data._agentMoved = agentIndex
+        state.data.score += state.data.scoreChange
+        GameState.explored.add(self)
+        GameState.explored.add(state)
+        return state
+
+    def getLegalPacmanActions( self ):
+        return self.getLegalActions( 0 )
+
+    def generatePacmanSuccessor( self, action ):
+        """
+        Generates the successor state after the specified pacman move
+        """
+        return self.generateSuccessor( 0, action )
+
+    def getPacmanState( self ):
+        """
+        Returns an AgentState object for pacman (in game.py)
+
+        state.pos gives the current position
+        state.direction gives the travel vector
+        """
+        return self.data.agentStates[0].copy()
+
+    def getPacmanPosition( self ):
+        return self.data.agentStates[0].getPosition()
+
+    def getGhostStates( self ):
+        return self.data.agentStates[1:]
+
+    def getGhostState( self, agentIndex ):
+        if agentIndex == 0 or agentIndex >= self.getNumAgents():
+            raise Exception("Invalid index passed to getGhostState")
+        return self.data.agentStates[agentIndex]
+
+    def getGhostPosition( self, agentIndex ):
+        if agentIndex == 0:
+            raise Exception("Pacman's index passed to getGhostPosition")
+        return self.data.agentStates[agentIndex].getPosition()
+
+    def getGhostPositions(self):
+        return [s.getPosition() for s in self.getGhostStates()]
+
+    def getNumAgents( self ):
+        return len( self.data.agentStates )
+
+    def getScore( self ):
+        return float(self.data.score)
+
+    def getCapsules(self):
+        """
+        Returns a list of positions (x,y) of the remaining capsules.
+        """
+        return self.data.capsules
+
+    def getNumFood( self ):
+        return self.data.food.count()
+
+    def getFood(self):
+        """
+        Returns a Grid of boolean food indicator variables.
+
+        Grids can be accessed via list notation, so to check
+        if there is food at (x,y), just call
+
+        currentFood = state.getFood()
+        if currentFood[x][y] == True: ...
+        """
+        return self.data.food
+
+    def getWalls(self):
+        """
+        Returns a Grid of boolean wall indicator variables.
+
+        Grids can be accessed via list notation, so to check
+        if there is a wall at (x,y), just call
+
+        walls = state.getWalls()
+        if walls[x][y] == True: ...
+        """
+        return self.data.layout.walls
+
+    def hasFood(self, x, y):
+        return self.data.food[x][y]
+
+    def hasWall(self, x, y):
+        return self.data.layout.walls[x][y]
+
+    def isLose( self ):
+        return self.data._lose
+
+    def isWin( self ):
+        return self.data._win
+
+    #############################################
+    #             Helper methods:               #
+    # You shouldn't need to call these directly #
+    #############################################
+
+    def __init__( self, prevState = None ):
+        """
+        Generates a new state by copying information from its predecessor.
+        """
+        if prevState != None: # Initial state
+            self.data = GameStateData(prevState.data)
+        else:
+            self.data = GameStateData()
+
+    def deepCopy( self ):
+        state = GameState( self )
+        state.data = self.data.deepCopy()
+        return state
+
+    def __eq__( self, other ):
+        """
+        Allows two states to be compared.
+        """
+        return hasattr(other, 'data') and self.data == other.data
+
+    def __hash__( self ):
+        """
+        Allows states to be keys of dictionaries.
+        """
+        return hash( self.data )
+
+    def __str__( self ):
+
+        return str(self.data)
+
+    def initialize( self, layout, numGhostAgents=1000 ):
+        """
+        Creates an initial game state from a layout array (see layout.py).
+        """
+        self.data.initialize(layout, numGhostAgents)
+
+############################################################################
+#                     THE HIDDEN SECRETS OF PACMAN                         #
+#                                                                          #
+# You shouldn't need to look through the code in this section of the file. #
+############################################################################
+
+SCARED_TIME = 40    # Moves ghosts are scared
+COLLISION_TOLERANCE = 0.7 # How close ghosts must be to Pacman to kill
+TIME_PENALTY = 1 # Number of points lost each round
+
+class ClassicGameRules:
+    """
+    These game rules manage the control flow of a game, deciding when
+    and how the game starts and ends.
+    """
+    def __init__(self, timeout=30):
+        self.timeout = timeout
+
+    def newGame( self, layout, pacmanAgent, ghostAgents, display, quiet = False, catchExceptions=False):
+        agents = [pacmanAgent] + ghostAgents[:layout.getNumGhosts()]
+        initState = GameState()
+        initState.initialize( layout, len(ghostAgents) )
+        game = Game(agents, display, self, catchExceptions=catchExceptions)
+        game.state = initState
+        self.initialState = initState.deepCopy()
+        self.quiet = quiet
+        return game
+
+    def process(self, state, game):
+        """
+        Checks to see whether it is time to end the game.
+        """
+        if state.isWin(): self.win(state, game)
+        if state.isLose(): self.lose(state, game)
+
+    def win( self, state, game ):
+        if not self.quiet: print("Pacman emerges victorious! Score: %d" % state.data.score)
+        game.gameOver = True
+
+    def lose( self, state, game ):
+        if not self.quiet: print("Pacman died! Score: %d" % state.data.score)
+        game.gameOver = True
+
+    def getProgress(self, game):
+        return float(game.state.getNumFood()) / self.initialState.getNumFood()
+
+    def agentCrash(self, game, agentIndex):
+        if agentIndex == 0:
+            print("Pacman crashed")
+        else:
+            print("A ghost crashed")
+
+    def getMaxTotalTime(self, agentIndex):
+        return self.timeout
+
+    def getMaxStartupTime(self, agentIndex):
+        return self.timeout
+
+    def getMoveWarningTime(self, agentIndex):
+        return self.timeout
+
+    def getMoveTimeout(self, agentIndex):
+        return self.timeout
+
+    def getMaxTimeWarnings(self, agentIndex):
+        return 0
+
+class PacmanRules:
+    """
+    These functions govern how pacman interacts with his environment under
+    the classic game rules.
+    """
+    PACMAN_SPEED=1
+
+    def getLegalActions( state ):
+        """
+        Returns a list of possible actions.
+        """
+        return Actions.getPossibleActions( state.getPacmanState().configuration, state.data.layout.walls )
+    getLegalActions = staticmethod( getLegalActions )
+
+    def applyAction( state, action ):
+        """
+        Edits the state to reflect the results of the action.
+        """
+        legal = PacmanRules.getLegalActions( state )
+        if action not in legal:
+            raise Exception("Illegal action " + str(action))
+
+        pacmanState = state.data.agentStates[0]
+
+        # Update Configuration
+        vector = Actions.directionToVector( action, PacmanRules.PACMAN_SPEED )
+        pacmanState.configuration = pacmanState.configuration.generateSuccessor( vector )
+
+        # Eat
+        next = pacmanState.configuration.getPosition()
+        nearest = nearestPoint( next )
+        if manhattanDistance( nearest, next ) <= 0.5 :
+            # Remove food
+            PacmanRules.consume( nearest, state )
+    applyAction = staticmethod( applyAction )
+
+    def consume( position, state ):
+        x,y = position
+        # Eat food
+        if state.data.food[x][y]:
+            state.data.scoreChange += 10
+            state.data.food = state.data.food.copy()
+            state.data.food[x][y] = False
+            state.data._foodEaten = position
+            # TODO: cache numFood?
+            numFood = state.getNumFood()
+            if numFood == 0 and not state.data._lose:
+                state.data.scoreChange += 500
+                state.data._win = True
+        # Eat capsule
+        if( position in state.getCapsules() ):
+            state.data.capsules.remove( position )
+            state.data._capsuleEaten = position
+            # Reset all ghosts' scared timers
+            for index in range( 1, len( state.data.agentStates ) ):
+                state.data.agentStates[index].scaredTimer = SCARED_TIME
+    consume = staticmethod( consume )
+
+class GhostRules:
+    """
+    These functions dictate how ghosts interact with their environment.
+    """
+    GHOST_SPEED=1.0
+    def getLegalActions( state, ghostIndex ):
+        """
+        Ghosts cannot stop, and cannot turn around unless they
+        reach a dead end, but can turn 90 degrees at intersections.
+        """
+        conf = state.getGhostState( ghostIndex ).configuration
+        possibleActions = Actions.getPossibleActions( conf, state.data.layout.walls )
+        reverse = Actions.reverseDirection( conf.direction )
+        if Directions.STOP in possibleActions:
+            possibleActions.remove( Directions.STOP )
+        if reverse in possibleActions and len( possibleActions ) > 1:
+            possibleActions.remove( reverse )
+        return possibleActions
+    getLegalActions = staticmethod( getLegalActions )
+
+    def applyAction( state, action, ghostIndex):
+
+        legal = GhostRules.getLegalActions( state, ghostIndex )
+        if action not in legal:
+            raise Exception("Illegal ghost action " + str(action))
+
+        ghostState = state.data.agentStates[ghostIndex]
+        speed = GhostRules.GHOST_SPEED
+        if ghostState.scaredTimer > 0: speed /= 2.0
+        vector = Actions.directionToVector( action, speed )
+        ghostState.configuration = ghostState.configuration.generateSuccessor( vector )
+    applyAction = staticmethod( applyAction )
+
+    def decrementTimer( ghostState):
+        timer = ghostState.scaredTimer
+        if timer == 1:
+            ghostState.configuration.pos = nearestPoint( ghostState.configuration.pos )
+        ghostState.scaredTimer = max( 0, timer - 1 )
+    decrementTimer = staticmethod( decrementTimer )
+
+    def checkDeath( state, agentIndex):
+        pacmanPosition = state.getPacmanPosition()
+        if agentIndex == 0: # Pacman just moved; Anyone can kill him
+            for index in range( 1, len( state.data.agentStates ) ):
+                ghostState = state.data.agentStates[index]
+                ghostPosition = ghostState.configuration.getPosition()
+                if GhostRules.canKill( pacmanPosition, ghostPosition ):
+                    GhostRules.collide( state, ghostState, index )
+        else:
+            ghostState = state.data.agentStates[agentIndex]
+            ghostPosition = ghostState.configuration.getPosition()
+            if GhostRules.canKill( pacmanPosition, ghostPosition ):
+                GhostRules.collide( state, ghostState, agentIndex )
+    checkDeath = staticmethod( checkDeath )
+
+    def collide( state, ghostState, agentIndex):
+        if ghostState.scaredTimer > 0:
+            state.data.scoreChange += 200
+            GhostRules.placeGhost(state, ghostState)
+            ghostState.scaredTimer = 0
+            # Added for first-person
+            state.data._eaten[agentIndex] = True
+        else:
+            if not state.data._win:
+                state.data.scoreChange -= 500
+                state.data._lose = True
+    collide = staticmethod( collide )
+
+    def canKill( pacmanPosition, ghostPosition ):
+        return manhattanDistance( ghostPosition, pacmanPosition ) <= COLLISION_TOLERANCE
+    canKill = staticmethod( canKill )
+
+    def placeGhost(state, ghostState):
+        ghostState.configuration = ghostState.start
+    placeGhost = staticmethod( placeGhost )
+
+#############################
+# FRAMEWORK TO START A GAME #
+#############################
+
+def default(str):
+    return str + ' [Default: %default]'
+
+def parseAgentArgs(str):
+    if str == None: return {}
+    pieces = str.split(',')
+    opts = {}
+    for p in pieces:
+        if '=' in p:
+            key, val = p.split('=')
+        else:
+            key,val = p, 1
+        opts[key] = val
+    return opts
+
+def readCommand( argv ):
+    """
+    Processes the command used to run pacman from the command line.
+    """
+    from optparse import OptionParser
+    usageStr = """
+    USAGE:      python pacman.py 
+    EXAMPLES:   (1) python pacman.py
+                    - starts an interactive game
+                (2) python pacman.py --layout smallClassic --zoom 2
+                OR  python pacman.py -l smallClassic -z 2
+                    - starts an interactive game on a smaller board, zoomed in
+    """
+    parser = OptionParser(usageStr)
+
+    parser.add_option('-n', '--numGames', dest='numGames', type='int',
+                      help=default('the number of GAMES to play'), metavar='GAMES', default=1)
+    parser.add_option('-l', '--layout', dest='layout',
+                      help=default('the LAYOUT_FILE from which to load the map layout'),
+                      metavar='LAYOUT_FILE', default='mediumClassic')
+    parser.add_option('-p', '--pacman', dest='pacman',
+                      help=default('the agent TYPE in the pacmanAgents module to use'),
+                      metavar='TYPE', default='KeyboardAgent')
+    parser.add_option('-t', '--textGraphics', action='store_true', dest='textGraphics',
+                      help='Display output as text only', default=False)
+    parser.add_option('-q', '--quietTextGraphics', action='store_true', dest='quietGraphics',
+                      help='Generate minimal output and no graphics', default=False)
+    parser.add_option('-g', '--ghosts', dest='ghost',
+                      help=default('the ghost agent TYPE in the ghostAgents module to use'),
+                      metavar = 'TYPE', default='RandomGhost')
+    parser.add_option('-k', '--numghosts', type='int', dest='numGhosts',
+                      help=default('The maximum number of ghosts to use'), default=4)
+    parser.add_option('-z', '--zoom', type='float', dest='zoom',
+                      help=default('Zoom the size of the graphics window'), default=1.0)
+    parser.add_option('-f', '--fixRandomSeed', action='store_true', dest='fixRandomSeed',
+                      help='Fixes the random seed to always play the same game', default=False)
+    parser.add_option('-r', '--recordActions', action='store_true', dest='record',
+                      help='Writes game histories to a file (named by the time they were played)', default=False)
+    parser.add_option('--replay', dest='gameToReplay',
+                      help='A recorded game file (pickle) to replay', default=None)
+    parser.add_option('-a','--agentArgs',dest='agentArgs',
+                      help='Comma separated values sent to agent. e.g. "opt1=val1,opt2,opt3=val3"')
+    parser.add_option('-x', '--numTraining', dest='numTraining', type='int',
+                      help=default('How many episodes are training (suppresses output)'), default=0)
+    parser.add_option('--frameTime', dest='frameTime', type='float',
+                      help=default('Time to delay between frames; <0 means keyboard'), default=0.1)
+    parser.add_option('-c', '--catchExceptions', action='store_true', dest='catchExceptions',
+                      help='Turns on exception handling and timeouts during games', default=False)
+    parser.add_option('--timeout', dest='timeout', type='int',
+                      help=default('Maximum length of time an agent can spend computing in a single game'), default=30)
+
+    options, otherjunk = parser.parse_args(argv)
+    if len(otherjunk) != 0:
+        raise Exception('Command line input not understood: ' + str(otherjunk))
+    args = dict()
+
+    # Fix the random seed
+    if options.fixRandomSeed: random.seed('cs188')
+
+    # Choose a layout
+    args['layout'] = layout.getLayout( options.layout )
+    if args['layout'] == None: raise Exception("The layout " + options.layout + " cannot be found")
+
+    # Choose a Pacman agent
+    noKeyboard = options.gameToReplay == None and (options.textGraphics or options.quietGraphics)
+    pacmanType = loadAgent(options.pacman, noKeyboard)
+    agentOpts = parseAgentArgs(options.agentArgs)
+    if options.numTraining > 0:
+        args['numTraining'] = options.numTraining
+        if 'numTraining' not in agentOpts: agentOpts['numTraining'] = options.numTraining
+    pacman = pacmanType(**agentOpts) # Instantiate Pacman with agentArgs
+    args['pacman'] = pacman
+
+    # Don't display training games
+    if 'numTrain' in agentOpts:
+        options.numQuiet = int(agentOpts['numTrain'])
+        options.numIgnore = int(agentOpts['numTrain'])
+
+    # Choose a ghost agent
+    ghostType = loadAgent(options.ghost, noKeyboard)
+    args['ghosts'] = [ghostType( i+1 ) for i in range( options.numGhosts )]
+
+    # Choose a display format
+    if options.quietGraphics:
+        import textDisplay
+        args['display'] = textDisplay.NullGraphics()
+    elif options.textGraphics:
+        import textDisplay
+        textDisplay.SLEEP_TIME = options.frameTime
+        args['display'] = textDisplay.PacmanGraphics()
+    else:
+        import graphicsDisplay
+        args['display'] = graphicsDisplay.PacmanGraphics(options.zoom, frameTime = options.frameTime)
+    args['numGames'] = options.numGames
+    args['record'] = options.record
+    args['catchExceptions'] = options.catchExceptions
+    args['timeout'] = options.timeout
+
+    # Special case: recorded games don't use the runGames method or args structure
+    if options.gameToReplay != None:
+        print('Replaying recorded game %s.' % options.gameToReplay)
+        import pickle
+        f = open(options.gameToReplay, 'rb')
+        try: recorded = pickle.load(f)
+        finally: f.close()
+        recorded['display'] = args['display']
+        replayGame(**recorded)
+        sys.exit(0)
+
+    return args
+
+def loadAgent(pacman, nographics):
+    # Looks through all pythonPath Directories for the right module,
+    pythonPathStr = os.path.expandvars("$PYTHONPATH")
+    if pythonPathStr.find(';') == -1:
+        pythonPathDirs = pythonPathStr.split(':')
+    else:
+        pythonPathDirs = pythonPathStr.split(';')
+    pythonPathDirs.append('.')
+
+    for moduleDir in pythonPathDirs:
+        if not os.path.isdir(moduleDir): continue
+        moduleNames = [f for f in os.listdir(moduleDir) if f.endswith('gents.py')]
+        for modulename in moduleNames:
+            try:
+                module = __import__(modulename[:-3])
+            except ImportError:
+                continue
+            if pacman in dir(module):
+                if nographics and modulename == 'keyboardAgents.py':
+                    raise Exception('Using the keyboard requires graphics (not text display)')
+                return getattr(module, pacman)
+    raise Exception('The agent ' + pacman + ' is not specified in any *Agents.py.')
+
+def replayGame( layout, actions, display ):
+    import pacmanAgents, ghostAgents
+    rules = ClassicGameRules()
+    agents = [pacmanAgents.GreedyAgent()] + [ghostAgents.RandomGhost(i+1) for i in range(layout.getNumGhosts())]
+    game = rules.newGame( layout, agents[0], agents[1:], display )
+    state = game.state
+    display.initialize(state.data)
+
+    for action in actions:
+            # Execute the action
+        state = state.generateSuccessor( *action )
+        # Change the display
+        display.update( state.data )
+        # Allow for game specific conditions (winning, losing, etc.)
+        rules.process(state, game)
+
+    display.finish()
+
+def runGames( layout, pacman, ghosts, display, numGames, record, numTraining = 0, catchExceptions=False, timeout=30 ):
+    import __main__
+    __main__.__dict__['_display'] = display
+
+    rules = ClassicGameRules(timeout)
+    games = []
+
+    for i in range( numGames ):
+        beQuiet = i < numTraining
+        if beQuiet:
+                # Suppress output and graphics
+            import textDisplay
+            gameDisplay = textDisplay.NullGraphics()
+            rules.quiet = True
+        else:
+            gameDisplay = display
+            rules.quiet = False
+        game = rules.newGame( layout, pacman, ghosts, gameDisplay, beQuiet, catchExceptions)
+        game.run()
+        if not beQuiet: games.append(game)
+
+        if record:
+            import time, pickle
+            fname = ('recorded-game-%d' % (i + 1)) +  '-'.join([str(t) for t in time.localtime()[1:6]])
+            f = open(fname, 'wb')
+            components = {'layout': layout, 'actions': game.moveHistory}
+            pickle.dump(components, f)
+            f.close()
+
+    if (numGames-numTraining) > 0:
+        scores = [game.state.getScore() for game in games]
+        wins = [game.state.isWin() for game in games]
+        winRate = wins.count(True)/ float(len(wins))
+        print('Average Score:', sum(scores) / float(len(scores)))
+        print('Scores:       ', ', '.join([str(score) for score in scores]))
+        print('Win Rate:      %d/%d (%.2f)' % (wins.count(True), len(wins), winRate))
+        print('Record:       ', ', '.join([ ['Loss', 'Win'][int(w)] for w in wins]))
+
+    return games
+
+if __name__ == '__main__':
+    """
+    The main function called when pacman.py is run
+    from the command line:
+
+    > python pacman.py
+
+    See the usage string for more details.
+
+    > python pacman.py --help
+    """
+    args = readCommand( sys.argv[1:] ) # Get game components based on input
+    runGames( **args )
+
+    # import cProfile
+    # cProfile.run("runGames( **args )")
+    pass
diff --git a/search/pacmanAgents.py b/search/pacmanAgents.py
new file mode 100644
index 0000000..ae97634
--- /dev/null
+++ b/search/pacmanAgents.py
@@ -0,0 +1,52 @@
+# pacmanAgents.py
+# ---------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+from pacman import Directions
+from game import Agent
+import random
+import game
+import util
+
+class LeftTurnAgent(game.Agent):
+    "An agent that turns left at every opportunity"
+
+    def getAction(self, state):
+        legal = state.getLegalPacmanActions()
+        current = state.getPacmanState().configuration.direction
+        if current == Directions.STOP: current = Directions.NORTH
+        left = Directions.LEFT[current]
+        if left in legal: return left
+        if current in legal: return current
+        if Directions.RIGHT[current] in legal: return Directions.RIGHT[current]
+        if Directions.LEFT[left] in legal: return Directions.LEFT[left]
+        return Directions.STOP
+
+class GreedyAgent(Agent):
+    def __init__(self, evalFn="scoreEvaluation"):
+        self.evaluationFunction = util.lookup(evalFn, globals())
+        assert self.evaluationFunction != None
+
+    def getAction(self, state):
+        # Generate candidate actions
+        legal = state.getLegalPacmanActions()
+        if Directions.STOP in legal: legal.remove(Directions.STOP)
+
+        successors = [(state.generateSuccessor(0, action), action) for action in legal]
+        scored = [(self.evaluationFunction(state), action) for state, action in successors]
+        bestScore = max(scored)[0]
+        bestActions = [pair[1] for pair in scored if pair[0] == bestScore]
+        return random.choice(bestActions)
+
+def scoreEvaluation(state):
+    return state.getScore()
diff --git a/search/projectParams.py b/search/projectParams.py
new file mode 100644
index 0000000..dc3e9d1
--- /dev/null
+++ b/search/projectParams.py
@@ -0,0 +1,18 @@
+# projectParams.py
+# ----------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+STUDENT_CODE_DEFAULT = 'searchAgents.py,search.py'
+PROJECT_TEST_CLASSES = 'searchTestClasses.py'
+PROJECT_NAME = 'Project 1: Search'
+BONUS_PIC = False
diff --git a/search/search.py b/search/search.py
new file mode 100644
index 0000000..130013d
--- /dev/null
+++ b/search/search.py
@@ -0,0 +1,119 @@
+# search.py
+# ---------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+"""
+In search.py, you will implement generic search algorithms which are called by
+Pacman agents (in searchAgents.py).
+"""
+
+import util
+
+class SearchProblem:
+    """
+    This class outlines the structure of a search problem, but doesn't implement
+    any of the methods (in object-oriented terminology: an abstract class).
+
+    You do not need to change anything in this class, ever.
+    """
+
+    def getStartState(self):
+        """
+        Returns the start state for the search problem.
+        """
+        util.raiseNotDefined()
+
+    def isGoalState(self, state):
+        """
+          state: Search state
+
+        Returns True if and only if the state is a valid goal state.
+        """
+        util.raiseNotDefined()
+
+    def getSuccessors(self, state):
+        """
+          state: Search state
+
+        For a given state, this should return a list of triples, (successor,
+        action, stepCost), where 'successor' is a successor to the current
+        state, 'action' is the action required to get there, and 'stepCost' is
+        the incremental cost of expanding to that successor.
+        """
+        util.raiseNotDefined()
+
+    def getCostOfActions(self, actions):
+        """
+         actions: A list of actions to take
+
+        This method returns the total cost of a particular sequence of actions.
+        The sequence must be composed of legal moves.
+        """
+        util.raiseNotDefined()
+
+
+def tinyMazeSearch(problem):
+    """
+    Returns a sequence of moves that solves tinyMaze.  For any other maze, the
+    sequence of moves will be incorrect, so only use this for tinyMaze.
+    """
+    from game import Directions
+    s = Directions.SOUTH
+    w = Directions.WEST
+    return  [s, s, w, s, w, w, s, w]
+
+def depthFirstSearch(problem: SearchProblem):
+    """
+    Search the deepest nodes in the search tree first.
+
+    Your search algorithm needs to return a list of actions that reaches the
+    goal. Make sure to implement a graph search algorithm.
+
+    To get started, you might want to try some of these simple commands to
+    understand the search problem that is being passed in:
+
+    print("Start:", problem.getStartState())
+    print("Is the start a goal?", problem.isGoalState(problem.getStartState()))
+    print("Start's successors:", problem.getSuccessors(problem.getStartState()))
+    """
+    "*** YOUR CODE HERE ***"
+    util.raiseNotDefined()
+
+def breadthFirstSearch(problem: SearchProblem):
+    """Search the shallowest nodes in the search tree first."""
+    "*** YOUR CODE HERE ***"
+    util.raiseNotDefined()
+
+def uniformCostSearch(problem: SearchProblem):
+    """Search the node of least total cost first."""
+    "*** YOUR CODE HERE ***"
+    util.raiseNotDefined()
+
+def nullHeuristic(state, problem=None):
+    """
+    A heuristic function estimates the cost from the current state to the nearest
+    goal in the provided SearchProblem.  This heuristic is trivial.
+    """
+    return 0
+
+def aStarSearch(problem: SearchProblem, heuristic=nullHeuristic):
+    """Search the node that has the lowest combined cost and heuristic first."""
+    "*** YOUR CODE HERE ***"
+    util.raiseNotDefined()
+
+
+# Abbreviations
+bfs = breadthFirstSearch
+dfs = depthFirstSearch
+astar = aStarSearch
+ucs = uniformCostSearch
diff --git a/search/searchAgents.py b/search/searchAgents.py
new file mode 100644
index 0000000..7405f98
--- /dev/null
+++ b/search/searchAgents.py
@@ -0,0 +1,543 @@
+# searchAgents.py
+# ---------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+"""
+This file contains all of the agents that can be selected to control Pacman.  To
+select an agent, use the '-p' option when running pacman.py.  Arguments can be
+passed to your agent using '-a'.  For example, to load a SearchAgent that uses
+depth first search (dfs), run the following command:
+
+> python pacman.py -p SearchAgent -a fn=depthFirstSearch
+
+Commands to invoke other search strategies can be found in the project
+description.
+
+Please only change the parts of the file you are asked to.  Look for the lines
+that say
+
+"*** YOUR CODE HERE ***"
+
+The parts you fill in start about 3/4 of the way down.  Follow the project
+description for details.
+
+Good luck and happy searching!
+"""
+
+from typing import List, Tuple, Any
+from game import Directions
+from game import Agent
+from game import Actions
+import util
+import time
+import search
+import pacman
+
+class GoWestAgent(Agent):
+    "An agent that goes West until it can't."
+
+    def getAction(self, state):
+        "The agent receives a GameState (defined in pacman.py)."
+        if Directions.WEST in state.getLegalPacmanActions():
+            return Directions.WEST
+        else:
+            return Directions.STOP
+
+#######################################################
+# This portion is written for you, but will only work #
+#       after you fill in parts of search.py          #
+#######################################################
+
+class SearchAgent(Agent):
+    """
+    This very general search agent finds a path using a supplied search
+    algorithm for a supplied search problem, then returns actions to follow that
+    path.
+
+    As a default, this agent runs DFS on a PositionSearchProblem to find
+    location (1,1)
+
+    Options for fn include:
+      depthFirstSearch or dfs
+      breadthFirstSearch or bfs
+
+
+    Note: You should NOT change any code in SearchAgent
+    """
+
+    def __init__(self, fn='depthFirstSearch', prob='PositionSearchProblem', heuristic='nullHeuristic'):
+        # Warning: some advanced Python magic is employed below to find the right functions and problems
+
+        # Get the search function from the name and heuristic
+        if fn not in dir(search):
+            raise AttributeError(fn + ' is not a search function in search.py.')
+        func = getattr(search, fn)
+        if 'heuristic' not in func.__code__.co_varnames:
+            print('[SearchAgent] using function ' + fn)
+            self.searchFunction = func
+        else:
+            if heuristic in globals().keys():
+                heur = globals()[heuristic]
+            elif heuristic in dir(search):
+                heur = getattr(search, heuristic)
+            else:
+                raise AttributeError(heuristic + ' is not a function in searchAgents.py or search.py.')
+            print('[SearchAgent] using function %s and heuristic %s' % (fn, heuristic))
+            # Note: this bit of Python trickery combines the search algorithm and the heuristic
+            self.searchFunction = lambda x: func(x, heuristic=heur)
+
+        # Get the search problem type from the name
+        if prob not in globals().keys() or not prob.endswith('Problem'):
+            raise AttributeError(prob + ' is not a search problem type in SearchAgents.py.')
+        self.searchType = globals()[prob]
+        print('[SearchAgent] using problem type ' + prob)
+
+    def registerInitialState(self, state):
+        """
+        This is the first time that the agent sees the layout of the game
+        board. Here, we choose a path to the goal. In this phase, the agent
+        should compute the path to the goal and store it in a local variable.
+        All of the work is done in this method!
+
+        state: a GameState object (pacman.py)
+        """
+        if self.searchFunction == None: raise Exception("No search function provided for SearchAgent")
+        starttime = time.time()
+        problem = self.searchType(state) # Makes a new search problem
+        self.actions  = self.searchFunction(problem) # Find a path
+        if self.actions == None:
+            self.actions = []
+        totalCost = problem.getCostOfActions(self.actions)
+        print('Path found with total cost of %d in %.1f seconds' % (totalCost, time.time() - starttime))
+        if '_expanded' in dir(problem): print('Search nodes expanded: %d' % problem._expanded)
+
+    def getAction(self, state):
+        """
+        Returns the next action in the path chosen earlier (in
+        registerInitialState).  Return Directions.STOP if there is no further
+        action to take.
+
+        state: a GameState object (pacman.py)
+        """
+        if 'actionIndex' not in dir(self): self.actionIndex = 0
+        i = self.actionIndex
+        self.actionIndex += 1
+        if i < len(self.actions):
+            return self.actions[i]
+        else:
+            return Directions.STOP
+
+class PositionSearchProblem(search.SearchProblem):
+    """
+    A search problem defines the state space, start state, goal test, successor
+    function and cost function.  This search problem can be used to find paths
+    to a particular point on the pacman board.
+
+    The state space consists of (x,y) positions in a pacman game.
+
+    Note: this search problem is fully specified; you should NOT change it.
+    """
+
+    def __init__(self, gameState, costFn = lambda x: 1, goal=(1,1), start=None, warn=True, visualize=True):
+        """
+        Stores the start and goal.
+
+        gameState: A GameState object (pacman.py)
+        costFn: A function from a search state (tuple) to a non-negative number
+        goal: A position in the gameState
+        """
+        self.walls = gameState.getWalls()
+        self.startState = gameState.getPacmanPosition()
+        if start != None: self.startState = start
+        self.goal = goal
+        self.costFn = costFn
+        self.visualize = visualize
+        if warn and (gameState.getNumFood() != 1 or not gameState.hasFood(*goal)):
+            print('Warning: this does not look like a regular search maze')
+
+        # For display purposes
+        self._visited, self._visitedlist, self._expanded = {}, [], 0 # DO NOT CHANGE
+
+    def getStartState(self):
+        return self.startState
+
+    def isGoalState(self, state):
+        isGoal = state == self.goal
+
+        # For display purposes only
+        if isGoal and self.visualize:
+            self._visitedlist.append(state)
+            import __main__
+            if '_display' in dir(__main__):
+                if 'drawExpandedCells' in dir(__main__._display): #@UndefinedVariable
+                    __main__._display.drawExpandedCells(self._visitedlist) #@UndefinedVariable
+
+        return isGoal
+
+    def getSuccessors(self, state):
+        """
+        Returns successor states, the actions they require, and a cost of 1.
+
+         As noted in search.py:
+             For a given state, this should return a list of triples,
+         (successor, action, stepCost), where 'successor' is a
+         successor to the current state, 'action' is the action
+         required to get there, and 'stepCost' is the incremental
+         cost of expanding to that successor
+        """
+
+        successors = []
+        for action in [Directions.NORTH, Directions.SOUTH, Directions.EAST, Directions.WEST]:
+            x,y = state
+            dx, dy = Actions.directionToVector(action)
+            nextx, nexty = int(x + dx), int(y + dy)
+            if not self.walls[nextx][nexty]:
+                nextState = (nextx, nexty)
+                cost = self.costFn(nextState)
+                successors.append( ( nextState, action, cost) )
+
+        # Bookkeeping for display purposes
+        self._expanded += 1 # DO NOT CHANGE
+        if state not in self._visited:
+            self._visited[state] = True
+            self._visitedlist.append(state)
+
+        return successors
+
+    def getCostOfActions(self, actions):
+        """
+        Returns the cost of a particular sequence of actions. If those actions
+        include an illegal move, return 999999.
+        """
+        if actions == None: return 999999
+        x,y= self.getStartState()
+        cost = 0
+        for action in actions:
+            # Check figure out the next state and see whether its' legal
+            dx, dy = Actions.directionToVector(action)
+            x, y = int(x + dx), int(y + dy)
+            if self.walls[x][y]: return 999999
+            cost += self.costFn((x,y))
+        return cost
+
+class StayEastSearchAgent(SearchAgent):
+    """
+    An agent for position search with a cost function that penalizes being in
+    positions on the West side of the board.
+
+    The cost function for stepping into a position (x,y) is 1/2^x.
+    """
+    def __init__(self):
+        self.searchFunction = search.uniformCostSearch
+        costFn = lambda pos: .5 ** pos[0]
+        self.searchType = lambda state: PositionSearchProblem(state, costFn, (1, 1), None, False)
+
+class StayWestSearchAgent(SearchAgent):
+    """
+    An agent for position search with a cost function that penalizes being in
+    positions on the East side of the board.
+
+    The cost function for stepping into a position (x,y) is 2^x.
+    """
+    def __init__(self):
+        self.searchFunction = search.uniformCostSearch
+        costFn = lambda pos: 2 ** pos[0]
+        self.searchType = lambda state: PositionSearchProblem(state, costFn)
+
+def manhattanHeuristic(position, problem, info={}):
+    "The Manhattan distance heuristic for a PositionSearchProblem"
+    xy1 = position
+    xy2 = problem.goal
+    return abs(xy1[0] - xy2[0]) + abs(xy1[1] - xy2[1])
+
+def euclideanHeuristic(position, problem, info={}):
+    "The Euclidean distance heuristic for a PositionSearchProblem"
+    xy1 = position
+    xy2 = problem.goal
+    return ( (xy1[0] - xy2[0]) ** 2 + (xy1[1] - xy2[1]) ** 2 ) ** 0.5
+
+#####################################################
+# This portion is incomplete.  Time to write code!  #
+#####################################################
+
+class CornersProblem(search.SearchProblem):
+    """
+    This search problem finds paths through all four corners of a layout.
+
+    You must select a suitable state space and successor function
+    """
+
+    def __init__(self, startingGameState: pacman.GameState):
+        """
+        Stores the walls, pacman's starting position and corners.
+        """
+        self.walls = startingGameState.getWalls()
+        self.startingPosition = startingGameState.getPacmanPosition()
+        top, right = self.walls.height-2, self.walls.width-2
+        self.corners = ((1,1), (1,top), (right, 1), (right, top))
+        for corner in self.corners:
+            if not startingGameState.hasFood(*corner):
+                print('Warning: no food in corner ' + str(corner))
+        self._expanded = 0 # DO NOT CHANGE; Number of search nodes expanded
+
+    def getStartState(self):
+        """
+        Returns the start state (in your state space, not the full Pacman state
+        space)
+        """
+        "*** YOUR CODE HERE ***"
+        util.raiseNotDefined()
+
+    def isGoalState(self, state: Any):
+        """
+        Returns whether this search state is a goal state of the problem.
+        """
+        "*** YOUR CODE HERE ***"
+        util.raiseNotDefined()
+
+    def getSuccessors(self, state: Any):
+        """
+        Returns successor states, the actions they require, and a cost of 1.
+
+         As noted in search.py:
+            For a given state, this should return a list of triples, (successor,
+            action, stepCost), where 'successor' is a successor to the current
+            state, 'action' is the action required to get there, and 'stepCost'
+            is the incremental cost of expanding to that successor
+        """
+
+        successors = []
+        for action in [Directions.NORTH, Directions.SOUTH, Directions.EAST, Directions.WEST]:
+            # Add a successor state to the successor list if the action is legal
+            # Here's a code snippet for figuring out whether a new position hits a wall:
+            #   x,y = currentPosition
+            #   dx, dy = Actions.directionToVector(action)
+            #   nextx, nexty = int(x + dx), int(y + dy)
+            #   hitsWall = self.walls[nextx][nexty]
+
+            "*** YOUR CODE HERE ***"
+
+        self._expanded += 1 # DO NOT CHANGE
+        return successors
+
+    def getCostOfActions(self, actions):
+        """
+        Returns the cost of a particular sequence of actions.  If those actions
+        include an illegal move, return 999999.  This is implemented for you.
+        """
+        if actions == None: return 999999
+        x,y= self.startingPosition
+        for action in actions:
+            dx, dy = Actions.directionToVector(action)
+            x, y = int(x + dx), int(y + dy)
+            if self.walls[x][y]: return 999999
+        return len(actions)
+
+
+def cornersHeuristic(state: Any, problem: CornersProblem):
+    """
+    A heuristic for the CornersProblem that you defined.
+
+      state:   The current search state
+               (a data structure you chose in your search problem)
+
+      problem: The CornersProblem instance for this layout.
+
+    This function should always return a number that is a lower bound on the
+    shortest path from the state to a goal of the problem; i.e.  it should be
+    admissible (as well as consistent).
+    """
+    corners = problem.corners # These are the corner coordinates
+    walls = problem.walls # These are the walls of the maze, as a Grid (game.py)
+
+    "*** YOUR CODE HERE ***"
+    return 0 # Default to trivial solution
+
+class AStarCornersAgent(SearchAgent):
+    "A SearchAgent for FoodSearchProblem using A* and your foodHeuristic"
+    def __init__(self):
+        self.searchFunction = lambda prob: search.aStarSearch(prob, cornersHeuristic)
+        self.searchType = CornersProblem
+
+class FoodSearchProblem:
+    """
+    A search problem associated with finding the a path that collects all of the
+    food (dots) in a Pacman game.
+
+    A search state in this problem is a tuple ( pacmanPosition, foodGrid ) where
+      pacmanPosition: a tuple (x,y) of integers specifying Pacman's position
+      foodGrid:       a Grid (see game.py) of either True or False, specifying remaining food
+    """
+    def __init__(self, startingGameState: pacman.GameState):
+        self.start = (startingGameState.getPacmanPosition(), startingGameState.getFood())
+        self.walls = startingGameState.getWalls()
+        self.startingGameState = startingGameState
+        self._expanded = 0 # DO NOT CHANGE
+        self.heuristicInfo = {} # A dictionary for the heuristic to store information
+
+    def getStartState(self):
+        return self.start
+
+    def isGoalState(self, state):
+        return state[1].count() == 0
+
+    def getSuccessors(self, state):
+        "Returns successor states, the actions they require, and a cost of 1."
+        successors = []
+        self._expanded += 1 # DO NOT CHANGE
+        for direction in [Directions.NORTH, Directions.SOUTH, Directions.EAST, Directions.WEST]:
+            x,y = state[0]
+            dx, dy = Actions.directionToVector(direction)
+            nextx, nexty = int(x + dx), int(y + dy)
+            if not self.walls[nextx][nexty]:
+                nextFood = state[1].copy()
+                nextFood[nextx][nexty] = False
+                successors.append( ( ((nextx, nexty), nextFood), direction, 1) )
+        return successors
+
+    def getCostOfActions(self, actions):
+        """Returns the cost of a particular sequence of actions.  If those actions
+        include an illegal move, return 999999"""
+        x,y= self.getStartState()[0]
+        cost = 0
+        for action in actions:
+            # figure out the next state and see whether it's legal
+            dx, dy = Actions.directionToVector(action)
+            x, y = int(x + dx), int(y + dy)
+            if self.walls[x][y]:
+                return 999999
+            cost += 1
+        return cost
+
+class AStarFoodSearchAgent(SearchAgent):
+    "A SearchAgent for FoodSearchProblem using A* and your foodHeuristic"
+    def __init__(self):
+        self.searchFunction = lambda prob: search.aStarSearch(prob, foodHeuristic)
+        self.searchType = FoodSearchProblem
+
+def foodHeuristic(state: Tuple[Tuple, List[List]], problem: FoodSearchProblem):
+    """
+    Your heuristic for the FoodSearchProblem goes here.
+
+    This heuristic must be consistent to ensure correctness.  First, try to come
+    up with an admissible heuristic; almost all admissible heuristics will be
+    consistent as well.
+
+    If using A* ever finds a solution that is worse uniform cost search finds,
+    your heuristic is *not* consistent, and probably not admissible!  On the
+    other hand, inadmissible or inconsistent heuristics may find optimal
+    solutions, so be careful.
+
+    The state is a tuple ( pacmanPosition, foodGrid ) where foodGrid is a Grid
+    (see game.py) of either True or False. You can call foodGrid.asList() to get
+    a list of food coordinates instead.
+
+    If you want access to info like walls, capsules, etc., you can query the
+    problem.  For example, problem.walls gives you a Grid of where the walls
+    are.
+
+    If you want to *store* information to be reused in other calls to the
+    heuristic, there is a dictionary called problem.heuristicInfo that you can
+    use. For example, if you only want to count the walls once and store that
+    value, try: problem.heuristicInfo['wallCount'] = problem.walls.count()
+    Subsequent calls to this heuristic can access
+    problem.heuristicInfo['wallCount']
+    """
+    position, foodGrid = state
+    "*** YOUR CODE HERE ***"
+    return 0
+
+class ClosestDotSearchAgent(SearchAgent):
+    "Search for all food using a sequence of searches"
+    def registerInitialState(self, state):
+        self.actions = []
+        currentState = state
+        while(currentState.getFood().count() > 0):
+            nextPathSegment = self.findPathToClosestDot(currentState) # The missing piece
+            self.actions += nextPathSegment
+            for action in nextPathSegment:
+                legal = currentState.getLegalActions()
+                if action not in legal:
+                    t = (str(action), str(currentState))
+                    raise Exception('findPathToClosestDot returned an illegal move: %s!\n%s' % t)
+                currentState = currentState.generateSuccessor(0, action)
+        self.actionIndex = 0
+        print('Path found with cost %d.' % len(self.actions))
+
+    def findPathToClosestDot(self, gameState: pacman.GameState):
+        """
+        Returns a path (a list of actions) to the closest dot, starting from
+        gameState.
+        """
+        # Here are some useful elements of the startState
+        startPosition = gameState.getPacmanPosition()
+        food = gameState.getFood()
+        walls = gameState.getWalls()
+        problem = AnyFoodSearchProblem(gameState)
+
+        "*** YOUR CODE HERE ***"
+        util.raiseNotDefined()
+
+class AnyFoodSearchProblem(PositionSearchProblem):
+    """
+    A search problem for finding a path to any food.
+
+    This search problem is just like the PositionSearchProblem, but has a
+    different goal test, which you need to fill in below.  The state space and
+    successor function do not need to be changed.
+
+    The class definition above, AnyFoodSearchProblem(PositionSearchProblem),
+    inherits the methods of the PositionSearchProblem.
+
+    You can use this search problem to help you fill in the findPathToClosestDot
+    method.
+    """
+
+    def __init__(self, gameState):
+        "Stores information from the gameState.  You don't need to change this."
+        # Store the food for later reference
+        self.food = gameState.getFood()
+
+        # Store info for the PositionSearchProblem (no need to change this)
+        self.walls = gameState.getWalls()
+        self.startState = gameState.getPacmanPosition()
+        self.costFn = lambda x: 1
+        self._visited, self._visitedlist, self._expanded = {}, [], 0 # DO NOT CHANGE
+
+    def isGoalState(self, state: Tuple[int, int]):
+        """
+        The state is Pacman's position. Fill this in with a goal test that will
+        complete the problem definition.
+        """
+        x,y = state
+
+        "*** YOUR CODE HERE ***"
+        util.raiseNotDefined()
+
+def mazeDistance(point1: Tuple[int, int], point2: Tuple[int, int], gameState: pacman.GameState) -> int:
+    """
+    Returns the maze distance between any two points, using the search functions
+    you have already built. The gameState can be any game state -- Pacman's
+    position in that state is ignored.
+
+    Example usage: mazeDistance( (2,4), (5,6), gameState)
+
+    This might be a useful helper function for your ApproximateSearchAgent.
+    """
+    x1, y1 = point1
+    x2, y2 = point2
+    walls = gameState.getWalls()
+    assert not walls[x1][y1], 'point1 is a wall: ' + str(point1)
+    assert not walls[x2][y2], 'point2 is a wall: ' + str(point2)
+    prob = PositionSearchProblem(gameState, start=point1, goal=point2, warn=False, visualize=False)
+    return len(search.bfs(prob))
diff --git a/search/searchTestClasses.py b/search/searchTestClasses.py
new file mode 100644
index 0000000..f2a01af
--- /dev/null
+++ b/search/searchTestClasses.py
@@ -0,0 +1,823 @@
+# searchTestClasses.py
+# --------------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+import sys
+import re
+import testClasses
+import textwrap
+
+# import project specific code
+import layout
+import pacman
+from search import SearchProblem
+
+# helper function for printing solutions in solution files
+def wrap_solution(solution):
+    if type(solution) == type([]):
+        return '\n'.join(textwrap.wrap(' '.join(solution)))
+    else:
+        return str(solution)
+
+
+
+
+def followAction(state, action, problem):
+  for successor1, action1, cost1 in problem.getSuccessors(state):
+    if action == action1: return successor1
+  return None
+
+def followPath(path, problem):
+  state = problem.getStartState()
+  states = [state]
+  for action in path:
+    state = followAction(state, action, problem)
+    states.append(state)
+  return states
+
+def checkSolution(problem, path):
+  state = problem.getStartState()
+  for action in path:
+    state = followAction(state, action, problem)
+  return problem.isGoalState(state)
+
+# Search problem on a plain graph
+class GraphSearch(SearchProblem):
+
+    # Read in the state graph; define start/end states, edges and costs
+    def __init__(self, graph_text):
+        self.expanded_states = []
+        lines = graph_text.split('\n')
+        r = re.match('start_state:(.*)', lines[0])
+        if r == None:
+            print("Broken graph:")
+            print('"""%s"""' % graph_text)
+            raise Exception("GraphSearch graph specification start_state not found or incorrect on line 0")
+        self.start_state = r.group(1).strip()
+        r = re.match('goal_states:(.*)', lines[1])
+        if r == None:
+            print("Broken graph:")
+            print('"""%s"""' % graph_text)
+            raise Exception("GraphSearch graph specification goal_states not found or incorrect on line 1")
+        goals = r.group(1).split()
+        self.goals = [str.strip(g) for g in goals]
+        self.successors = {}
+        all_states = set()
+        self.orderedSuccessorTuples = []
+        for l in lines[2:]:
+            if len(l.split()) == 3:
+                start, action, next_state = l.split()
+                cost = 1
+            elif len(l.split()) == 4:
+                start, action, next_state, cost = l.split()
+            else:
+                print("Broken graph:")
+                print('"""%s"""' % graph_text)
+                raise Exception("Invalid line in GraphSearch graph specification on line:" + l)
+            cost = float(cost)
+            self.orderedSuccessorTuples.append((start, action, next_state, cost))
+            all_states.add(start)
+            all_states.add(next_state)
+            if start not in self.successors:
+                self.successors[start] = []
+            self.successors[start].append((next_state, action, cost))
+        for s in all_states:
+            if s not in self.successors:
+                self.successors[s] = []
+
+    # Get start state
+    def getStartState(self):
+        return self.start_state
+
+    # Check if a state is a goal state
+    def isGoalState(self, state):
+        return state in self.goals
+
+    # Get all successors of a state
+    def getSuccessors(self, state):
+        self.expanded_states.append(state)
+        return list(self.successors[state])
+
+    # Calculate total cost of a sequence of actions
+    def getCostOfActions(self, actions):
+        total_cost = 0
+        state = self.start_state
+        for a in actions:
+            successors = self.successors[state]
+            match = False
+            for (next_state, action, cost) in successors:
+                if a == action:
+                    state = next_state
+                    total_cost += cost
+                    match = True
+            if not match:
+                print('invalid action sequence')
+                sys.exit(1)
+        return total_cost
+
+    # Return a list of all states on which 'getSuccessors' was called
+    def getExpandedStates(self):
+        return self.expanded_states
+
+    def __str__(self):
+        print(self.successors)
+        edges = ["%s %s %s %s" % t for t in self.orderedSuccessorTuples]
+        return \
+"""start_state: %s
+goal_states: %s
+%s""" % (self.start_state, " ".join(self.goals), "\n".join(edges))
+
+
+
+def parseHeuristic(heuristicText):
+    heuristic = {}
+    for line in heuristicText.split('\n'):
+        tokens = line.split()
+        if len(tokens) != 2:
+            print("Broken heuristic:")
+            print('"""%s"""' % heuristicText)
+            raise Exception("GraphSearch heuristic specification broken at tokens:" + str(tokens))
+        state, h = tokens
+        heuristic[state] = float(h)
+
+    def graphHeuristic(state, problem=None):
+        if state in heuristic:
+            return heuristic[state]
+        else:
+            import pprint
+            pp = pprint.PrettyPrinter(indent=4)
+            print("Heuristic:")
+            pp.pprint(heuristic)
+            raise Exception("Graph heuristic called with invalid state: " + str(state))
+
+    return graphHeuristic
+
+
+class GraphSearchTest(testClasses.TestCase):
+
+    def __init__(self, question, testDict):
+        super(GraphSearchTest, self).__init__(question, testDict)
+        self.graph_text = testDict['graph']
+        self.alg = testDict['algorithm']
+        self.diagram = testDict['diagram']
+        self.exactExpansionOrder = testDict.get('exactExpansionOrder', 'True').lower() == "true"
+        if 'heuristic' in testDict:
+            self.heuristic = parseHeuristic(testDict['heuristic'])
+        else:
+            self.heuristic = None
+
+    # Note that the return type of this function is a tripple:
+    # (solution, expanded states, error message)
+    def getSolInfo(self, search):
+        alg = getattr(search, self.alg)
+        problem = GraphSearch(self.graph_text)
+        if self.heuristic != None:
+            solution = alg(problem, self.heuristic)
+        else:
+            solution = alg(problem)
+
+        if type(solution) != type([]):
+            return None, None, 'The result of %s must be a list. (Instead, it is %s)' % (self.alg, type(solution))
+
+        return solution, problem.getExpandedStates(), None
+
+    # Run student code.  If an error message is returned, print error and return false.
+    # If a good solution is returned, printn the solution and return true; otherwise,
+    # print both the correct and student's solution and return false.
+    def execute(self, grades, moduleDict, solutionDict):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        gold_solution = [str.split(solutionDict['solution']), str.split(solutionDict['rev_solution'])]
+        gold_expanded_states = [str.split(solutionDict['expanded_states']), str.split(solutionDict['rev_expanded_states'])]
+
+        solution, expanded_states, error = self.getSolInfo(search)
+        if error != None:
+            grades.addMessage('FAIL: %s' % self.path)
+            grades.addMessage('\t%s' % error)
+            return False
+
+        if solution in gold_solution and (not self.exactExpansionOrder or expanded_states in gold_expanded_states):
+            grades.addMessage('PASS: %s' % self.path)
+            grades.addMessage('\tsolution:\t\t%s' % solution)
+            grades.addMessage('\texpanded_states:\t%s' % expanded_states)
+            return True
+        else:
+            grades.addMessage('FAIL: %s' % self.path)
+            grades.addMessage('\tgraph:')
+            for line in self.diagram.split('\n'):
+                grades.addMessage('\t    %s' % (line,))
+            grades.addMessage('\tstudent solution:\t\t%s' % solution)
+            grades.addMessage('\tstudent expanded_states:\t%s' % expanded_states)
+            grades.addMessage('')
+            grades.addMessage('\tcorrect solution:\t\t%s' % gold_solution[0])
+            grades.addMessage('\tcorrect expanded_states:\t%s' % gold_expanded_states[0])
+            grades.addMessage('\tcorrect rev_solution:\t\t%s' % gold_solution[1])
+            grades.addMessage('\tcorrect rev_expanded_states:\t%s' % gold_expanded_states[1])
+            return False
+
+    def writeSolution(self, moduleDict, filePath):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        # open file and write comments
+        handle = open(filePath, 'w')
+        handle.write('# This is the solution file for %s.\n' % self.path)
+        handle.write('# This solution is designed to support both right-to-left\n')
+        handle.write('# and left-to-right implementations.\n')
+
+        # write forward solution
+        solution, expanded_states, error = self.getSolInfo(search)
+        if error != None: raise Exception("Error in solution code: %s" % error)
+        handle.write('solution: "%s"\n' % ' '.join(solution))
+        handle.write('expanded_states: "%s"\n' % ' '.join(expanded_states))
+
+        # reverse and write backwards solution
+        search.REVERSE_PUSH = not search.REVERSE_PUSH
+        solution, expanded_states, error = self.getSolInfo(search)
+        if error != None: raise Exception("Error in solution code: %s" % error)
+        handle.write('rev_solution: "%s"\n' % ' '.join(solution))
+        handle.write('rev_expanded_states: "%s"\n' % ' '.join(expanded_states))
+
+        # clean up
+        search.REVERSE_PUSH = not search.REVERSE_PUSH
+        handle.close()
+        return True
+
+
+
+class PacmanSearchTest(testClasses.TestCase):
+
+    def __init__(self, question, testDict):
+        super(PacmanSearchTest, self).__init__(question, testDict)
+        self.layout_text = testDict['layout']
+        self.alg = testDict['algorithm']
+        self.layoutName = testDict['layoutName']
+
+        # TODO: sensible to have defaults like this?
+        self.leewayFactor = float(testDict.get('leewayFactor', '1'))
+        self.costFn = eval(testDict.get('costFn', 'None'))
+        self.searchProblemClassName = testDict.get('searchProblemClass', 'PositionSearchProblem')
+        self.heuristicName = testDict.get('heuristic', None)
+
+
+    def getSolInfo(self, search, searchAgents):
+        alg = getattr(search, self.alg)
+        lay = layout.Layout([l.strip() for l in self.layout_text.split('\n')])
+        start_state = pacman.GameState()
+        start_state.initialize(lay, 0)
+
+        problemClass = getattr(searchAgents, self.searchProblemClassName)
+        problemOptions = {}
+        if self.costFn != None:
+            problemOptions['costFn'] = self.costFn
+        problem = problemClass(start_state, **problemOptions)
+        heuristic = getattr(searchAgents, self.heuristicName) if self.heuristicName != None else None
+
+        if heuristic != None:
+            solution = alg(problem, heuristic)
+        else:
+            solution = alg(problem)
+
+        if type(solution) != type([]):
+            return None, None, 'The result of %s must be a list. (Instead, it is %s)' % (self.alg, type(solution))
+
+        from game import Directions
+        dirs = Directions.LEFT.keys()
+        if [el in dirs for el in solution].count(False) != 0:
+            return None, None, 'Output of %s must be a list of actions from game.Directions' % self.alg
+
+        expanded = problem._expanded
+        return solution, expanded, None
+
+    def execute(self, grades, moduleDict, solutionDict):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        gold_solution = [str.split(solutionDict['solution']), str.split(solutionDict['rev_solution'])]
+        gold_expanded = max(int(solutionDict['expanded_nodes']), int(solutionDict['rev_expanded_nodes']))
+
+        solution, expanded, error = self.getSolInfo(search, searchAgents)
+        if error != None:
+            grades.addMessage('FAIL: %s' % self.path)
+            grades.addMessage('%s' % error)
+            return False
+
+        # FIXME: do we want to standardize test output format?
+
+        if solution not in gold_solution:
+            grades.addMessage('FAIL: %s' % self.path)
+            grades.addMessage('Solution not correct.')
+            grades.addMessage('\tstudent solution length: %s' % len(solution))
+            grades.addMessage('\tstudent solution:\n%s' % wrap_solution(solution))
+            grades.addMessage('')
+            grades.addMessage('\tcorrect solution length: %s' % len(gold_solution[0]))
+            grades.addMessage('\tcorrect (reversed) solution length: %s' % len(gold_solution[1]))
+            grades.addMessage('\tcorrect solution:\n%s' % wrap_solution(gold_solution[0]))
+            grades.addMessage('\tcorrect (reversed) solution:\n%s' % wrap_solution(gold_solution[1]))
+            return False
+
+        if expanded > self.leewayFactor * gold_expanded and expanded > gold_expanded + 1:
+            grades.addMessage('FAIL: %s' % self.path)
+            grades.addMessage('Too many node expanded; are you expanding nodes twice?')
+            grades.addMessage('\tstudent nodes expanded: %s' % expanded)
+            grades.addMessage('')
+            grades.addMessage('\tcorrect nodes expanded: %s (leewayFactor %s)' % (gold_expanded, self.leewayFactor))
+            return False
+
+        grades.addMessage('PASS: %s' % self.path)
+        grades.addMessage('\tpacman layout:\t\t%s' % self.layoutName)
+        grades.addMessage('\tsolution length: %s' % len(solution))
+        grades.addMessage('\tnodes expanded:\t\t%s' % expanded)
+        return True
+
+
+    def writeSolution(self, moduleDict, filePath):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        # open file and write comments
+        handle = open(filePath, 'w')
+        handle.write('# This is the solution file for %s.\n' % self.path)
+        handle.write('# This solution is designed to support both right-to-left\n')
+        handle.write('# and left-to-right implementations.\n')
+        handle.write('# Number of nodes expanded must be with a factor of %s of the numbers below.\n' % self.leewayFactor)
+
+        # write forward solution
+        solution, expanded, error = self.getSolInfo(search, searchAgents)
+        if error != None: raise Exception("Error in solution code: %s" % error)
+        handle.write('solution: """\n%s\n"""\n' % wrap_solution(solution))
+        handle.write('expanded_nodes: "%s"\n' % expanded)
+
+        # write backward solution
+        search.REVERSE_PUSH = not search.REVERSE_PUSH
+        solution, expanded, error = self.getSolInfo(search, searchAgents)
+        if error != None: raise Exception("Error in solution code: %s" % error)
+        handle.write('rev_solution: """\n%s\n"""\n' % wrap_solution(solution))
+        handle.write('rev_expanded_nodes: "%s"\n' % expanded)
+
+        # clean up
+        search.REVERSE_PUSH = not search.REVERSE_PUSH
+        handle.close()
+        return True
+
+
+from game import Actions
+def getStatesFromPath(start, path):
+    "Returns the list of states visited along the path"
+    vis = [start]
+    curr = start
+    for a in path:
+        x,y = curr
+        dx, dy = Actions.directionToVector(a)
+        curr = (int(x + dx), int(y + dy))
+        vis.append(curr)
+    return vis
+
+class CornerProblemTest(testClasses.TestCase):
+
+    def __init__(self, question, testDict):
+        super(CornerProblemTest, self).__init__(question, testDict)
+        self.layoutText = testDict['layout']
+        self.layoutName = testDict['layoutName']
+
+    def solution(self, search, searchAgents):
+        lay = layout.Layout([l.strip() for l in self.layoutText.split('\n')])
+        gameState = pacman.GameState()
+        gameState.initialize(lay, 0)
+        problem = searchAgents.CornersProblem(gameState)
+        path = search.bfs(problem)
+
+        gameState = pacman.GameState()
+        gameState.initialize(lay, 0)
+        visited = getStatesFromPath(gameState.getPacmanPosition(), path)
+        top, right = gameState.getWalls().height-2, gameState.getWalls().width-2
+        missedCorners = [p for p in ((1,1), (1,top), (right, 1), (right, top)) if p not in visited]
+
+        return path, missedCorners
+
+    def execute(self, grades, moduleDict, solutionDict):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        gold_length = int(solutionDict['solution_length'])
+        solution, missedCorners = self.solution(search, searchAgents)
+
+        if type(solution) != type([]):
+            grades.addMessage('FAIL: %s' % self.path)
+            grades.addMessage('The result must be a list. (Instead, it is %s)' % type(solution))
+            return False
+
+        if len(missedCorners) != 0:
+            grades.addMessage('FAIL: %s' % self.path)
+            grades.addMessage('Corners missed: %s' % missedCorners)
+            return False
+
+        if len(solution) != gold_length:
+            grades.addMessage('FAIL: %s' % self.path)
+            grades.addMessage('Optimal solution not found.')
+            grades.addMessage('\tstudent solution length:\n%s' % len(solution))
+            grades.addMessage('')
+            grades.addMessage('\tcorrect solution length:\n%s' % gold_length)
+            return False
+
+        grades.addMessage('PASS: %s' % self.path)
+        grades.addMessage('\tpacman layout:\t\t%s' % self.layoutName)
+        grades.addMessage('\tsolution length:\t\t%s' % len(solution))
+        return True
+
+    def writeSolution(self, moduleDict, filePath):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        # open file and write comments
+        handle = open(filePath, 'w')
+        handle.write('# This is the solution file for %s.\n' % self.path)
+
+        print("Solving problem", self.layoutName)
+        print(self.layoutText)
+
+        path, _ = self.solution(search, searchAgents)
+        length = len(path)
+        print("Problem solved")
+
+        handle.write('solution_length: "%s"\n' % length)
+        handle.close()
+
+
+
+
+# template = """class: "HeuristicTest"
+#
+# heuristic: "foodHeuristic"
+# searchProblemClass: "FoodSearchProblem"
+# layoutName: "Test %s"
+# layout: \"\"\"
+# %s
+# \"\"\"
+# """
+#
+# for i, (_, _, l) in enumerate(doneTests + foodTests):
+#     f = open("food_heuristic_%s.test" % (i+1), "w")
+#     f.write(template % (i+1, "\n".join(l)))
+#     f.close()
+
+class HeuristicTest(testClasses.TestCase):
+
+    def __init__(self, question, testDict):
+        super(HeuristicTest, self).__init__(question, testDict)
+        self.layoutText = testDict['layout']
+        self.layoutName = testDict['layoutName']
+        self.searchProblemClassName = testDict['searchProblemClass']
+        self.heuristicName = testDict['heuristic']
+
+    def setupProblem(self, searchAgents):
+        lay = layout.Layout([l.strip() for l in self.layoutText.split('\n')])
+        gameState = pacman.GameState()
+        gameState.initialize(lay, 0)
+        problemClass = getattr(searchAgents, self.searchProblemClassName)
+        problem = problemClass(gameState)
+        state = problem.getStartState()
+        heuristic = getattr(searchAgents, self.heuristicName)
+
+        return problem, state, heuristic
+
+    def checkHeuristic(self, heuristic, problem, state, solutionCost):
+        h0 = heuristic(state, problem)
+
+        if solutionCost == 0:
+            if h0 == 0:
+                return True, ''
+            else:
+                return False, 'Heuristic failed H(goal) == 0 test'
+
+        if h0 < 0:
+            return False, 'Heuristic failed H >= 0 test'
+        if not h0 > 0:
+            return False, 'Heuristic failed non-triviality test'
+        if not h0 <= solutionCost:
+            return False, 'Heuristic failed admissibility test'
+
+        for succ, action, stepCost in problem.getSuccessors(state):
+            h1 = heuristic(succ, problem)
+            if h1 < 0: return False, 'Heuristic failed H >= 0 test'
+            if h0 - h1 > stepCost: return False, 'Heuristic failed consistency test'
+
+        return True, ''
+
+    def execute(self, grades, moduleDict, solutionDict):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        solutionCost = int(solutionDict['solution_cost'])
+        problem, state, heuristic = self.setupProblem(searchAgents)
+
+        passed, message = self.checkHeuristic(heuristic, problem, state, solutionCost)
+
+        if not passed:
+            grades.addMessage('FAIL: %s' % self.path)
+            grades.addMessage('%s' % message)
+            return False
+        else:
+            grades.addMessage('PASS: %s' % self.path)
+            return True
+
+    def writeSolution(self, moduleDict, filePath):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        # open file and write comments
+        handle = open(filePath, 'w')
+        handle.write('# This is the solution file for %s.\n' % self.path)
+
+        print("Solving problem", self.layoutName, self.heuristicName)
+        print(self.layoutText)
+        problem, _, heuristic = self.setupProblem(searchAgents)
+        path = search.astar(problem, heuristic)
+        cost = problem.getCostOfActions(path)
+        print("Problem solved")
+
+        handle.write('solution_cost: "%s"\n' % cost)
+        handle.close()
+        return True
+
+
+
+
+
+
+class HeuristicGrade(testClasses.TestCase):
+
+    def __init__(self, question, testDict):
+        super(HeuristicGrade, self).__init__(question, testDict)
+        self.layoutText = testDict['layout']
+        self.layoutName = testDict['layoutName']
+        self.searchProblemClassName = testDict['searchProblemClass']
+        self.heuristicName = testDict['heuristic']
+        self.basePoints = int(testDict['basePoints'])
+        self.thresholds = [int(t) for t in testDict['gradingThresholds'].split()]
+
+    def setupProblem(self, searchAgents):
+        lay = layout.Layout([l.strip() for l in self.layoutText.split('\n')])
+        gameState = pacman.GameState()
+        gameState.initialize(lay, 0)
+        problemClass = getattr(searchAgents, self.searchProblemClassName)
+        problem = problemClass(gameState)
+        state = problem.getStartState()
+        heuristic = getattr(searchAgents, self.heuristicName)
+
+        return problem, state, heuristic
+
+
+    def execute(self, grades, moduleDict, solutionDict):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        problem, _, heuristic = self.setupProblem(searchAgents)
+
+        path = search.astar(problem, heuristic)
+
+        expanded = problem._expanded
+
+        if not checkSolution(problem, path):
+            grades.addMessage('FAIL: %s' % self.path)
+            grades.addMessage('\tReturned path is not a solution.')
+            grades.addMessage('\tpath returned by astar: %s' % expanded)
+            return False
+
+        grades.addPoints(self.basePoints)
+        points = 0
+        for threshold in self.thresholds:
+            if expanded <= threshold:
+                points += 1
+        grades.addPoints(points)
+        if points >= len(self.thresholds):
+            grades.addMessage('PASS: %s' % self.path)
+        else:
+            grades.addMessage('FAIL: %s' % self.path)
+        grades.addMessage('\texpanded nodes: %s' % expanded)
+        grades.addMessage('\tthresholds: %s' % self.thresholds)
+
+        return True
+
+
+    def writeSolution(self, moduleDict, filePath):
+        handle = open(filePath, 'w')
+        handle.write('# This is the solution file for %s.\n' % self.path)
+        handle.write('# File intentionally blank.\n')
+        handle.close()
+        return True
+
+
+
+
+
+# template = """class: "ClosestDotTest"
+#
+# layoutName: "Test %s"
+# layout: \"\"\"
+# %s
+# \"\"\"
+# """
+#
+# for i, (_, _, l) in enumerate(foodTests):
+#     f = open("closest_dot_%s.test" % (i+1), "w")
+#     f.write(template % (i+1, "\n".join(l)))
+#     f.close()
+
+class ClosestDotTest(testClasses.TestCase):
+
+    def __init__(self, question, testDict):
+        super(ClosestDotTest, self).__init__(question, testDict)
+        self.layoutText = testDict['layout']
+        self.layoutName = testDict['layoutName']
+
+    def solution(self, searchAgents):
+        lay = layout.Layout([l.strip() for l in self.layoutText.split('\n')])
+        gameState = pacman.GameState()
+        gameState.initialize(lay, 0)
+        path = searchAgents.ClosestDotSearchAgent().findPathToClosestDot(gameState)
+        return path
+
+    def execute(self, grades, moduleDict, solutionDict):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        gold_length = int(solutionDict['solution_length'])
+        solution = self.solution(searchAgents)
+
+        if type(solution) != type([]):
+            grades.addMessage('FAIL: %s' % self.path)
+            grades.addMessage('\tThe result must be a list. (Instead, it is %s)' % type(solution))
+            return False
+
+        if len(solution) != gold_length:
+            grades.addMessage('FAIL: %s' % self.path)
+            grades.addMessage('Closest dot not found.')
+            grades.addMessage('\tstudent solution length:\n%s' % len(solution))
+            grades.addMessage('')
+            grades.addMessage('\tcorrect solution length:\n%s' % gold_length)
+            return False
+
+        grades.addMessage('PASS: %s' % self.path)
+        grades.addMessage('\tpacman layout:\t\t%s' % self.layoutName)
+        grades.addMessage('\tsolution length:\t\t%s' % len(solution))
+        return True
+
+    def writeSolution(self, moduleDict, filePath):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        # open file and write comments
+        handle = open(filePath, 'w')
+        handle.write('# This is the solution file for %s.\n' % self.path)
+
+        print("Solving problem", self.layoutName)
+        print(self.layoutText)
+
+        length = len(self.solution(searchAgents))
+        print("Problem solved")
+
+        handle.write('solution_length: "%s"\n' % length)
+        handle.close()
+        return True
+
+
+
+
+class CornerHeuristicSanity(testClasses.TestCase):
+
+    def __init__(self, question, testDict):
+        super(CornerHeuristicSanity, self).__init__(question, testDict)
+        self.layout_text = testDict['layout']
+
+    def execute(self, grades, moduleDict, solutionDict):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        game_state = pacman.GameState()
+        lay = layout.Layout([l.strip() for l in self.layout_text.split('\n')])
+        game_state.initialize(lay, 0)
+        problem = searchAgents.CornersProblem(game_state)
+        start_state = problem.getStartState()
+        h0 = searchAgents.cornersHeuristic(start_state, problem)
+        succs = problem.getSuccessors(start_state)
+        # cornerConsistencyA
+        for succ in succs:
+            h1 = searchAgents.cornersHeuristic(succ[0], problem)
+            if h0 - h1 > 1:
+                grades.addMessage('FAIL: inconsistent heuristic')
+                return False
+        heuristic_cost = searchAgents.cornersHeuristic(start_state, problem)
+        true_cost = float(solutionDict['cost'])
+        # cornerNontrivial
+        if heuristic_cost == 0:
+            grades.addMessage('FAIL: must use non-trivial heuristic')
+            return False
+        # cornerAdmissible
+        if heuristic_cost > true_cost:
+            grades.addMessage('FAIL: Inadmissible heuristic')
+            return False
+        path = solutionDict['path'].split()
+        states = followPath(path, problem)
+        heuristics = []
+        for state in states:
+            heuristics.append(searchAgents.cornersHeuristic(state, problem))
+        for i in range(0, len(heuristics) - 1):
+            h0 = heuristics[i]
+            h1 = heuristics[i+1]
+            # cornerConsistencyB
+            if h0 - h1 > 1:
+                grades.addMessage('FAIL: inconsistent heuristic')
+                return False
+            # cornerPosH
+            if h0 < 0 or h1 <0:
+                grades.addMessage('FAIL: non-positive heuristic')
+                return False
+        # cornerGoalH
+        if heuristics[len(heuristics) - 1] != 0:
+            grades.addMessage('FAIL: heuristic non-zero at goal')
+            return False
+        grades.addMessage('PASS: heuristic value less than true cost at start state')
+        return True
+
+    def writeSolution(self, moduleDict, filePath):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        # write comment
+        handle = open(filePath, 'w')
+        handle.write('# In order for a heuristic to be admissible, the value\n')
+        handle.write('# of the heuristic must be less at each state than the\n')
+        handle.write('# true cost of the optimal path from that state to a goal.\n')
+
+        # solve problem and write solution
+        lay = layout.Layout([l.strip() for l in self.layout_text.split('\n')])
+        start_state = pacman.GameState()
+        start_state.initialize(lay, 0)
+        problem = searchAgents.CornersProblem(start_state)
+        solution = search.astar(problem, searchAgents.cornersHeuristic)
+        handle.write('cost: "%d"\n' % len(solution))
+        handle.write('path: """\n%s\n"""\n' % wrap_solution(solution))
+        handle.close()
+        return True
+
+
+
+class CornerHeuristicPacman(testClasses.TestCase):
+
+    def __init__(self, question, testDict):
+        super(CornerHeuristicPacman, self).__init__(question, testDict)
+        self.layout_text = testDict['layout']
+
+    def execute(self, grades, moduleDict, solutionDict):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        total = 0
+        true_cost = float(solutionDict['cost'])
+        thresholds = [int(x) for x in solutionDict['thresholds'].split()]
+        game_state = pacman.GameState()
+        lay = layout.Layout([l.strip() for l in self.layout_text.split('\n')])
+        game_state.initialize(lay, 0)
+        problem = searchAgents.CornersProblem(game_state)
+        start_state = problem.getStartState()
+        if searchAgents.cornersHeuristic(start_state, problem) > true_cost:
+            grades.addMessage('FAIL: Inadmissible heuristic')
+            return False
+        path = search.astar(problem, searchAgents.cornersHeuristic)
+        print("path:", path)
+        print("path length:", len(path))
+        cost = problem.getCostOfActions(path)
+        if cost > true_cost:
+            grades.addMessage('FAIL: Inconsistent heuristic')
+            return False
+        expanded = problem._expanded
+        points = 0
+        for threshold in thresholds:
+            if expanded <= threshold:
+                points += 1
+        grades.addPoints(points)
+        if points >= len(thresholds):
+            grades.addMessage('PASS: Heuristic resulted in expansion of %d nodes' % expanded)
+        else:
+            grades.addMessage('FAIL: Heuristic resulted in expansion of %d nodes' % expanded)
+        return True
+
+    def writeSolution(self, moduleDict, filePath):
+        search = moduleDict['search']
+        searchAgents = moduleDict['searchAgents']
+        # write comment
+        handle = open(filePath, 'w')
+        handle.write('# This solution file specifies the length of the optimal path\n')
+        handle.write('# as well as the thresholds on number of nodes expanded to be\n')
+        handle.write('# used in scoring.\n')
+
+        # solve problem and write solution
+        lay = layout.Layout([l.strip() for l in self.layout_text.split('\n')])
+        start_state = pacman.GameState()
+        start_state.initialize(lay, 0)
+        problem = searchAgents.CornersProblem(start_state)
+        solution = search.astar(problem, searchAgents.cornersHeuristic)
+        handle.write('cost: "%d"\n' % len(solution))
+        handle.write('path: """\n%s\n"""\n' % wrap_solution(solution))
+        handle.write('thresholds: "2000 1600 1200"\n')
+        handle.close()
+        return True
+
diff --git a/search/testClasses.py b/search/testClasses.py
new file mode 100644
index 0000000..39ee87c
--- /dev/null
+++ b/search/testClasses.py
@@ -0,0 +1,206 @@
+# testClasses.py
+# --------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+# import modules from python standard library
+import inspect
+import re
+import sys
+
+
+# Class which models a question in a project.  Note that questions have a
+# maximum number of points they are worth, and are composed of a series of
+# test cases
+class Question(object):
+
+    def raiseNotDefined(self):
+        print('Method not implemented: %s' % inspect.stack()[1][3])
+        sys.exit(1)
+
+    def __init__(self, questionDict, display):
+        self.maxPoints = int(questionDict['max_points'])
+        self.testCases = []
+        self.display = display
+
+    def getDisplay(self):
+        return self.display
+
+    def getMaxPoints(self):
+        return self.maxPoints
+
+    # Note that 'thunk' must be a function which accepts a single argument,
+    # namely a 'grading' object
+    def addTestCase(self, testCase, thunk):
+        self.testCases.append((testCase, thunk))
+
+    def execute(self, grades):
+        self.raiseNotDefined()
+
+# Question in which all test cases must be passed in order to receive credit
+class PassAllTestsQuestion(Question):
+
+    def execute(self, grades):
+        # TODO: is this the right way to use grades?  The autograder doesn't seem to use it.
+        testsFailed = False
+        grades.assignZeroCredit()
+        for _, f in self.testCases:
+            if not f(grades):
+                testsFailed = True
+        if testsFailed:
+            grades.fail("Tests failed.")
+        else:
+            grades.assignFullCredit()
+
+class ExtraCreditPassAllTestsQuestion(Question):
+    def __init__(self, questionDict, display):
+        Question.__init__(self, questionDict, display)
+        self.extraPoints = int(questionDict['extra_points'])
+
+    def execute(self, grades):
+        # TODO: is this the right way to use grades?  The autograder doesn't seem to use it.
+        testsFailed = False
+        grades.assignZeroCredit()
+        for _, f in self.testCases:
+            if not f(grades):
+                testsFailed = True
+        if testsFailed:
+            grades.fail("Tests failed.")
+        else:
+            grades.assignFullCredit()
+            grades.addPoints(self.extraPoints)
+
+# Question in which predict credit is given for test cases with a ``points'' property.
+# All other tests are mandatory and must be passed.
+class HackedPartialCreditQuestion(Question):
+
+    def execute(self, grades):
+        # TODO: is this the right way to use grades?  The autograder doesn't seem to use it.
+        grades.assignZeroCredit()
+
+        points = 0
+        passed = True
+        for testCase, f in self.testCases:
+            testResult = f(grades)
+            if "points" in testCase.testDict:
+                if testResult: points += float(testCase.testDict["points"])
+            else:
+                passed = passed and testResult
+
+        ## FIXME: Below terrible hack to match q3's logic
+        if int(points) == self.maxPoints and not passed:
+            grades.assignZeroCredit()
+        else:
+            grades.addPoints(int(points))
+
+
+class Q6PartialCreditQuestion(Question):
+    """Fails any test which returns False, otherwise doesn't effect the grades object.
+    Partial credit tests will add the required points."""
+
+    def execute(self, grades):
+        grades.assignZeroCredit()
+
+        results = []
+        for _, f in self.testCases:
+            results.append(f(grades))
+        if False in results:
+            grades.assignZeroCredit()
+
+class PartialCreditQuestion(Question):
+    """Fails any test which returns False, otherwise doesn't effect the grades object.
+    Partial credit tests will add the required points."""
+
+    def execute(self, grades):
+        grades.assignZeroCredit()
+
+        for _, f in self.testCases:
+            if not f(grades):
+                grades.assignZeroCredit()
+                grades.fail("Tests failed.")
+                return False
+
+
+
+class NumberPassedQuestion(Question):
+    """Grade is the number of test cases passed."""
+
+    def execute(self, grades):
+        grades.addPoints([f(grades) for _, f in self.testCases].count(True))
+
+
+
+
+
+# Template modeling a generic test case
+class TestCase(object):
+
+    def raiseNotDefined(self):
+        print('Method not implemented: %s' % inspect.stack()[1][3])
+        sys.exit(1)
+
+    def getPath(self):
+        return self.path
+
+    def __init__(self, question, testDict):
+        self.question = question
+        self.testDict = testDict
+        self.path = testDict['path']
+        self.messages = []
+
+    def __str__(self):
+        self.raiseNotDefined()
+
+    def execute(self, grades, moduleDict, solutionDict):
+        self.raiseNotDefined()
+
+    def writeSolution(self, moduleDict, filePath):
+        self.raiseNotDefined()
+        return True
+
+    # Tests should call the following messages for grading
+    # to ensure a uniform format for test output.
+    #
+    # TODO: this is hairy, but we need to fix grading.py's interface
+    # to get a nice hierarchical project - question - test structure,
+    # then these should be moved into Question proper.
+    def testPass(self, grades):
+        grades.addMessage('PASS: %s' % (self.path,))
+        for line in self.messages:
+            grades.addMessage('    %s' % (line,))
+        return True
+
+    def testFail(self, grades):
+        grades.addMessage('FAIL: %s' % (self.path,))
+        for line in self.messages:
+            grades.addMessage('    %s' % (line,))
+        return False
+
+    # This should really be question level?
+    #
+    def testPartial(self, grades, points, maxPoints):
+        grades.addPoints(points)
+        extraCredit = max(0, points - maxPoints)
+        regularCredit = points - extraCredit
+
+        grades.addMessage('%s: %s (%s of %s points)' % ("PASS" if points >= maxPoints else "FAIL", self.path, regularCredit, maxPoints))
+        if extraCredit > 0:
+            grades.addMessage('EXTRA CREDIT: %s points' % (extraCredit,))
+
+        for line in self.messages:
+            grades.addMessage('    %s' % (line,))
+
+        return True
+
+    def addMessage(self, message):
+        self.messages.extend(message.split('\n'))
+
diff --git a/search/testParser.py b/search/testParser.py
new file mode 100644
index 0000000..17f3485
--- /dev/null
+++ b/search/testParser.py
@@ -0,0 +1,85 @@
+# testParser.py
+# -------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+import re
+import sys
+
+class TestParser(object):
+
+    def __init__(self, path):
+        # save the path to the test file
+        self.path = path
+
+    def removeComments(self, rawlines):
+        # remove any portion of a line following a '#' symbol
+        fixed_lines = []
+        for l in rawlines:
+            idx = l.find('#')
+            if idx == -1:
+                fixed_lines.append(l)
+            else:
+                fixed_lines.append(l[0:idx])
+        return '\n'.join(fixed_lines)
+
+    def parse(self):
+        # read in the test case and remove comments
+        test = {}
+        with open(self.path) as handle:
+            raw_lines = handle.read().split('\n')
+
+        test_text = self.removeComments(raw_lines)
+        test['__raw_lines__'] = raw_lines
+        test['path'] = self.path
+        test['__emit__'] = []
+        lines = test_text.split('\n')
+        i = 0
+        # read a property in each loop cycle
+        while(i < len(lines)):
+            # skip blank lines
+            if re.match('\A\s*\Z', lines[i]):
+                test['__emit__'].append(("raw", raw_lines[i]))
+                i += 1
+                continue
+            m = re.match('\A([^"]*?):\s*"([^"]*)"\s*\Z', lines[i])
+            if m:
+                test[m.group(1)] = m.group(2)
+                test['__emit__'].append(("oneline", m.group(1)))
+                i += 1
+                continue
+            m = re.match('\A([^"]*?):\s*"""\s*\Z', lines[i])
+            if m:
+                msg = []
+                i += 1
+                while(not re.match('\A\s*"""\s*\Z', lines[i])):
+                    msg.append(raw_lines[i])
+                    i += 1
+                test[m.group(1)] = '\n'.join(msg)
+                test['__emit__'].append(("multiline", m.group(1)))
+                i += 1
+                continue
+            print('error parsing test file: %s' % self.path)
+            sys.exit(1)
+        return test
+
+
+def emitTestDict(testDict, handle):
+    for kind, data in testDict['__emit__']:
+        if kind == "raw":
+            handle.write(data + "\n")
+        elif kind == "oneline":
+            handle.write('%s: "%s"\n' % (data, testDict[data]))
+        elif kind == "multiline":
+            handle.write('%s: """\n%s\n"""\n' % (data, testDict[data]))
+        else:
+            raise Exception("Bad __emit__")
diff --git a/search/test_cases/CONFIG b/search/test_cases/CONFIG
new file mode 100644
index 0000000..dbed66b
--- /dev/null
+++ b/search/test_cases/CONFIG
@@ -0,0 +1 @@
+order: "q1 q2 q3 q4 q5 q6 q7 q8"
\ No newline at end of file
diff --git a/search/test_cases/q1/CONFIG b/search/test_cases/q1/CONFIG
new file mode 100644
index 0000000..ad7e38a
--- /dev/null
+++ b/search/test_cases/q1/CONFIG
@@ -0,0 +1,2 @@
+max_points: "3"
+class: "PassAllTestsQuestion"
diff --git a/search/test_cases/q1/graph_backtrack.solution b/search/test_cases/q1/graph_backtrack.solution
new file mode 100644
index 0000000..c52850c
--- /dev/null
+++ b/search/test_cases/q1/graph_backtrack.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q1/graph_backtrack.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "1:A->C 0:C->G"
+expanded_states: "A D C"
+rev_solution: "1:A->C 0:C->G"
+rev_expanded_states: "A B C"
diff --git a/search/test_cases/q1/graph_backtrack.test b/search/test_cases/q1/graph_backtrack.test
new file mode 100644
index 0000000..05640a0
--- /dev/null
+++ b/search/test_cases/q1/graph_backtrack.test
@@ -0,0 +1,32 @@
+class: "GraphSearchTest"
+algorithm: "depthFirstSearch"
+
+diagram: """
+ B   
+ ^
+ |
+*A --> C --> G
+ |
+ V
+ D
+
+A is the start state, G is the goal.  Arrows mark 
+possible state transitions.  This tests whether
+you extract the sequence of actions correctly even
+if your search backtracks.  If you fail this, your
+nodes are not correctly tracking the sequences of
+actions required to reach them.
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: G
+A 0:A->B B 1.0
+A 1:A->C C 2.0
+A 2:A->D D 4.0
+C 0:C->G G 8.0
+"""
diff --git a/search/test_cases/q1/graph_bfs_vs_dfs.solution b/search/test_cases/q1/graph_bfs_vs_dfs.solution
new file mode 100644
index 0000000..0680f92
--- /dev/null
+++ b/search/test_cases/q1/graph_bfs_vs_dfs.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q1/graph_bfs_vs_dfs.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "2:A->D 0:D->G"
+expanded_states: "A D"
+rev_solution: "0:A->B 0:B->D 0:D->G"
+rev_expanded_states: "A B D"
diff --git a/search/test_cases/q1/graph_bfs_vs_dfs.test b/search/test_cases/q1/graph_bfs_vs_dfs.test
new file mode 100644
index 0000000..155e1fe
--- /dev/null
+++ b/search/test_cases/q1/graph_bfs_vs_dfs.test
@@ -0,0 +1,30 @@
+# Graph where BFS finds the optimal solution but DFS does not
+class: "GraphSearchTest"
+algorithm: "depthFirstSearch"
+
+diagram: """
+/-- B
+|   ^
+|   |
+|  *A -->[G]
+|   |     ^
+|   V     |
+\-->D ----/
+
+A is the start state, G is the goal.  Arrows
+mark possible transitions
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: G
+A 0:A->B B 1.0
+A 1:A->G G 2.0
+A 2:A->D D 4.0
+B 0:B->D D 8.0
+D 0:D->G G 16.0
+"""
diff --git a/search/test_cases/q1/graph_infinite.solution b/search/test_cases/q1/graph_infinite.solution
new file mode 100644
index 0000000..82203ee
--- /dev/null
+++ b/search/test_cases/q1/graph_infinite.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q1/graph_infinite.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "0:A->B 1:B->C 1:C->G"
+expanded_states: "A B C"
+rev_solution: "0:A->B 1:B->C 1:C->G"
+rev_expanded_states: "A B C"
diff --git a/search/test_cases/q1/graph_infinite.test b/search/test_cases/q1/graph_infinite.test
new file mode 100644
index 0000000..692ac05
--- /dev/null
+++ b/search/test_cases/q1/graph_infinite.test
@@ -0,0 +1,30 @@
+# Graph where natural action choice leads to an infinite loop
+class: "GraphSearchTest"
+algorithm: "depthFirstSearch"
+
+diagram: """
+ B <--> C
+ ^     /|
+ |    / |
+ V   /  V
+*A<-/  [G]
+
+A is the start state, G is the goal.  Arrows mark 
+possible state transitions.
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: G
+A 0:A->B B 1.0
+B 0:B->A A 2.0
+B 1:B->C C 4.0
+C 0:C->A A 8.0
+C 1:C->G G 16.0
+C 2:C->B B 32.0
+"""
+
diff --git a/search/test_cases/q1/graph_manypaths.solution b/search/test_cases/q1/graph_manypaths.solution
new file mode 100644
index 0000000..34b5a82
--- /dev/null
+++ b/search/test_cases/q1/graph_manypaths.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q1/graph_manypaths.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "2:A->B2 0:B2->C 0:C->D 2:D->E2 0:E2->F 0:F->G"
+expanded_states: "A B2 C D E2 F"
+rev_solution: "0:A->B1 0:B1->C 0:C->D 0:D->E1 0:E1->F 0:F->G"
+rev_expanded_states: "A B1 C D E1 F"
diff --git a/search/test_cases/q1/graph_manypaths.test b/search/test_cases/q1/graph_manypaths.test
new file mode 100644
index 0000000..953c4eb
--- /dev/null
+++ b/search/test_cases/q1/graph_manypaths.test
@@ -0,0 +1,39 @@
+class: "GraphSearchTest"
+algorithm: "depthFirstSearch"
+
+diagram: """
+    B1          E1
+   ^  \        ^  \
+  /    V      /    V
+*A --> C --> D --> F --> [G]
+  \    ^      \    ^
+   V  /        V  /
+    B2          E2
+
+A is the start state, G is the goal.  Arrows mark 
+possible state transitions.  This graph has multiple
+paths to the goal, where nodes with the same state 
+are added to the fringe multiple times before they
+are expanded.
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: G
+A 0:A->B1 B1 1.0
+A 1:A->C C 2.0
+A 2:A->B2 B2 4.0
+B1 0:B1->C C 8.0
+B2 0:B2->C C 16.0
+C 0:C->D D 32.0
+D 0:D->E1 E1 64.0
+D 1:D->F F 128.0
+D 2:D->E2 E2 256.0
+E1 0:E1->F F 512.0
+E2 0:E2->F F 1024.0
+F 0:F->G G 2048.0
+"""
diff --git a/search/test_cases/q1/pacman_1.solution b/search/test_cases/q1/pacman_1.solution
new file mode 100644
index 0000000..82a670c
--- /dev/null
+++ b/search/test_cases/q1/pacman_1.solution
@@ -0,0 +1,40 @@
+# This is the solution file for test_cases/q1/pacman_1.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+# Number of nodes expanded must be with a factor of 1.0 of the numbers below.
+solution: """
+West West West West West West West West West West West West West West
+West West West West West West West West West West West West West West
+West West West West West South South South South South South South
+South South East East East North North North North North North North
+East East South South South South South South East East North North
+North North North North East East South South South South East East
+North North East East East East East East East East South South South
+East East East East East East East South South South South South South
+South West West West West West West West West West West West West West
+West West West West South West West West West West West West West West
+"""
+expanded_nodes: "146"
+rev_solution: """
+South South West West West West South South East East East East South
+South West West West West South South East East East East South South
+West West West West South South South East North East East East South
+South South West West West West West West West North North North North
+North North North North West West West West West West West North North
+North East East East East South East East East North North North West
+West North North West West West West West West West West West West
+West West West West West West West West West West West West West West
+South South South South South South South South South East East East
+North North North North North North North East East South South South
+South South South East East North North North North North North East
+East South South South South East East North North North North East
+East East East East South South West West West South South East East
+East South South West West West West West West South South West West
+West West West South West West West West West South South East East
+East East East East East North East East East East East North North
+East East East East East East North East East East East East South
+South West West West South West West West West West West South South
+West West West West West South West West West West West West West West
+West
+"""
+rev_expanded_nodes: "269"
diff --git a/search/test_cases/q1/pacman_1.test b/search/test_cases/q1/pacman_1.test
new file mode 100644
index 0000000..6ae5412
--- /dev/null
+++ b/search/test_cases/q1/pacman_1.test
@@ -0,0 +1,27 @@
+# This is a basic depth first search test
+class: "PacmanSearchTest"
+algorithm: "depthFirstSearch"
+
+# The following specifies the layout to be used 
+layoutName: "mediumMaze"
+layout: """
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                 P%
+% %%%%%%%%%%%%%%%%%%%%%%% %%%%%%%% %
+% %%   %   %      %%%%%%%   %%     %
+% %% % % % % %%%% %%%%%%%%% %% %%%%%
+% %% % % % %             %% %%     %
+% %% % % % % % %%%%  %%%    %%%%%% %
+% %  % % %   %    %% %%%%%%%%      %
+% %% % % %%%%%%%% %%        %% %%%%%
+% %% %   %%       %%%%%%%%% %%     %
+%    %%%%%% %%%%%%%      %% %%%%%% %
+%%%%%%      %       %%%% %% %      %
+%      %%%%%% %%%%% %    %% %% %%%%%
+% %%%%%%      %       %%%%% %%     %
+%        %%%%%% %%%%%%%%%%% %%  %% %
+%%%%%%%%%%                  %%%%%% %
+%.         %%%%%%%%%%%%%%%%        %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+"""
+
diff --git a/search/test_cases/q2/CONFIG b/search/test_cases/q2/CONFIG
new file mode 100644
index 0000000..ad7e38a
--- /dev/null
+++ b/search/test_cases/q2/CONFIG
@@ -0,0 +1,2 @@
+max_points: "3"
+class: "PassAllTestsQuestion"
diff --git a/search/test_cases/q2/graph_backtrack.solution b/search/test_cases/q2/graph_backtrack.solution
new file mode 100644
index 0000000..6c669c2
--- /dev/null
+++ b/search/test_cases/q2/graph_backtrack.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q2/graph_backtrack.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "1:A->C 0:C->G"
+expanded_states: "A B C D"
+rev_solution: "1:A->C 0:C->G"
+rev_expanded_states: "A D C B"
diff --git a/search/test_cases/q2/graph_backtrack.test b/search/test_cases/q2/graph_backtrack.test
new file mode 100644
index 0000000..2b35d8b
--- /dev/null
+++ b/search/test_cases/q2/graph_backtrack.test
@@ -0,0 +1,32 @@
+class: "GraphSearchTest"
+algorithm: "breadthFirstSearch"
+
+diagram: """
+ B   
+ ^
+ |
+*A --> C --> G
+ |
+ V
+ D
+
+A is the start state, G is the goal.  Arrows mark 
+possible state transitions.  This tests whether
+you extract the sequence of actions correctly even
+if your search backtracks.  If you fail this, your
+nodes are not correctly tracking the sequences of
+actions required to reach them.
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: G
+A 0:A->B B 1.0
+A 1:A->C C 2.0
+A 2:A->D D 4.0
+C 0:C->G G 8.0
+"""
diff --git a/search/test_cases/q2/graph_bfs_vs_dfs.solution b/search/test_cases/q2/graph_bfs_vs_dfs.solution
new file mode 100644
index 0000000..05eecc8
--- /dev/null
+++ b/search/test_cases/q2/graph_bfs_vs_dfs.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q2/graph_bfs_vs_dfs.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "1:A->G"
+expanded_states: "A B"
+rev_solution: "1:A->G"
+rev_expanded_states: "A D"
diff --git a/search/test_cases/q2/graph_bfs_vs_dfs.test b/search/test_cases/q2/graph_bfs_vs_dfs.test
new file mode 100644
index 0000000..47b78a6
--- /dev/null
+++ b/search/test_cases/q2/graph_bfs_vs_dfs.test
@@ -0,0 +1,30 @@
+# Graph where BFS finds the optimal solution but DFS does not
+class: "GraphSearchTest"
+algorithm: "breadthFirstSearch"
+
+diagram: """
+/-- B
+|   ^
+|   |
+|  *A -->[G]
+|   |     ^
+|   V     |
+\-->D ----/
+
+A is the start state, G is the goal.  Arrows
+mark possible transitions
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: G
+A 0:A->B B 1.0
+A 1:A->G G 2.0
+A 2:A->D D 4.0
+B 0:B->D D 8.0
+D 0:D->G G 16.0
+"""
diff --git a/search/test_cases/q2/graph_infinite.solution b/search/test_cases/q2/graph_infinite.solution
new file mode 100644
index 0000000..17b621c
--- /dev/null
+++ b/search/test_cases/q2/graph_infinite.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q2/graph_infinite.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "0:A->B 1:B->C 1:C->G"
+expanded_states: "A B C"
+rev_solution: "0:A->B 1:B->C 1:C->G"
+rev_expanded_states: "A B C"
diff --git a/search/test_cases/q2/graph_infinite.test b/search/test_cases/q2/graph_infinite.test
new file mode 100644
index 0000000..2cae9ad
--- /dev/null
+++ b/search/test_cases/q2/graph_infinite.test
@@ -0,0 +1,30 @@
+# Graph where natural action choice leads to an infinite loop
+class: "GraphSearchTest"
+algorithm: "breadthFirstSearch"
+
+diagram: """
+ B <--> C
+ ^     /|
+ |    / |
+ V   /  V
+*A<-/  [G]
+
+A is the start state, G is the goal.  Arrows mark 
+possible state transitions.
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: G
+A 0:A->B B 1.0
+B 0:B->A A 2.0
+B 1:B->C C 4.0
+C 0:C->A A 8.0
+C 1:C->G G 16.0
+C 2:C->B B 32.0
+"""
+
diff --git a/search/test_cases/q2/graph_manypaths.solution b/search/test_cases/q2/graph_manypaths.solution
new file mode 100644
index 0000000..0cea422
--- /dev/null
+++ b/search/test_cases/q2/graph_manypaths.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q2/graph_manypaths.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "1:A->C 0:C->D 1:D->F 0:F->G"
+expanded_states: "A B1 C B2 D E1 F E2"
+rev_solution: "1:A->C 0:C->D 1:D->F 0:F->G"
+rev_expanded_states: "A B2 C B1 D E2 F E1"
diff --git a/search/test_cases/q2/graph_manypaths.test b/search/test_cases/q2/graph_manypaths.test
new file mode 100644
index 0000000..7c636ea
--- /dev/null
+++ b/search/test_cases/q2/graph_manypaths.test
@@ -0,0 +1,39 @@
+class: "GraphSearchTest"
+algorithm: "breadthFirstSearch"
+
+diagram: """
+    B1          E1
+   ^  \        ^  \
+  /    V      /    V
+*A --> C --> D --> F --> [G]
+  \    ^      \    ^
+   V  /        V  /
+    B2          E2
+
+A is the start state, G is the goal.  Arrows mark 
+possible state transitions.  This graph has multiple
+paths to the goal, where nodes with the same state 
+are added to the fringe multiple times before they
+are expanded.
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: G
+A 0:A->B1 B1 1.0
+A 1:A->C C 2.0
+A 2:A->B2 B2 4.0
+B1 0:B1->C C 8.0
+B2 0:B2->C C 16.0
+C 0:C->D D 32.0
+D 0:D->E1 E1 64.0
+D 1:D->F F 128.0
+D 2:D->E2 E2 256.0
+E1 0:E1->F F 512.0
+E2 0:E2->F F 1024.0
+F 0:F->G G 2048.0
+"""
diff --git a/search/test_cases/q2/pacman_1.solution b/search/test_cases/q2/pacman_1.solution
new file mode 100644
index 0000000..8f6d2bd
--- /dev/null
+++ b/search/test_cases/q2/pacman_1.solution
@@ -0,0 +1,22 @@
+# This is the solution file for test_cases/q2/pacman_1.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+# Number of nodes expanded must be with a factor of 1.0 of the numbers below.
+solution: """
+West West West West West West West West West South South East East
+South South South West West West North West West West West South South
+South East East East East East East East South South South South South
+South South West West West West West West West West West West West
+West West West West West West South West West West West West West West
+West West
+"""
+expanded_nodes: "269"
+rev_solution: """
+West West West West West West West West West South South East East
+South South South West West West North West West West West South South
+South East East East East East East East South South South South South
+South South West West West West West West West West West West West
+West West West West West West South West West West West West West West
+West West
+"""
+rev_expanded_nodes: "269"
diff --git a/search/test_cases/q2/pacman_1.test b/search/test_cases/q2/pacman_1.test
new file mode 100644
index 0000000..c913f0c
--- /dev/null
+++ b/search/test_cases/q2/pacman_1.test
@@ -0,0 +1,27 @@
+# This is a basic breadth first search test
+class: "PacmanSearchTest"
+algorithm: "breadthFirstSearch"
+
+# The following specifies the layout to be used 
+layoutName: "mediumMaze"
+layout: """
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                 P%
+% %%%%%%%%%%%%%%%%%%%%%%% %%%%%%%% %
+% %%   %   %      %%%%%%%   %%     %
+% %% % % % % %%%% %%%%%%%%% %% %%%%%
+% %% % % % %             %% %%     %
+% %% % % % % % %%%%  %%%    %%%%%% %
+% %  % % %   %    %% %%%%%%%%      %
+% %% % % %%%%%%%% %%        %% %%%%%
+% %% %   %%       %%%%%%%%% %%     %
+%    %%%%%% %%%%%%%      %% %%%%%% %
+%%%%%%      %       %%%% %% %      %
+%      %%%%%% %%%%% %    %% %% %%%%%
+% %%%%%%      %       %%%%% %%     %
+%        %%%%%% %%%%%%%%%%% %%  %% %
+%%%%%%%%%%                  %%%%%% %
+%.         %%%%%%%%%%%%%%%%        %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+"""
+
diff --git a/search/test_cases/q3/CONFIG b/search/test_cases/q3/CONFIG
new file mode 100644
index 0000000..e5332c3
--- /dev/null
+++ b/search/test_cases/q3/CONFIG
@@ -0,0 +1,2 @@
+class: "PassAllTestsQuestion"
+max_points: "3"
diff --git a/search/test_cases/q3/graph_backtrack.solution b/search/test_cases/q3/graph_backtrack.solution
new file mode 100644
index 0000000..d150cb7
--- /dev/null
+++ b/search/test_cases/q3/graph_backtrack.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q3/graph_backtrack.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "1:A->C 0:C->G"
+expanded_states: "A B C D"
+rev_solution: "1:A->C 0:C->G"
+rev_expanded_states: "A B C D"
diff --git a/search/test_cases/q3/graph_backtrack.test b/search/test_cases/q3/graph_backtrack.test
new file mode 100644
index 0000000..a74bd9e
--- /dev/null
+++ b/search/test_cases/q3/graph_backtrack.test
@@ -0,0 +1,32 @@
+class: "GraphSearchTest"
+algorithm: "uniformCostSearch"
+
+diagram: """
+ B   
+ ^
+ |
+*A --> C --> G
+ |
+ V
+ D
+
+A is the start state, G is the goal.  Arrows mark 
+possible state transitions.  This tests whether
+you extract the sequence of actions correctly even
+if your search backtracks.  If you fail this, your
+nodes are not correctly tracking the sequences of
+actions required to reach them.
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: G
+A 0:A->B B 1.0
+A 1:A->C C 2.0
+A 2:A->D D 4.0
+C 0:C->G G 8.0
+"""
diff --git a/search/test_cases/q3/graph_bfs_vs_dfs.solution b/search/test_cases/q3/graph_bfs_vs_dfs.solution
new file mode 100644
index 0000000..5dfffca
--- /dev/null
+++ b/search/test_cases/q3/graph_bfs_vs_dfs.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q3/graph_bfs_vs_dfs.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "1:A->G"
+expanded_states: "A B"
+rev_solution: "1:A->G"
+rev_expanded_states: "A B"
diff --git a/search/test_cases/q3/graph_bfs_vs_dfs.test b/search/test_cases/q3/graph_bfs_vs_dfs.test
new file mode 100644
index 0000000..87aa465
--- /dev/null
+++ b/search/test_cases/q3/graph_bfs_vs_dfs.test
@@ -0,0 +1,30 @@
+# Graph where BFS finds the optimal solution but DFS does not
+class: "GraphSearchTest"
+algorithm: "uniformCostSearch"
+
+diagram: """
+/-- B
+|   ^
+|   |
+|  *A -->[G]
+|   |     ^
+|   V     |
+\-->D ----/
+
+A is the start state, G is the goal.  Arrows
+mark possible transitions
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: G
+A 0:A->B B 1.0
+A 1:A->G G 2.0
+A 2:A->D D 4.0
+B 0:B->D D 8.0
+D 0:D->G G 16.0
+"""
diff --git a/search/test_cases/q3/graph_infinite.solution b/search/test_cases/q3/graph_infinite.solution
new file mode 100644
index 0000000..c6cd195
--- /dev/null
+++ b/search/test_cases/q3/graph_infinite.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q3/graph_infinite.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "0:A->B 1:B->C 1:C->G"
+expanded_states: "A B C"
+rev_solution: "0:A->B 1:B->C 1:C->G"
+rev_expanded_states: "A B C"
diff --git a/search/test_cases/q3/graph_infinite.test b/search/test_cases/q3/graph_infinite.test
new file mode 100644
index 0000000..80d807f
--- /dev/null
+++ b/search/test_cases/q3/graph_infinite.test
@@ -0,0 +1,30 @@
+# Graph where natural action choice leads to an infinite loop
+class: "GraphSearchTest"
+algorithm: "uniformCostSearch"
+
+diagram: """
+ B <--> C
+ ^     /|
+ |    / |
+ V   /  V
+*A<-/  [G]
+
+A is the start state, G is the goal.  Arrows mark 
+possible state transitions.
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: G
+A 0:A->B B 1.0
+B 0:B->A A 2.0
+B 1:B->C C 4.0
+C 0:C->A A 8.0
+C 1:C->G G 16.0
+C 2:C->B B 32.0
+"""
+
diff --git a/search/test_cases/q3/graph_manypaths.solution b/search/test_cases/q3/graph_manypaths.solution
new file mode 100644
index 0000000..628568f
--- /dev/null
+++ b/search/test_cases/q3/graph_manypaths.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q3/graph_manypaths.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "1:A->C 0:C->D 1:D->F 0:F->G"
+expanded_states: "A B1 C B2 D E1 F E2"
+rev_solution: "1:A->C 0:C->D 1:D->F 0:F->G"
+rev_expanded_states: "A B1 C B2 D E1 F E2"
diff --git a/search/test_cases/q3/graph_manypaths.test b/search/test_cases/q3/graph_manypaths.test
new file mode 100644
index 0000000..8c39dc7
--- /dev/null
+++ b/search/test_cases/q3/graph_manypaths.test
@@ -0,0 +1,39 @@
+class: "GraphSearchTest"
+algorithm: "uniformCostSearch"
+
+diagram: """
+    B1          E1
+   ^  \        ^  \
+  /    V      /    V
+*A --> C --> D --> F --> [G]
+  \    ^      \    ^
+   V  /        V  /
+    B2          E2
+
+A is the start state, G is the goal.  Arrows mark 
+possible state transitions.  This graph has multiple
+paths to the goal, where nodes with the same state 
+are added to the fringe multiple times before they
+are expanded.
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: G
+A 0:A->B1 B1 1.0
+A 1:A->C C 2.0
+A 2:A->B2 B2 4.0
+B1 0:B1->C C 8.0
+B2 0:B2->C C 16.0
+C 0:C->D D 32.0
+D 0:D->E1 E1 64.0
+D 1:D->F F 128.0
+D 2:D->E2 E2 256.0
+E1 0:E1->F F 512.0
+E2 0:E2->F F 1024.0
+F 0:F->G G 2048.0
+"""
diff --git a/search/test_cases/q3/ucs_0_graph.solution b/search/test_cases/q3/ucs_0_graph.solution
new file mode 100644
index 0000000..b8c1509
--- /dev/null
+++ b/search/test_cases/q3/ucs_0_graph.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q3/ucs_0_graph.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "Right Down Down"
+expanded_states: "A B D C G"
+rev_solution: "Right Down Down"
+rev_expanded_states: "A B D C G"
diff --git a/search/test_cases/q3/ucs_0_graph.test b/search/test_cases/q3/ucs_0_graph.test
new file mode 100644
index 0000000..e8f3d4c
--- /dev/null
+++ b/search/test_cases/q3/ucs_0_graph.test
@@ -0,0 +1,39 @@
+class: "GraphSearchTest"
+algorithm: "uniformCostSearch"
+
+diagram: """
+          C
+          ^
+          | 2
+     2    V   4 
+*A <----> B -----> [H]
+          |1 
+     1.5  V  2.5
+ G <----- D -----> E
+          |
+        2 | 
+          V
+         [F]
+
+A is the start state, F and H is the goal.  Arrows mark possible state 
+transitions.  The number next to the arrow is the cost of that transition.
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: H F
+A Right B 2.0
+B Right H 4.0
+B Down D 1.0
+B Up C 2.0
+B Left A 2.0
+C Down B 2.0
+D Right E 2.5
+D Down F 2.0
+D Left G 1.5
+"""
+
diff --git a/search/test_cases/q3/ucs_1_problemC.solution b/search/test_cases/q3/ucs_1_problemC.solution
new file mode 100644
index 0000000..dc8fc4c
--- /dev/null
+++ b/search/test_cases/q3/ucs_1_problemC.solution
@@ -0,0 +1,22 @@
+# This is the solution file for test_cases/q3/ucs_1_problemC.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+# Number of nodes expanded must be with a factor of 1.1 of the numbers below.
+solution: """
+West West West West West West West West West South South East East
+South South South West West West North West West West West South South
+South East East East East East East East South South South South South
+South South West West West West West West West West West West West
+West West West West West West South West West West West West West West
+West West
+"""
+expanded_nodes: "269"
+rev_solution: """
+West West West West West West West West West South South East East
+South South South West West West North West West West West South South
+South East East East East East East East South South South South South
+South South West West West West West West West West West West West
+West West West West West West South West West West West West West West
+West West
+"""
+rev_expanded_nodes: "269"
diff --git a/search/test_cases/q3/ucs_1_problemC.test b/search/test_cases/q3/ucs_1_problemC.test
new file mode 100644
index 0000000..1ce714d
--- /dev/null
+++ b/search/test_cases/q3/ucs_1_problemC.test
@@ -0,0 +1,28 @@
+class: "PacmanSearchTest"
+algorithm: "uniformCostSearch"
+points: "0.5"
+
+# The following specifies the layout to be used 
+layoutName: "mediumMaze"
+layout: """
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                 P%
+% %%%%%%%%%%%%%%%%%%%%%%% %%%%%%%% %
+% %%   %   %      %%%%%%%   %%     %
+% %% % % % % %%%% %%%%%%%%% %% %%%%%
+% %% % % % %             %% %%     %
+% %% % % % % % %%%%  %%%    %%%%%% %
+% %  % % %   %    %% %%%%%%%%      %
+% %% % % %%%%%%%% %%        %% %%%%%
+% %% %   %%       %%%%%%%%% %%     %
+%    %%%%%% %%%%%%%      %% %%%%%% %
+%%%%%%      %       %%%% %% %      %
+%      %%%%%% %%%%% %    %% %% %%%%%
+% %%%%%%      %       %%%%% %%     %
+%        %%%%%% %%%%%%%%%%% %%  %% %
+%%%%%%%%%%                  %%%%%% %
+%.         %%%%%%%%%%%%%%%%        %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+"""
+leewayFactor: "1.1"
+#costFn: "lambda pos: 1"
diff --git a/search/test_cases/q3/ucs_2_problemE.solution b/search/test_cases/q3/ucs_2_problemE.solution
new file mode 100644
index 0000000..d84245f
--- /dev/null
+++ b/search/test_cases/q3/ucs_2_problemE.solution
@@ -0,0 +1,22 @@
+# This is the solution file for test_cases/q3/ucs_2_problemE.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+# Number of nodes expanded must be with a factor of 1.1 of the numbers below.
+solution: """
+South South West West West West South South East East East East South
+South West West West West South South East East East East South South
+West West West West South South East East East East South South South
+West West West West West West West North West West West West West West
+West West West West West West West West West West West South West West
+West West West West West West West
+"""
+expanded_nodes: "260"
+rev_solution: """
+South South West West West West South South East East East East South
+South West West West West South South East East East East South South
+West West West West South South East East East East South South South
+West West West West West West West North West West West West West West
+West West West West West West West West West West West South West West
+West West West West West West West
+"""
+rev_expanded_nodes: "260"
diff --git a/search/test_cases/q3/ucs_2_problemE.test b/search/test_cases/q3/ucs_2_problemE.test
new file mode 100644
index 0000000..3c609f2
--- /dev/null
+++ b/search/test_cases/q3/ucs_2_problemE.test
@@ -0,0 +1,28 @@
+class: "PacmanSearchTest"
+algorithm: "uniformCostSearch"
+points: "0.5"
+
+# The following specifies the layout to be used 
+layoutName: "mediumMaze"
+layout: """
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                 P%
+% %%%%%%%%%%%%%%%%%%%%%%% %%%%%%%% %
+% %%   %   %      %%%%%%%   %%     %
+% %% % % % % %%%% %%%%%%%%% %% %%%%%
+% %% % % % %             %% %%     %
+% %% % % % % % %%%%  %%%    %%%%%% %
+% %  % % %   %    %% %%%%%%%%      %
+% %% % % %%%%%%%% %%        %% %%%%%
+% %% %   %%       %%%%%%%%% %%     %
+%    %%%%%% %%%%%%%      %% %%%%%% %
+%%%%%%      %       %%%% %% %      %
+%      %%%%%% %%%%% %    %% %% %%%%%
+% %%%%%%      %       %%%%% %%     %
+%        %%%%%% %%%%%%%%%%% %%  %% %
+%%%%%%%%%%                  %%%%%% %
+%.         %%%%%%%%%%%%%%%%        %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+"""
+leewayFactor: "1.1"
+costFn: "lambda pos: .5 ** pos[0]"
diff --git a/search/test_cases/q3/ucs_3_problemW.solution b/search/test_cases/q3/ucs_3_problemW.solution
new file mode 100644
index 0000000..e04325d
--- /dev/null
+++ b/search/test_cases/q3/ucs_3_problemW.solution
@@ -0,0 +1,34 @@
+# This is the solution file for test_cases/q3/ucs_3_problemW.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+# Number of nodes expanded must be with a factor of 1.1 of the numbers below.
+solution: """
+West West West West West West West West West West West West West West
+West West West West West West West West West West West West West West
+West West West West West South South South South South South South
+South South East East East North North North North North North North
+East East South South South South South South East East North North
+North North North North East East South South South South East East
+North North East East South South East East East South South West West
+West West West West South South West West West West West South West
+West West West West South South East East East East East East East
+North East East East East East North North East East East East East
+East South South West West West West South South West West West West
+West South West West West West West West West West West
+"""
+expanded_nodes: "173"
+rev_solution: """
+West West West West West West West West West West West West West West
+West West West West West West West West West West West West West West
+West West West West West South South South South South South South
+South South East East East North North North North North North North
+East East South South South South South South East East North North
+North North North North East East South South South South East East
+North North East East South South East East East South South West West
+West West West West South South West West West West West South West
+West West West West South South East East East East East East East
+North East East East East East North North East East East East East
+East South South West West West West South South West West West West
+West South West West West West West West West West West
+"""
+rev_expanded_nodes: "173"
diff --git a/search/test_cases/q3/ucs_3_problemW.test b/search/test_cases/q3/ucs_3_problemW.test
new file mode 100644
index 0000000..fbc2fad
--- /dev/null
+++ b/search/test_cases/q3/ucs_3_problemW.test
@@ -0,0 +1,28 @@
+class: "PacmanSearchTest"
+algorithm: "uniformCostSearch"
+points: "0.5"
+
+# The following specifies the layout to be used 
+layoutName: "mediumMaze"
+layout: """
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                 P%
+% %%%%%%%%%%%%%%%%%%%%%%% %%%%%%%% %
+% %%   %   %      %%%%%%%   %%     %
+% %% % % % % %%%% %%%%%%%%% %% %%%%%
+% %% % % % %             %% %%     %
+% %% % % % % % %%%%  %%%    %%%%%% %
+% %  % % %   %    %% %%%%%%%%      %
+% %% % % %%%%%%%% %%        %% %%%%%
+% %% %   %%       %%%%%%%%% %%     %
+%    %%%%%% %%%%%%%      %% %%%%%% %
+%%%%%%      %       %%%% %% %      %
+%      %%%%%% %%%%% %    %% %% %%%%%
+% %%%%%%      %       %%%%% %%     %
+%        %%%%%% %%%%%%%%%%% %%  %% %
+%%%%%%%%%%                  %%%%%% %
+%.         %%%%%%%%%%%%%%%%        %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+"""
+leewayFactor: "1.1"
+costFn: "lambda pos: 2 ** pos[0]"
diff --git a/search/test_cases/q3/ucs_4_testSearch.solution b/search/test_cases/q3/ucs_4_testSearch.solution
new file mode 100644
index 0000000..b8c5303
--- /dev/null
+++ b/search/test_cases/q3/ucs_4_testSearch.solution
@@ -0,0 +1,12 @@
+# This is the solution file for test_cases/q3/ucs_4_testSearch.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+# Number of nodes expanded must be with a factor of 2.0 of the numbers below.
+solution: """
+West East East South South West West
+"""
+expanded_nodes: "14"
+rev_solution: """
+West East East South South West West
+"""
+rev_expanded_nodes: "13"
diff --git a/search/test_cases/q3/ucs_4_testSearch.test b/search/test_cases/q3/ucs_4_testSearch.test
new file mode 100644
index 0000000..a16c6d8
--- /dev/null
+++ b/search/test_cases/q3/ucs_4_testSearch.test
@@ -0,0 +1,16 @@
+class: "PacmanSearchTest"
+algorithm: "uniformCostSearch"
+points: "0.5"
+
+# The following specifies the layout to be used 
+layoutName: "testSearch"
+layout: """
+%%%%%
+%.P %
+%%% %
+%.  %
+%%%%%
+"""
+searchProblemClass: "FoodSearchProblem"
+leewayFactor: "2"
+
diff --git a/search/test_cases/q3/ucs_5_goalAtDequeue.solution b/search/test_cases/q3/ucs_5_goalAtDequeue.solution
new file mode 100644
index 0000000..7d6c982
--- /dev/null
+++ b/search/test_cases/q3/ucs_5_goalAtDequeue.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q3/ucs_5_goalAtDequeue.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "1:A->B 0:B->C 0:C->G"
+expanded_states: "A B C"
+rev_solution: "1:A->B 0:B->C 0:C->G"
+rev_expanded_states: "A B C"
diff --git a/search/test_cases/q3/ucs_5_goalAtDequeue.test b/search/test_cases/q3/ucs_5_goalAtDequeue.test
new file mode 100644
index 0000000..72b35bc
--- /dev/null
+++ b/search/test_cases/q3/ucs_5_goalAtDequeue.test
@@ -0,0 +1,29 @@
+class: "GraphSearchTest"
+algorithm: "uniformCostSearch"
+
+diagram: """
+    1      1      1
+*A ---> B ---> C ---> [G]
+ |                     ^
+ |         10          |
+ \---------------------/
+
+A is the start state, G is the goal.  Arrows mark possible state 
+transitions.  The number next to the arrow is the cost of that transition.
+
+If you fail this test case, you may be incorrectly testing if a node is a goal 
+before adding it into the queue, instead of testing when you remove the node 
+from the queue.  See the algorithm pseudocode in lecture.
+"""
+
+graph: """
+start_state: A
+goal_states: G
+A 0:A->G G 10.0
+A 1:A->B B 1.0
+B 0:B->C C 1.0
+C 0:C->G G 1.0
+"""
+# We only care about the solution, not the expansion order.
+exactExpansionOrder: "False"
+
diff --git a/search/test_cases/q4/CONFIG b/search/test_cases/q4/CONFIG
new file mode 100644
index 0000000..b24223d
--- /dev/null
+++ b/search/test_cases/q4/CONFIG
@@ -0,0 +1,2 @@
+class: "PassAllTestsQuestion"
+max_points: "3"
\ No newline at end of file
diff --git a/search/test_cases/q4/astar_0.solution b/search/test_cases/q4/astar_0.solution
new file mode 100644
index 0000000..459cadd
--- /dev/null
+++ b/search/test_cases/q4/astar_0.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q4/astar_0.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "Right Down Down"
+expanded_states: "A B D C G"
+rev_solution: "Right Down Down"
+rev_expanded_states: "A B D C G"
diff --git a/search/test_cases/q4/astar_0.test b/search/test_cases/q4/astar_0.test
new file mode 100644
index 0000000..9b3b539
--- /dev/null
+++ b/search/test_cases/q4/astar_0.test
@@ -0,0 +1,39 @@
+class: "GraphSearchTest"
+algorithm: "aStarSearch"
+
+diagram: """
+          C
+          ^
+          | 2
+     2    V   4 
+*A <----> B -----> [H]
+          | 
+     1.5  V  2.5
+ G <----- D -----> E
+          |
+        2 | 
+          V
+         [F]
+
+A is the start state, F and H is the goal.  Arrows mark possible state 
+transitions.  The number next to the arrow is the cost of that transition.
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: H F
+A Right B 2.0
+B Right H 4.0
+B Down D 1.0
+B Up C 2.0
+B Left A 2.0
+C Down B 2.0
+D Right E 2.5
+D Down F 2.0
+D Left G 1.5
+"""
+
diff --git a/search/test_cases/q4/astar_1_graph_heuristic.solution b/search/test_cases/q4/astar_1_graph_heuristic.solution
new file mode 100644
index 0000000..7767c27
--- /dev/null
+++ b/search/test_cases/q4/astar_1_graph_heuristic.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q4/astar_1_graph_heuristic.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "0 0 2"
+expanded_states: "S A D C"
+rev_solution: "0 0 2"
+rev_expanded_states: "S A D C"
diff --git a/search/test_cases/q4/astar_1_graph_heuristic.test b/search/test_cases/q4/astar_1_graph_heuristic.test
new file mode 100644
index 0000000..b5afd79
--- /dev/null
+++ b/search/test_cases/q4/astar_1_graph_heuristic.test
@@ -0,0 +1,54 @@
+class: "GraphSearchTest"
+algorithm: "aStarSearch"
+
+diagram: """
+     2     3     2
+  S --- A --- C ---> G
+  | \       /       ^
+3 |  \ 5   / 1     / 
+  |   \   /       / 
+  B --- D -------/
+     4         5  
+
+S is the start state, G is the goal.  Arrows mark possible state 
+transitions.  The number next to the arrow is the cost of that transition.
+
+The heuristic value of each state is:
+	S 6.0
+	A 2.5
+	B 5.25
+	C 1.125
+	D 1.0625
+	G 0
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: S
+goal_states: G
+S 0 A 2.0
+S 1 B 3.0
+S 2 D 5.0
+A 0 C 3.0
+A 1 S 2.0
+B 0 D 4.0
+B 1 S 3.0
+C 0 A 3.0
+C 1 D 1.0
+C 2 G 2.0
+D 0 B 4.0
+D 1 C 1.0
+D 2 G 5.0
+D 3 S 5.0
+"""
+heuristic: """
+S 6.0
+A 2.5
+B 5.25
+C 1.125
+D 1.0625
+G 0
+"""
diff --git a/search/test_cases/q4/astar_2_manhattan.solution b/search/test_cases/q4/astar_2_manhattan.solution
new file mode 100644
index 0000000..65bf5f5
--- /dev/null
+++ b/search/test_cases/q4/astar_2_manhattan.solution
@@ -0,0 +1,22 @@
+# This is the solution file for test_cases/q4/astar_2_manhattan.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+# Number of nodes expanded must be with a factor of 1.1 of the numbers below.
+solution: """
+West West West West West West West West West South South East East
+South South South West West West North West West West West South South
+South East East East East East East East South South South South South
+South South West West West West West West West West West West West
+West West West West West West South West West West West West West West
+West West
+"""
+expanded_nodes: "221"
+rev_solution: """
+West West West West West West West West West South South East East
+South South South West West West North West West West West South South
+South East East East East East East East South South South South South
+South South West West West West West West West West West West West
+West West West West West West South West West West West West West West
+West West
+"""
+rev_expanded_nodes: "221"
diff --git a/search/test_cases/q4/astar_2_manhattan.test b/search/test_cases/q4/astar_2_manhattan.test
new file mode 100644
index 0000000..e936195
--- /dev/null
+++ b/search/test_cases/q4/astar_2_manhattan.test
@@ -0,0 +1,27 @@
+class: "PacmanSearchTest"
+algorithm: "aStarSearch"
+
+# The following specifies the layout to be used 
+layoutName: "mediumMaze"
+layout: """
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                 P%
+% %%%%%%%%%%%%%%%%%%%%%%% %%%%%%%% %
+% %%   %   %      %%%%%%%   %%     %
+% %% % % % % %%%% %%%%%%%%% %% %%%%%
+% %% % % % %             %% %%     %
+% %% % % % % % %%%%  %%%    %%%%%% %
+% %  % % %   %    %% %%%%%%%%      %
+% %% % % %%%%%%%% %%        %% %%%%%
+% %% %   %%       %%%%%%%%% %%     %
+%    %%%%%% %%%%%%%      %% %%%%%% %
+%%%%%%      %       %%%% %% %      %
+%      %%%%%% %%%%% %    %% %% %%%%%
+% %%%%%%      %       %%%%% %%     %
+%        %%%%%% %%%%%%%%%%% %%  %% %
+%%%%%%%%%%                  %%%%%% %
+%.         %%%%%%%%%%%%%%%%        %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+"""
+leewayFactor: "1.1"
+heuristic: "manhattanHeuristic"
diff --git a/search/test_cases/q4/astar_3_goalAtDequeue.solution b/search/test_cases/q4/astar_3_goalAtDequeue.solution
new file mode 100644
index 0000000..edb3502
--- /dev/null
+++ b/search/test_cases/q4/astar_3_goalAtDequeue.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q4/astar_3_goalAtDequeue.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "1:A->B 0:B->C 0:C->G"
+expanded_states: "A B C"
+rev_solution: "1:A->B 0:B->C 0:C->G"
+rev_expanded_states: "A B C"
diff --git a/search/test_cases/q4/astar_3_goalAtDequeue.test b/search/test_cases/q4/astar_3_goalAtDequeue.test
new file mode 100644
index 0000000..c4d1903
--- /dev/null
+++ b/search/test_cases/q4/astar_3_goalAtDequeue.test
@@ -0,0 +1,29 @@
+class: "GraphSearchTest"
+algorithm: "aStarSearch"
+
+diagram: """
+    1      1      1
+*A ---> B ---> C ---> [G]
+ |                     ^
+ |         10          |
+ \---------------------/
+
+A is the start state, G is the goal.  Arrows mark possible state 
+transitions.  The number next to the arrow is the cost of that transition.
+
+If you fail this test case, you may be incorrectly testing if a node is a goal 
+before adding it into the queue, instead of testing when you remove the node 
+from the queue.  See the algorithm pseudocode in lecture.
+"""
+
+graph: """
+start_state: A
+goal_states: G
+A 0:A->G G 10.0
+A 1:A->B B 1.0
+B 0:B->C C 1.0
+C 0:C->G G 1.0
+"""
+# We only care about the solution, not the expansion order.
+exactExpansionOrder: "False"
+
diff --git a/search/test_cases/q4/graph_backtrack.solution b/search/test_cases/q4/graph_backtrack.solution
new file mode 100644
index 0000000..fc51794
--- /dev/null
+++ b/search/test_cases/q4/graph_backtrack.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q4/graph_backtrack.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "1:A->C 0:C->G"
+expanded_states: "A B C D"
+rev_solution: "1:A->C 0:C->G"
+rev_expanded_states: "A B C D"
diff --git a/search/test_cases/q4/graph_backtrack.test b/search/test_cases/q4/graph_backtrack.test
new file mode 100644
index 0000000..84e0126
--- /dev/null
+++ b/search/test_cases/q4/graph_backtrack.test
@@ -0,0 +1,32 @@
+class: "GraphSearchTest"
+algorithm: "aStarSearch"
+
+diagram: """
+ B   
+ ^
+ |
+*A --> C --> G
+ |
+ V
+ D
+
+A is the start state, G is the goal.  Arrows mark 
+possible state transitions.  This tests whether
+you extract the sequence of actions correctly even
+if your search backtracks.  If you fail this, your
+nodes are not correctly tracking the sequences of
+actions required to reach them.
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: G
+A 0:A->B B 1.0
+A 1:A->C C 2.0
+A 2:A->D D 4.0
+C 0:C->G G 8.0
+"""
diff --git a/search/test_cases/q4/graph_manypaths.solution b/search/test_cases/q4/graph_manypaths.solution
new file mode 100644
index 0000000..0caa767
--- /dev/null
+++ b/search/test_cases/q4/graph_manypaths.solution
@@ -0,0 +1,7 @@
+# This is the solution file for test_cases/q4/graph_manypaths.test.
+# This solution is designed to support both right-to-left
+# and left-to-right implementations.
+solution: "1:A->C 0:C->D 1:D->F 0:F->G"
+expanded_states: "A B1 C B2 D E1 F E2"
+rev_solution: "1:A->C 0:C->D 1:D->F 0:F->G"
+rev_expanded_states: "A B1 C B2 D E1 F E2"
diff --git a/search/test_cases/q4/graph_manypaths.test b/search/test_cases/q4/graph_manypaths.test
new file mode 100644
index 0000000..82fdf87
--- /dev/null
+++ b/search/test_cases/q4/graph_manypaths.test
@@ -0,0 +1,39 @@
+class: "GraphSearchTest"
+algorithm: "aStarSearch"
+
+diagram: """
+    B1          E1
+   ^  \        ^  \
+  /    V      /    V
+*A --> C --> D --> F --> [G]
+  \    ^      \    ^
+   V  /        V  /
+    B2          E2
+
+A is the start state, G is the goal.  Arrows mark 
+possible state transitions.  This graph has multiple
+paths to the goal, where nodes with the same state 
+are added to the fringe multiple times before they
+are expanded.
+"""
+# The following section specifies the search problem and the solution.
+# The graph is specified by first the set of start states, followed by
+# the set of goal states, and lastly by the state transitions which are
+# of the form: 
+#         
+graph: """
+start_state: A
+goal_states: G
+A 0:A->B1 B1 1.0
+A 1:A->C C 2.0
+A 2:A->B2 B2 4.0
+B1 0:B1->C C 8.0
+B2 0:B2->C C 16.0
+C 0:C->D D 32.0
+D 0:D->E1 E1 64.0
+D 1:D->F F 128.0
+D 2:D->E2 E2 256.0
+E1 0:E1->F F 512.0
+E2 0:E2->F F 1024.0
+F 0:F->G G 2048.0
+"""
diff --git a/search/test_cases/q5/CONFIG b/search/test_cases/q5/CONFIG
new file mode 100644
index 0000000..e7c6582
--- /dev/null
+++ b/search/test_cases/q5/CONFIG
@@ -0,0 +1,3 @@
+class: "PassAllTestsQuestion"
+max_points: "3"
+depends: "q2"
\ No newline at end of file
diff --git a/search/test_cases/q5/corner_tiny_corner.solution b/search/test_cases/q5/corner_tiny_corner.solution
new file mode 100644
index 0000000..161bf15
--- /dev/null
+++ b/search/test_cases/q5/corner_tiny_corner.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q5/corner_tiny_corner.test.
+solution_length: "28"
diff --git a/search/test_cases/q5/corner_tiny_corner.test b/search/test_cases/q5/corner_tiny_corner.test
new file mode 100644
index 0000000..823bd47
--- /dev/null
+++ b/search/test_cases/q5/corner_tiny_corner.test
@@ -0,0 +1,14 @@
+class: "CornerProblemTest"
+
+layoutName: "tinyCorner"
+layout: """
+%%%%%%%%
+%.    .%
+%   P  %
+% %%%% %
+% %    %
+% % %%%%
+%.%   .%
+%%%%%%%%
+"""
+
diff --git a/search/test_cases/q6/CONFIG b/search/test_cases/q6/CONFIG
new file mode 100644
index 0000000..b76e0eb
--- /dev/null
+++ b/search/test_cases/q6/CONFIG
@@ -0,0 +1,3 @@
+class: "Q6PartialCreditQuestion"
+max_points: "3"
+depends: "q4"
\ No newline at end of file
diff --git a/search/test_cases/q6/corner_sanity_1.solution b/search/test_cases/q6/corner_sanity_1.solution
new file mode 100644
index 0000000..4385d9b
--- /dev/null
+++ b/search/test_cases/q6/corner_sanity_1.solution
@@ -0,0 +1,7 @@
+# In order for a heuristic to be admissible, the value
+# of the heuristic must be less at each state than the
+# true cost of the optimal path from that state to a goal.
+cost: "8"
+path: """
+North South South East East East North North
+"""
diff --git a/search/test_cases/q6/corner_sanity_1.test b/search/test_cases/q6/corner_sanity_1.test
new file mode 100644
index 0000000..93379ac
--- /dev/null
+++ b/search/test_cases/q6/corner_sanity_1.test
@@ -0,0 +1,12 @@
+class: "CornerHeuristicSanity"
+points: "1"
+
+# The following specifies the layout to be used 
+layout: """
+%%%%%%
+%.  .%
+%P   %
+%.  .%
+%%%%%%
+"""
+
diff --git a/search/test_cases/q6/corner_sanity_2.solution b/search/test_cases/q6/corner_sanity_2.solution
new file mode 100644
index 0000000..1aebe8a
--- /dev/null
+++ b/search/test_cases/q6/corner_sanity_2.solution
@@ -0,0 +1,7 @@
+# In order for a heuristic to be admissible, the value
+# of the heuristic must be less at each state than the
+# true cost of the optimal path from that state to a goal.
+cost: "8"
+path: """
+West North North East East East South South
+"""
diff --git a/search/test_cases/q6/corner_sanity_2.test b/search/test_cases/q6/corner_sanity_2.test
new file mode 100644
index 0000000..18184a8
--- /dev/null
+++ b/search/test_cases/q6/corner_sanity_2.test
@@ -0,0 +1,12 @@
+class: "CornerHeuristicSanity"
+points: "1"
+
+# The following specifies the layout to be used 
+layout: """
+%%%%%%
+%.  .%
+% %% %
+%.P%.%
+%%%%%%
+"""
+
diff --git a/search/test_cases/q6/corner_sanity_3.solution b/search/test_cases/q6/corner_sanity_3.solution
new file mode 100644
index 0000000..c02dd57
--- /dev/null
+++ b/search/test_cases/q6/corner_sanity_3.solution
@@ -0,0 +1,9 @@
+# In order for a heuristic to be admissible, the value
+# of the heuristic must be less at each state than the
+# true cost of the optimal path from that state to a goal.
+cost: "28"
+path: """
+South South South West West West West East East East East East North
+North North North North West West West South South South West West
+North North North
+"""
diff --git a/search/test_cases/q6/corner_sanity_3.test b/search/test_cases/q6/corner_sanity_3.test
new file mode 100644
index 0000000..8f30442
--- /dev/null
+++ b/search/test_cases/q6/corner_sanity_3.test
@@ -0,0 +1,15 @@
+class: "CornerHeuristicSanity"
+points: "1"
+
+# The following specifies the layout to be used 
+layout: """
+%%%%%%%%
+%.%   .%
+% % %  %
+% % %P %
+%   %  %
+%%%%%  %
+%.    .%
+%%%%%%%%
+"""
+
diff --git a/search/test_cases/q6/medium_corners.solution b/search/test_cases/q6/medium_corners.solution
new file mode 100644
index 0000000..913dc45
--- /dev/null
+++ b/search/test_cases/q6/medium_corners.solution
@@ -0,0 +1,16 @@
+# This solution file specifies the length of the optimal path
+# as well as the thresholds on number of nodes expanded to be
+# used in scoring.
+cost: "106"
+path: """
+North East East East East North North West West West West North North
+North North North North North North West West West West South South
+East East East East South South South South South South West West
+South South South West West East East North North North East East East
+East East East East East South South East East East East East North
+North East East North North East East North North East East East East
+South South South South East East North North East East South South
+South South South North North North North North North North West West
+North North East East North North
+"""
+thresholds: "2000 1600 1200"
diff --git a/search/test_cases/q6/medium_corners.test b/search/test_cases/q6/medium_corners.test
new file mode 100644
index 0000000..dfa0a68
--- /dev/null
+++ b/search/test_cases/q6/medium_corners.test
@@ -0,0 +1,19 @@
+class: "CornerHeuristicPacman"
+
+# The following specifies the layout to be used 
+layout: """
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%.      % % %              %.%
+%       % % %%%%%% %%%%%%% % %
+%       %        %     % %   %
+%%%%% %%%%% %%% %% %%%%% % %%%
+%   % % % %   %    %     %   %
+% %%% % % % %%%%%%%% %%% %%% %
+%       %     %%     % % %   %
+%%% % %%%%%%% %%%% %%% % % % %
+% %           %%     %     % %
+% % %%%%% % %%%% % %%% %%% % %
+%   %     %      % %   % %%% %
+%.  %P%%%%%      % %%% %    .%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+"""
diff --git a/search/test_cases/q7/CONFIG b/search/test_cases/q7/CONFIG
new file mode 100644
index 0000000..ee85183
--- /dev/null
+++ b/search/test_cases/q7/CONFIG
@@ -0,0 +1,3 @@
+class: "PartialCreditQuestion"
+max_points: "4"
+depends: "q4"
\ No newline at end of file
diff --git a/search/test_cases/q7/food_heuristic_1.solution b/search/test_cases/q7/food_heuristic_1.solution
new file mode 100644
index 0000000..7a287f8
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_1.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_1.test.
+solution_cost: "0"
diff --git a/search/test_cases/q7/food_heuristic_1.test b/search/test_cases/q7/food_heuristic_1.test
new file mode 100644
index 0000000..7545a7a
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_1.test
@@ -0,0 +1,13 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 1"
+layout: """
+%%%%%%
+%    %
+%    %
+%P   %
+%%%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_10.solution b/search/test_cases/q7/food_heuristic_10.solution
new file mode 100644
index 0000000..1917f05
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_10.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_10.test.
+solution_cost: "7"
diff --git a/search/test_cases/q7/food_heuristic_10.test b/search/test_cases/q7/food_heuristic_10.test
new file mode 100644
index 0000000..212c7bd
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_10.test
@@ -0,0 +1,13 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 10"
+layout: """
+%%%%%%%%
+%      %
+%.  P .%
+%      %
+%%%%%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_11.solution b/search/test_cases/q7/food_heuristic_11.solution
new file mode 100644
index 0000000..11c3289
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_11.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_11.test.
+solution_cost: "8"
diff --git a/search/test_cases/q7/food_heuristic_11.test b/search/test_cases/q7/food_heuristic_11.test
new file mode 100644
index 0000000..f5e6ed4
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_11.test
@@ -0,0 +1,13 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 11"
+layout: """
+%%%%%%%%
+%      %
+%   P  %
+%.  . .%
+%%%%%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_12.solution b/search/test_cases/q7/food_heuristic_12.solution
new file mode 100644
index 0000000..0edcc02
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_12.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_12.test.
+solution_cost: "1"
diff --git a/search/test_cases/q7/food_heuristic_12.test b/search/test_cases/q7/food_heuristic_12.test
new file mode 100644
index 0000000..cc99a25
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_12.test
@@ -0,0 +1,13 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 12"
+layout: """
+%%%%%%%%
+%      %
+%    P.%
+%      %
+%%%%%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_13.solution b/search/test_cases/q7/food_heuristic_13.solution
new file mode 100644
index 0000000..c25d50b
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_13.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_13.test.
+solution_cost: "5"
diff --git a/search/test_cases/q7/food_heuristic_13.test b/search/test_cases/q7/food_heuristic_13.test
new file mode 100644
index 0000000..09d6f1e
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_13.test
@@ -0,0 +1,13 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 13"
+layout: """
+%%%%%%%%
+%      %
+%P.   .%
+%      %
+%%%%%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_14.solution b/search/test_cases/q7/food_heuristic_14.solution
new file mode 100644
index 0000000..e6cc475
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_14.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_14.test.
+solution_cost: "31"
diff --git a/search/test_cases/q7/food_heuristic_14.test b/search/test_cases/q7/food_heuristic_14.test
new file mode 100644
index 0000000..58982e3
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_14.test
@@ -0,0 +1,19 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 14"
+layout: """
+%%%%%%%%%%
+%        %
+% ...%...%
+% .%.%.%.%
+% .%.%.%.%
+% .%.%.%.%
+% .%.%.%.%
+% .%.%.%.%
+%P.%...%.%
+%        %
+%%%%%%%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_15.solution b/search/test_cases/q7/food_heuristic_15.solution
new file mode 100644
index 0000000..4eca0f1
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_15.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_15.test.
+solution_cost: "21"
diff --git a/search/test_cases/q7/food_heuristic_15.test b/search/test_cases/q7/food_heuristic_15.test
new file mode 100644
index 0000000..df605c1
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_15.test
@@ -0,0 +1,32 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 15"
+layout: """
+%%%
+% %
+% %
+% %
+% %
+% %
+%.%
+%.%
+% %
+% %
+% %
+% %
+% %
+% %
+% %
+%.%
+% %
+%P%
+% %
+% %
+% %
+% %
+%.%
+%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_16.solution b/search/test_cases/q7/food_heuristic_16.solution
new file mode 100644
index 0000000..8d89992
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_16.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_16.test.
+solution_cost: "7"
diff --git a/search/test_cases/q7/food_heuristic_16.test b/search/test_cases/q7/food_heuristic_16.test
new file mode 100644
index 0000000..762b433
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_16.test
@@ -0,0 +1,15 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 16"
+layout: """
+%%%%
+% .%
+%  %
+%P %
+%  %
+% .%
+%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_17.solution b/search/test_cases/q7/food_heuristic_17.solution
new file mode 100644
index 0000000..63a9a1b
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_17.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_17.test.
+solution_cost: "16"
diff --git a/search/test_cases/q7/food_heuristic_17.test b/search/test_cases/q7/food_heuristic_17.test
new file mode 100644
index 0000000..a923f67
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_17.test
@@ -0,0 +1,14 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 17"
+layout: """
+%%%%%%%%
+%.%....%
+%.% %%.%
+%.%P%%.%
+%...  .%
+%%%%%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_2.solution b/search/test_cases/q7/food_heuristic_2.solution
new file mode 100644
index 0000000..ca5aba1
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_2.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_2.test.
+solution_cost: "0"
diff --git a/search/test_cases/q7/food_heuristic_2.test b/search/test_cases/q7/food_heuristic_2.test
new file mode 100644
index 0000000..956e75d
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_2.test
@@ -0,0 +1,32 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 2"
+layout: """
+%%%
+% %
+% %
+% %
+% %
+% %
+% %
+% %
+% %
+% %
+% %
+% %
+% %
+% %
+% %
+% %
+% %
+%P%
+% %
+% %
+% %
+% %
+% %
+%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_3.solution b/search/test_cases/q7/food_heuristic_3.solution
new file mode 100644
index 0000000..d1694b5
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_3.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_3.test.
+solution_cost: "0"
diff --git a/search/test_cases/q7/food_heuristic_3.test b/search/test_cases/q7/food_heuristic_3.test
new file mode 100644
index 0000000..250a8b1
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_3.test
@@ -0,0 +1,15 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 3"
+layout: """
+%%%%
+%  %
+%  %
+%P %
+%  %
+%  %
+%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_4.solution b/search/test_cases/q7/food_heuristic_4.solution
new file mode 100644
index 0000000..6e1e82a
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_4.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_4.test.
+solution_cost: "0"
diff --git a/search/test_cases/q7/food_heuristic_4.test b/search/test_cases/q7/food_heuristic_4.test
new file mode 100644
index 0000000..ed86a0c
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_4.test
@@ -0,0 +1,14 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 4"
+layout: """
+%%%%%%%%
+% %    %
+% % %% %
+% %P%% %
+%      %
+%%%%%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_5.solution b/search/test_cases/q7/food_heuristic_5.solution
new file mode 100644
index 0000000..779e9e6
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_5.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_5.test.
+solution_cost: "11"
diff --git a/search/test_cases/q7/food_heuristic_5.test b/search/test_cases/q7/food_heuristic_5.test
new file mode 100644
index 0000000..1f44c48
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_5.test
@@ -0,0 +1,13 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 5"
+layout: """
+%%%%%%
+%....%
+%....%
+%P...%
+%%%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_6.solution b/search/test_cases/q7/food_heuristic_6.solution
new file mode 100644
index 0000000..906b510
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_6.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_6.test.
+solution_cost: "5"
diff --git a/search/test_cases/q7/food_heuristic_6.test b/search/test_cases/q7/food_heuristic_6.test
new file mode 100644
index 0000000..01d7f32
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_6.test
@@ -0,0 +1,13 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 6"
+layout: """
+%%%%%%
+%   .%
+%.P..%
+%    %
+%%%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_7.solution b/search/test_cases/q7/food_heuristic_7.solution
new file mode 100644
index 0000000..5994a7b
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_7.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_7.test.
+solution_cost: "7"
diff --git a/search/test_cases/q7/food_heuristic_7.test b/search/test_cases/q7/food_heuristic_7.test
new file mode 100644
index 0000000..b1db372
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_7.test
@@ -0,0 +1,13 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 7"
+layout: """
+%%%%%%%
+%    .%
+%. P..%
+%     %
+%%%%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_8.solution b/search/test_cases/q7/food_heuristic_8.solution
new file mode 100644
index 0000000..0e4fb08
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_8.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_8.test.
+solution_cost: "5"
diff --git a/search/test_cases/q7/food_heuristic_8.test b/search/test_cases/q7/food_heuristic_8.test
new file mode 100644
index 0000000..b9430af
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_8.test
@@ -0,0 +1,13 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 8"
+layout: """
+%%%%%%
+%   .%
+%   .%
+%P  .%
+%%%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_9.solution b/search/test_cases/q7/food_heuristic_9.solution
new file mode 100644
index 0000000..1470d9a
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_9.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_9.test.
+solution_cost: "6"
diff --git a/search/test_cases/q7/food_heuristic_9.test b/search/test_cases/q7/food_heuristic_9.test
new file mode 100644
index 0000000..799b41d
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_9.test
@@ -0,0 +1,13 @@
+class: "HeuristicTest"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "Test 9"
+layout: """
+%%%%%%
+% %. %
+% %%.%
+%P. .%
+%%%%%%
+"""
+
diff --git a/search/test_cases/q7/food_heuristic_grade_tricky.solution b/search/test_cases/q7/food_heuristic_grade_tricky.solution
new file mode 100644
index 0000000..cd6fd7d
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_grade_tricky.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q7/food_heuristic_grade_tricky.test.
+# File intentionally blank.
diff --git a/search/test_cases/q7/food_heuristic_grade_tricky.test b/search/test_cases/q7/food_heuristic_grade_tricky.test
new file mode 100644
index 0000000..081fb0d
--- /dev/null
+++ b/search/test_cases/q7/food_heuristic_grade_tricky.test
@@ -0,0 +1,19 @@
+class: "HeuristicGrade"
+
+heuristic: "foodHeuristic"
+searchProblemClass: "FoodSearchProblem"
+layoutName: "trickySearch"
+layout: """
+%%%%%%%%%%%%%%%%%%%%
+%.           ..%   %
+%.%%.%%.%%.%%.%% % %
+%        P       % %
+%%%%%%%%%%%%%%%%%% %
+%.....             %
+%%%%%%%%%%%%%%%%%%%%
+"""
+# One point always, an extra point for each
+# threshold passed.
+basePoints: "1"
+gradingThresholds: "15000 12000 9000 7000"
+
diff --git a/search/test_cases/q8/CONFIG b/search/test_cases/q8/CONFIG
new file mode 100644
index 0000000..b24223d
--- /dev/null
+++ b/search/test_cases/q8/CONFIG
@@ -0,0 +1,2 @@
+class: "PassAllTestsQuestion"
+max_points: "3"
\ No newline at end of file
diff --git a/search/test_cases/q8/closest_dot_1.solution b/search/test_cases/q8/closest_dot_1.solution
new file mode 100644
index 0000000..300fc25
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_1.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q8/closest_dot_1.test.
+solution_length: "1"
diff --git a/search/test_cases/q8/closest_dot_1.test b/search/test_cases/q8/closest_dot_1.test
new file mode 100644
index 0000000..672989f
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_1.test
@@ -0,0 +1,11 @@
+class: "ClosestDotTest"
+
+layoutName: "Test 1"
+layout: """
+%%%%%%
+%....%
+%....%
+%P...%
+%%%%%%
+"""
+
diff --git a/search/test_cases/q8/closest_dot_10.solution b/search/test_cases/q8/closest_dot_10.solution
new file mode 100644
index 0000000..174b5dd
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_10.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q8/closest_dot_10.test.
+solution_length: "1"
diff --git a/search/test_cases/q8/closest_dot_10.test b/search/test_cases/q8/closest_dot_10.test
new file mode 100644
index 0000000..b1e0f33
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_10.test
@@ -0,0 +1,17 @@
+class: "ClosestDotTest"
+
+layoutName: "Test 10"
+layout: """
+%%%%%%%%%%
+%        %
+% ...%...%
+% .%.%.%.%
+% .%.%.%.%
+% .%.%.%.%
+% .%.%.%.%
+% .%.%.%.%
+%P.%...%.%
+%        %
+%%%%%%%%%%
+"""
+
diff --git a/search/test_cases/q8/closest_dot_11.solution b/search/test_cases/q8/closest_dot_11.solution
new file mode 100644
index 0000000..80bbe38
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_11.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q8/closest_dot_11.test.
+solution_length: "2"
diff --git a/search/test_cases/q8/closest_dot_11.test b/search/test_cases/q8/closest_dot_11.test
new file mode 100644
index 0000000..0310a1e
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_11.test
@@ -0,0 +1,30 @@
+class: "ClosestDotTest"
+
+layoutName: "Test 11"
+layout: """
+%%%
+% %
+% %
+% %
+% %
+% %
+%.%
+%.%
+% %
+% %
+% %
+% %
+% %
+% %
+% %
+%.%
+% %
+%P%
+% %
+% %
+% %
+% %
+%.%
+%%%
+"""
+
diff --git a/search/test_cases/q8/closest_dot_12.solution b/search/test_cases/q8/closest_dot_12.solution
new file mode 100644
index 0000000..6f38bcb
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_12.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q8/closest_dot_12.test.
+solution_length: "3"
diff --git a/search/test_cases/q8/closest_dot_12.test b/search/test_cases/q8/closest_dot_12.test
new file mode 100644
index 0000000..a17b628
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_12.test
@@ -0,0 +1,13 @@
+class: "ClosestDotTest"
+
+layoutName: "Test 12"
+layout: """
+%%%%
+% .%
+%  %
+%P %
+%  %
+% .%
+%%%%
+"""
+
diff --git a/search/test_cases/q8/closest_dot_13.solution b/search/test_cases/q8/closest_dot_13.solution
new file mode 100644
index 0000000..7afa908
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_13.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q8/closest_dot_13.test.
+solution_length: "1"
diff --git a/search/test_cases/q8/closest_dot_13.test b/search/test_cases/q8/closest_dot_13.test
new file mode 100644
index 0000000..87c423d
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_13.test
@@ -0,0 +1,12 @@
+class: "ClosestDotTest"
+
+layoutName: "Test 13"
+layout: """
+%%%%%%%%
+%.%....%
+%.% %%.%
+%.%P%%.%
+%...  .%
+%%%%%%%%
+"""
+
diff --git a/search/test_cases/q8/closest_dot_2.solution b/search/test_cases/q8/closest_dot_2.solution
new file mode 100644
index 0000000..16d75de
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_2.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q8/closest_dot_2.test.
+solution_length: "1"
diff --git a/search/test_cases/q8/closest_dot_2.test b/search/test_cases/q8/closest_dot_2.test
new file mode 100644
index 0000000..4b59602
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_2.test
@@ -0,0 +1,11 @@
+class: "ClosestDotTest"
+
+layoutName: "Test 2"
+layout: """
+%%%%%%
+%   .%
+%.P..%
+%    %
+%%%%%%
+"""
+
diff --git a/search/test_cases/q8/closest_dot_3.solution b/search/test_cases/q8/closest_dot_3.solution
new file mode 100644
index 0000000..cbd5974
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_3.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q8/closest_dot_3.test.
+solution_length: "1"
diff --git a/search/test_cases/q8/closest_dot_3.test b/search/test_cases/q8/closest_dot_3.test
new file mode 100644
index 0000000..aa2a3af
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_3.test
@@ -0,0 +1,11 @@
+class: "ClosestDotTest"
+
+layoutName: "Test 3"
+layout: """
+%%%%%%%
+%    .%
+%. P..%
+%     %
+%%%%%%%
+"""
+
diff --git a/search/test_cases/q8/closest_dot_4.solution b/search/test_cases/q8/closest_dot_4.solution
new file mode 100644
index 0000000..ca520b5
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_4.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q8/closest_dot_4.test.
+solution_length: "3"
diff --git a/search/test_cases/q8/closest_dot_4.test b/search/test_cases/q8/closest_dot_4.test
new file mode 100644
index 0000000..8499f6d
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_4.test
@@ -0,0 +1,11 @@
+class: "ClosestDotTest"
+
+layoutName: "Test 4"
+layout: """
+%%%%%%
+%   .%
+%   .%
+%P  .%
+%%%%%%
+"""
+
diff --git a/search/test_cases/q8/closest_dot_5.solution b/search/test_cases/q8/closest_dot_5.solution
new file mode 100644
index 0000000..5c526a2
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_5.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q8/closest_dot_5.test.
+solution_length: "1"
diff --git a/search/test_cases/q8/closest_dot_5.test b/search/test_cases/q8/closest_dot_5.test
new file mode 100644
index 0000000..dfaee3d
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_5.test
@@ -0,0 +1,11 @@
+class: "ClosestDotTest"
+
+layoutName: "Test 5"
+layout: """
+%%%%%%
+% %. %
+% %%.%
+%P. .%
+%%%%%%
+"""
+
diff --git a/search/test_cases/q8/closest_dot_6.solution b/search/test_cases/q8/closest_dot_6.solution
new file mode 100644
index 0000000..b06468a
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_6.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q8/closest_dot_6.test.
+solution_length: "2"
diff --git a/search/test_cases/q8/closest_dot_6.test b/search/test_cases/q8/closest_dot_6.test
new file mode 100644
index 0000000..bc50c57
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_6.test
@@ -0,0 +1,11 @@
+class: "ClosestDotTest"
+
+layoutName: "Test 6"
+layout: """
+%%%%%%%%
+%      %
+%.  P .%
+%      %
+%%%%%%%%
+"""
+
diff --git a/search/test_cases/q8/closest_dot_7.solution b/search/test_cases/q8/closest_dot_7.solution
new file mode 100644
index 0000000..3231b28
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_7.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q8/closest_dot_7.test.
+solution_length: "1"
diff --git a/search/test_cases/q8/closest_dot_7.test b/search/test_cases/q8/closest_dot_7.test
new file mode 100644
index 0000000..746e89a
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_7.test
@@ -0,0 +1,11 @@
+class: "ClosestDotTest"
+
+layoutName: "Test 7"
+layout: """
+%%%%%%%%
+%      %
+%   P  %
+%.  . .%
+%%%%%%%%
+"""
+
diff --git a/search/test_cases/q8/closest_dot_8.solution b/search/test_cases/q8/closest_dot_8.solution
new file mode 100644
index 0000000..646e621
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_8.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q8/closest_dot_8.test.
+solution_length: "1"
diff --git a/search/test_cases/q8/closest_dot_8.test b/search/test_cases/q8/closest_dot_8.test
new file mode 100644
index 0000000..c266ae1
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_8.test
@@ -0,0 +1,11 @@
+class: "ClosestDotTest"
+
+layoutName: "Test 8"
+layout: """
+%%%%%%%%
+%      %
+%    P.%
+%      %
+%%%%%%%%
+"""
+
diff --git a/search/test_cases/q8/closest_dot_9.solution b/search/test_cases/q8/closest_dot_9.solution
new file mode 100644
index 0000000..6c94aa5
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_9.solution
@@ -0,0 +1,2 @@
+# This is the solution file for test_cases/q8/closest_dot_9.test.
+solution_length: "1"
diff --git a/search/test_cases/q8/closest_dot_9.test b/search/test_cases/q8/closest_dot_9.test
new file mode 100644
index 0000000..da078de
--- /dev/null
+++ b/search/test_cases/q8/closest_dot_9.test
@@ -0,0 +1,11 @@
+class: "ClosestDotTest"
+
+layoutName: "Test 9"
+layout: """
+%%%%%%%%
+%      %
+%P.   .%
+%      %
+%%%%%%%%
+"""
+
diff --git a/search/textDisplay.py b/search/textDisplay.py
new file mode 100644
index 0000000..8e25a46
--- /dev/null
+++ b/search/textDisplay.py
@@ -0,0 +1,81 @@
+# textDisplay.py
+# --------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+import time
+try: 
+    import pacman
+except:
+    pass
+
+DRAW_EVERY = 1
+SLEEP_TIME = 0 # This can be overwritten by __init__
+DISPLAY_MOVES = False
+QUIET = False # Supresses output
+
+class NullGraphics:
+    def initialize(self, state, isBlue = False):
+        pass
+
+    def update(self, state):
+        pass
+
+    def checkNullDisplay(self):
+        return True
+
+    def pause(self):
+        time.sleep(SLEEP_TIME)
+
+    def draw(self, state):
+        print(state)
+
+    def updateDistributions(self, dist):
+        pass
+
+    def finish(self):
+        pass
+
+class PacmanGraphics:
+    def __init__(self, speed=None):
+        if speed != None:
+            global SLEEP_TIME
+            SLEEP_TIME = speed
+
+    def initialize(self, state, isBlue = False):
+        self.draw(state)
+        self.pause()
+        self.turn = 0
+        self.agentCounter = 0
+
+    def update(self, state):
+        numAgents = len(state.agentStates)
+        self.agentCounter = (self.agentCounter + 1) % numAgents
+        if self.agentCounter == 0:
+            self.turn += 1
+            if DISPLAY_MOVES:
+                ghosts = [pacman.nearestPoint(state.getGhostPosition(i)) for i in range(1, numAgents)]
+                print("%4d) P: %-8s" % (self.turn, str(pacman.nearestPoint(state.getPacmanPosition()))),'| Score: %-5d' % state.score,'| Ghosts:', ghosts)
+            if self.turn % DRAW_EVERY == 0:
+                self.draw(state)
+                self.pause()
+        if state._win or state._lose:
+            self.draw(state)
+
+    def pause(self):
+        time.sleep(SLEEP_TIME)
+
+    def draw(self, state):
+        print(state)
+
+    def finish(self):
+        pass
diff --git a/search/util.py b/search/util.py
new file mode 100644
index 0000000..d81667f
--- /dev/null
+++ b/search/util.py
@@ -0,0 +1,672 @@
+# util.py
+# -------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+# util.py
+# -------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+import sys
+import inspect
+import heapq, random
+
+
+class FixedRandom:
+    def __init__(self):
+        fixedState = (3, (2147483648, 507801126, 683453281, 310439348, 2597246090, \
+            2209084787, 2267831527, 979920060, 3098657677, 37650879, 807947081, 3974896263, \
+            881243242, 3100634921, 1334775171, 3965168385, 746264660, 4074750168, 500078808, \
+            776561771, 702988163, 1636311725, 2559226045, 157578202, 2498342920, 2794591496, \
+            4130598723, 496985844, 2944563015, 3731321600, 3514814613, 3362575829, 3038768745, \
+            2206497038, 1108748846, 1317460727, 3134077628, 988312410, 1674063516, 746456451, \
+            3958482413, 1857117812, 708750586, 1583423339, 3466495450, 1536929345, 1137240525, \
+            3875025632, 2466137587, 1235845595, 4214575620, 3792516855, 657994358, 1241843248, \
+            1695651859, 3678946666, 1929922113, 2351044952, 2317810202, 2039319015, 460787996, \
+            3654096216, 4068721415, 1814163703, 2904112444, 1386111013, 574629867, 2654529343, \
+            3833135042, 2725328455, 552431551, 4006991378, 1331562057, 3710134542, 303171486, \
+            1203231078, 2670768975, 54570816, 2679609001, 578983064, 1271454725, 3230871056, \
+            2496832891, 2944938195, 1608828728, 367886575, 2544708204, 103775539, 1912402393, \
+            1098482180, 2738577070, 3091646463, 1505274463, 2079416566, 659100352, 839995305, \
+            1696257633, 274389836, 3973303017, 671127655, 1061109122, 517486945, 1379749962, \
+            3421383928, 3116950429, 2165882425, 2346928266, 2892678711, 2936066049, 1316407868, \
+            2873411858, 4279682888, 2744351923, 3290373816, 1014377279, 955200944, 4220990860, \
+            2386098930, 1772997650, 3757346974, 1621616438, 2877097197, 442116595, 2010480266, \
+            2867861469, 2955352695, 605335967, 2222936009, 2067554933, 4129906358, 1519608541, \
+            1195006590, 1942991038, 2736562236, 279162408, 1415982909, 4099901426, 1732201505, \
+            2934657937, 860563237, 2479235483, 3081651097, 2244720867, 3112631622, 1636991639, \
+            3860393305, 2312061927, 48780114, 1149090394, 2643246550, 1764050647, 3836789087, \
+            3474859076, 4237194338, 1735191073, 2150369208, 92164394, 756974036, 2314453957, \
+            323969533, 4267621035, 283649842, 810004843, 727855536, 1757827251, 3334960421, \
+            3261035106, 38417393, 2660980472, 1256633965, 2184045390, 811213141, 2857482069, \
+            2237770878, 3891003138, 2787806886, 2435192790, 2249324662, 3507764896, 995388363, \
+            856944153, 619213904, 3233967826, 3703465555, 3286531781, 3863193356, 2992340714, \
+            413696855, 3865185632, 1704163171, 3043634452, 2225424707, 2199018022, 3506117517, \
+            3311559776, 3374443561, 1207829628, 668793165, 1822020716, 2082656160, 1160606415, \
+            3034757648, 741703672, 3094328738, 459332691, 2702383376, 1610239915, 4162939394, \
+            557861574, 3805706338, 3832520705, 1248934879, 3250424034, 892335058, 74323433, \
+            3209751608, 3213220797, 3444035873, 3743886725, 1783837251, 610968664, 580745246, \
+            4041979504, 201684874, 2673219253, 1377283008, 3497299167, 2344209394, 2304982920, \
+            3081403782, 2599256854, 3184475235, 3373055826, 695186388, 2423332338, 222864327, \
+            1258227992, 3627871647, 3487724980, 4027953808, 3053320360, 533627073, 3026232514, \
+            2340271949, 867277230, 868513116, 2158535651, 2487822909, 3428235761, 3067196046, \
+            3435119657, 1908441839, 788668797, 3367703138, 3317763187, 908264443, 2252100381, \
+            764223334, 4127108988, 384641349, 3377374722, 1263833251, 1958694944, 3847832657, \
+            1253909612, 1096494446, 555725445, 2277045895, 3340096504, 1383318686, 4234428127, \
+            1072582179, 94169494, 1064509968, 2681151917, 2681864920, 734708852, 1338914021, \
+            1270409500, 1789469116, 4191988204, 1716329784, 2213764829, 3712538840, 919910444, \
+            1318414447, 3383806712, 3054941722, 3378649942, 1205735655, 1268136494, 2214009444, \
+            2532395133, 3232230447, 230294038, 342599089, 772808141, 4096882234, 3146662953, \
+            2784264306, 1860954704, 2675279609, 2984212876, 2466966981, 2627986059, 2985545332, \
+            2578042598, 1458940786, 2944243755, 3959506256, 1509151382, 325761900, 942251521, \
+            4184289782, 2756231555, 3297811774, 1169708099, 3280524138, 3805245319, 3227360276, \
+            3199632491, 2235795585, 2865407118, 36763651, 2441503575, 3314890374, 1755526087, \
+            17915536, 1196948233, 949343045, 3815841867, 489007833, 2654997597, 2834744136, \
+            417688687, 2843220846, 85621843, 747339336, 2043645709, 3520444394, 1825470818, \
+            647778910, 275904777, 1249389189, 3640887431, 4200779599, 323384601, 3446088641, \
+            4049835786, 1718989062, 3563787136, 44099190, 3281263107, 22910812, 1826109246, \
+            745118154, 3392171319, 1571490704, 354891067, 815955642, 1453450421, 940015623, \
+            796817754, 1260148619, 3898237757, 176670141, 1870249326, 3317738680, 448918002, \
+            4059166594, 2003827551, 987091377, 224855998, 3520570137, 789522610, 2604445123, \
+            454472869, 475688926, 2990723466, 523362238, 3897608102, 806637149, 2642229586, \
+            2928614432, 1564415411, 1691381054, 3816907227, 4082581003, 1895544448, 3728217394, \
+            3214813157, 4054301607, 1882632454, 2873728645, 3694943071, 1297991732, 2101682438, \
+            3952579552, 678650400, 1391722293, 478833748, 2976468591, 158586606, 2576499787, \
+            662690848, 3799889765, 3328894692, 2474578497, 2383901391, 1718193504, 3003184595, \
+            3630561213, 1929441113, 3848238627, 1594310094, 3040359840, 3051803867, 2462788790, \
+            954409915, 802581771, 681703307, 545982392, 2738993819, 8025358, 2827719383, \
+            770471093, 3484895980, 3111306320, 3900000891, 2116916652, 397746721, 2087689510, \
+            721433935, 1396088885, 2751612384, 1998988613, 2135074843, 2521131298, 707009172, \
+            2398321482, 688041159, 2264560137, 482388305, 207864885, 3735036991, 3490348331, \
+            1963642811, 3260224305, 3493564223, 1939428454, 1128799656, 1366012432, 2858822447, \
+            1428147157, 2261125391, 1611208390, 1134826333, 2374102525, 3833625209, 2266397263, \
+            3189115077, 770080230, 2674657172, 4280146640, 3604531615, 4235071805, 3436987249, \
+            509704467, 2582695198, 4256268040, 3391197562, 1460642842, 1617931012, 457825497, \
+            1031452907, 1330422862, 4125947620, 2280712485, 431892090, 2387410588, 2061126784, \
+            896457479, 3480499461, 2488196663, 4021103792, 1877063114, 2744470201, 1046140599, \
+            2129952955, 3583049218, 4217723693, 2720341743, 820661843, 1079873609, 3360954200, \
+            3652304997, 3335838575, 2178810636, 1908053374, 4026721976, 1793145418, 476541615, \
+            973420250, 515553040, 919292001, 2601786155, 1685119450, 3030170809, 1590676150, \
+            1665099167, 651151584, 2077190587, 957892642, 646336572, 2743719258, 866169074, \
+            851118829, 4225766285, 963748226, 799549420, 1955032629, 799460000, 2425744063, \
+            2441291571, 1928963772, 528930629, 2591962884, 3495142819, 1896021824, 901320159, \
+            3181820243, 843061941, 3338628510, 3782438992, 9515330, 1705797226, 953535929, \
+            764833876, 3202464965, 2970244591, 519154982, 3390617541, 566616744, 3438031503, \
+            1853838297, 170608755, 1393728434, 676900116, 3184965776, 1843100290, 78995357, \
+            2227939888, 3460264600, 1745705055, 1474086965, 572796246, 4081303004, 882828851, \
+            1295445825, 137639900, 3304579600, 2722437017, 4093422709, 273203373, 2666507854, \
+            3998836510, 493829981, 1623949669, 3482036755, 3390023939, 833233937, 1639668730, \
+            1499455075, 249728260, 1210694006, 3836497489, 1551488720, 3253074267, 3388238003, \
+            2372035079, 3945715164, 2029501215, 3362012634, 2007375355, 4074709820, 631485888, \
+            3135015769, 4273087084, 3648076204, 2739943601, 1374020358, 1760722448, 3773939706, \
+            1313027823, 1895251226, 4224465911, 421382535, 1141067370, 3660034846, 3393185650, \
+            1850995280, 1451917312, 3841455409, 3926840308, 1397397252, 2572864479, 2500171350, \
+            3119920613, 531400869, 1626487579, 1099320497, 407414753, 2438623324, 99073255, \
+            3175491512, 656431560, 1153671785, 236307875, 2824738046, 2320621382, 892174056, \
+            230984053, 719791226, 2718891946, 624), None)
+        self.random = random.Random()
+        self.random.setstate(fixedState)
+
+"""
+ Data structures useful for implementing SearchAgents
+"""
+
+class Stack:
+    "A container with a last-in-first-out (LIFO) queuing policy."
+    def __init__(self):
+        self.list = []
+
+    def push(self,item):
+        "Push 'item' onto the stack"
+        self.list.append(item)
+
+    def pop(self):
+        "Pop the most recently pushed item from the stack"
+        return self.list.pop()
+
+    def isEmpty(self):
+        "Returns true if the stack is empty"
+        return len(self.list) == 0
+
+class Queue:
+    "A container with a first-in-first-out (FIFO) queuing policy."
+    def __init__(self):
+        self.list = []
+
+    def push(self,item):
+        "Enqueue the 'item' into the queue"
+        self.list.insert(0,item)
+
+    def pop(self):
+        """
+          Dequeue the earliest enqueued item still in the queue. This
+          operation removes the item from the queue.
+        """
+        return self.list.pop()
+
+    def isEmpty(self):
+        "Returns true if the queue is empty"
+        return len(self.list) == 0
+
+class PriorityQueue:
+    """
+      Implements a priority queue data structure. Each inserted item
+      has a priority associated with it and the client is usually interested
+      in quick retrieval of the lowest-priority item in the queue. This
+      data structure allows O(1) access to the lowest-priority item.
+    """
+    def  __init__(self):
+        self.heap = []
+        self.count = 0
+
+    def push(self, item, priority):
+        entry = (priority, self.count, item)
+        heapq.heappush(self.heap, entry)
+        self.count += 1
+
+    def pop(self):
+        (_, _, item) = heapq.heappop(self.heap)
+        return item
+
+    def isEmpty(self):
+        return len(self.heap) == 0
+
+    def update(self, item, priority):
+        # If item already in priority queue with higher priority, update its priority and rebuild the heap.
+        # If item already in priority queue with equal or lower priority, do nothing.
+        # If item not in priority queue, do the same thing as self.push.
+        for index, (p, c, i) in enumerate(self.heap):
+            if i == item:
+                if p <= priority:
+                    break
+                del self.heap[index]
+                self.heap.append((priority, c, item))
+                heapq.heapify(self.heap)
+                break
+        else:
+            self.push(item, priority)
+
+class PriorityQueueWithFunction(PriorityQueue):
+    """
+    Implements a priority queue with the same push/pop signature of the
+    Queue and the Stack classes. This is designed for drop-in replacement for
+    those two classes. The caller has to provide a priority function, which
+    extracts each item's priority.
+    """
+    def  __init__(self, priorityFunction):
+        "priorityFunction (item) -> priority"
+        self.priorityFunction = priorityFunction      # store the priority function
+        PriorityQueue.__init__(self)        # super-class initializer
+
+    def push(self, item):
+        "Adds an item to the queue with priority from the priority function"
+        PriorityQueue.push(self, item, self.priorityFunction(item))
+
+
+def manhattanDistance( xy1, xy2 ):
+    "Returns the Manhattan distance between points xy1 and xy2"
+    return abs( xy1[0] - xy2[0] ) + abs( xy1[1] - xy2[1] )
+
+"""
+  Data structures and functions useful for various course projects
+
+  The search project should not need anything below this line.
+"""
+
+class Counter(dict):
+    """
+    A counter keeps track of counts for a set of keys.
+
+    The counter class is an extension of the standard python
+    dictionary type.  It is specialized to have number values
+    (integers or floats), and includes a handful of additional
+    functions to ease the task of counting data.  In particular,
+    all keys are defaulted to have value 0.  Using a dictionary:
+
+    a = {}
+    print(a['test'])
+
+    would give an error, while the Counter class analogue:
+
+    >>> a = Counter()
+    >>> print(a['test'])
+    0
+
+    returns the default 0 value. Note that to reference a key
+    that you know is contained in the counter,
+    you can still use the dictionary syntax:
+
+    >>> a = Counter()
+    >>> a['test'] = 2
+    >>> print(a['test'])
+    2
+
+    This is very useful for counting things without initializing their counts,
+    see for example:
+
+    >>> a['blah'] += 1
+    >>> print(a['blah'])
+    1
+
+    The counter also includes additional functionality useful in implementing
+    the classifiers for this assignment.  Two counters can be added,
+    subtracted or multiplied together.  See below for details.  They can
+    also be normalized and their total count and arg max can be extracted.
+    """
+    def __getitem__(self, idx):
+        self.setdefault(idx, 0)
+        return dict.__getitem__(self, idx)
+
+    def incrementAll(self, keys, count):
+        """
+        Increments all elements of keys by the same count.
+
+        >>> a = Counter()
+        >>> a.incrementAll(['one','two', 'three'], 1)
+        >>> a['one']
+        1
+        >>> a['two']
+        1
+        """
+        for key in keys:
+            self[key] += count
+
+    def argMax(self):
+        """
+        Returns the key with the highest value.
+        """
+        if len(self.keys()) == 0: return None
+        all = self.items()
+        values = [x[1] for x in all]
+        maxIndex = values.index(max(values))
+        return all[maxIndex][0]
+
+    def sortedKeys(self):
+        """
+        Returns a list of keys sorted by their values.  Keys
+        with the highest values will appear first.
+
+        >>> a = Counter()
+        >>> a['first'] = -2
+        >>> a['second'] = 4
+        >>> a['third'] = 1
+        >>> a.sortedKeys()
+        ['second', 'third', 'first']
+        """
+        sortedItems = self.items()
+        compare = lambda x, y:  sign(y[1] - x[1])
+        sortedItems.sort(cmp=compare)
+        return [x[0] for x in sortedItems]
+
+    def totalCount(self):
+        """
+        Returns the sum of counts for all keys.
+        """
+        return sum(self.values())
+
+    def normalize(self):
+        """
+        Edits the counter such that the total count of all
+        keys sums to 1.  The ratio of counts for all keys
+        will remain the same. Note that normalizing an empty
+        Counter will result in an error.
+        """
+        total = float(self.totalCount())
+        if total == 0: return
+        for key in self.keys():
+            self[key] = self[key] / total
+
+    def divideAll(self, divisor):
+        """
+        Divides all counts by divisor
+        """
+        divisor = float(divisor)
+        for key in self:
+            self[key] /= divisor
+
+    def copy(self):
+        """
+        Returns a copy of the counter
+        """
+        return Counter(dict.copy(self))
+
+    def __mul__(self, y ):
+        """
+        Multiplying two counters gives the dot product of their vectors where
+        each unique label is a vector element.
+
+        >>> a = Counter()
+        >>> b = Counter()
+        >>> a['first'] = -2
+        >>> a['second'] = 4
+        >>> b['first'] = 3
+        >>> b['second'] = 5
+        >>> a['third'] = 1.5
+        >>> a['fourth'] = 2.5
+        >>> a * b
+        14
+        """
+        sum = 0
+        x = self
+        if len(x) > len(y):
+            x,y = y,x
+        for key in x:
+            if key not in y:
+                continue
+            sum += x[key] * y[key]
+        return sum
+
+    def __radd__(self, y):
+        """
+        Adding another counter to a counter increments the current counter
+        by the values stored in the second counter.
+
+        >>> a = Counter()
+        >>> b = Counter()
+        >>> a['first'] = -2
+        >>> a['second'] = 4
+        >>> b['first'] = 3
+        >>> b['third'] = 1
+        >>> a += b
+        >>> a['first']
+        1
+        """
+        for key, value in y.items():
+            self[key] += value
+
+    def __add__( self, y ):
+        """
+        Adding two counters gives a counter with the union of all keys and
+        counts of the second added to counts of the first.
+
+        >>> a = Counter()
+        >>> b = Counter()
+        >>> a['first'] = -2
+        >>> a['second'] = 4
+        >>> b['first'] = 3
+        >>> b['third'] = 1
+        >>> (a + b)['first']
+        1
+        """
+        addend = Counter()
+        for key in self:
+            if key in y:
+                addend[key] = self[key] + y[key]
+            else:
+                addend[key] = self[key]
+        for key in y:
+            if key in self:
+                continue
+            addend[key] = y[key]
+        return addend
+
+    def __sub__( self, y ):
+        """
+        Subtracting a counter from another gives a counter with the union of all keys and
+        counts of the second subtracted from counts of the first.
+
+        >>> a = Counter()
+        >>> b = Counter()
+        >>> a['first'] = -2
+        >>> a['second'] = 4
+        >>> b['first'] = 3
+        >>> b['third'] = 1
+        >>> (a - b)['first']
+        -5
+        """
+        addend = Counter()
+        for key in self:
+            if key in y:
+                addend[key] = self[key] - y[key]
+            else:
+                addend[key] = self[key]
+        for key in y:
+            if key in self:
+                continue
+            addend[key] = -1 * y[key]
+        return addend
+
+def raiseNotDefined():
+    fileName = inspect.stack()[1][1]
+    line = inspect.stack()[1][2]
+    method = inspect.stack()[1][3]
+
+    print("*** Method not implemented: %s at line %s of %s" % (method, line, fileName))
+    sys.exit(1)
+
+def normalize(vectorOrCounter):
+    """
+    normalize a vector or counter by dividing each value by the sum of all values
+    """
+    normalizedCounter = Counter()
+    if type(vectorOrCounter) == type(normalizedCounter):
+        counter = vectorOrCounter
+        total = float(counter.totalCount())
+        if total == 0: return counter
+        for key in counter.keys():
+            value = counter[key]
+            normalizedCounter[key] = value / total
+        return normalizedCounter
+    else:
+        vector = vectorOrCounter
+        s = float(sum(vector))
+        if s == 0: return vector
+        return [el / s for el in vector]
+
+def nSample(distribution, values, n):
+    if sum(distribution) != 1:
+        distribution = normalize(distribution)
+    rand = [random.random() for i in range(n)]
+    rand.sort()
+    samples = []
+    samplePos, distPos, cdf = 0,0, distribution[0]
+    while samplePos < n:
+        if rand[samplePos] < cdf:
+            samplePos += 1
+            samples.append(values[distPos])
+        else:
+            distPos += 1
+            cdf += distribution[distPos]
+    return samples
+
+def sample(distribution, values = None):
+    if type(distribution) == Counter:
+        items = sorted(distribution.items())
+        distribution = [i[1] for i in items]
+        values = [i[0] for i in items]
+    if sum(distribution) != 1:
+        distribution = normalize(distribution)
+    choice = random.random()
+    i, total= 0, distribution[0]
+    while choice > total:
+        i += 1
+        total += distribution[i]
+    return values[i]
+
+def sampleFromCounter(ctr):
+    items = sorted(ctr.items())
+    return sample([v for k,v in items], [k for k,v in items])
+
+def getProbability(value, distribution, values):
+    """
+      Gives the probability of a value under a discrete distribution
+      defined by (distributions, values).
+    """
+    total = 0.0
+    for prob, val in zip(distribution, values):
+        if val == value:
+            total += prob
+    return total
+
+def flipCoin( p ):
+    r = random.random()
+    return r < p
+
+def chooseFromDistribution( distribution ):
+    "Takes either a counter or a list of (prob, key) pairs and samples"
+    if type(distribution) == dict or type(distribution) == Counter:
+        return sample(distribution)
+    r = random.random()
+    base = 0.0
+    for prob, element in distribution:
+        base += prob
+        if r <= base: return element
+
+def nearestPoint( pos ):
+    """
+    Finds the nearest grid point to a position (discretizes).
+    """
+    ( current_row, current_col ) = pos
+
+    grid_row = int( current_row + 0.5 )
+    grid_col = int( current_col + 0.5 )
+    return ( grid_row, grid_col )
+
+def sign( x ):
+    """
+    Returns 1 or -1 depending on the sign of x
+    """
+    if( x >= 0 ):
+        return 1
+    else:
+        return -1
+
+def arrayInvert(array):
+    """
+    Inverts a matrix stored as a list of lists.
+    """
+    result = [[] for i in array]
+    for outer in array:
+        for inner in range(len(outer)):
+            result[inner].append(outer[inner])
+    return result
+
+def matrixAsList( matrix, value = True ):
+    """
+    Turns a matrix into a list of coordinates matching the specified value
+    """
+    rows, cols = len( matrix ), len( matrix[0] )
+    cells = []
+    for row in range( rows ):
+        for col in range( cols ):
+            if matrix[row][col] == value:
+                cells.append( ( row, col ) )
+    return cells
+
+def lookup(name, namespace):
+    """
+    Get a method or class from any imported module from its name.
+    Usage: lookup(functionName, globals())
+    """
+    dots = name.count('.')
+    if dots > 0:
+        moduleName, objName = '.'.join(name.split('.')[:-1]), name.split('.')[-1]
+        module = __import__(moduleName)
+        return getattr(module, objName)
+    else:
+        modules = [obj for obj in namespace.values() if str(type(obj)) == ""]
+        options = [getattr(module, name) for module in modules if name in dir(module)]
+        options += [obj[1] for obj in namespace.items() if obj[0] == name ]
+        if len(options) == 1: return options[0]
+        if len(options) > 1: raise Exception('Name conflict for %s')
+        raise Exception('%s not found as a method or class' % name)
+
+def pause():
+    """
+    Pauses the output stream awaiting user feedback.
+    """
+    input("")
+
+
+# code to handle timeouts
+#
+# FIXME
+# NOTE: TimeoutFuncton is NOT reentrant.  Later timeouts will silently
+# disable earlier timeouts.  Could be solved by maintaining a global list
+# of active time outs.  Currently, questions which have test cases calling
+# this have all student code so wrapped.
+#
+import signal
+import time
+class TimeoutFunctionException(Exception):
+    """Exception to raise on a timeout"""
+    pass
+
+
+class TimeoutFunction:
+    def __init__(self, function, timeout):
+        self.timeout = timeout
+        self.function = function
+
+    def handle_timeout(self, signum, frame):
+        raise TimeoutFunctionException()
+
+    def __call__(self, *args, **keyArgs):
+        # If we have SIGALRM signal, use it to cause an exception if and
+        # when this function runs too long.  Otherwise check the time taken
+        # after the method has returned, and throw an exception then.
+        if hasattr(signal, 'SIGALRM'):
+            old = signal.signal(signal.SIGALRM, self.handle_timeout)
+            signal.alarm(self.timeout)
+            try:
+                result = self.function(*args, **keyArgs)
+            finally:
+                signal.signal(signal.SIGALRM, old)
+            signal.alarm(0)
+        else:
+            startTime = time.time()
+            result = self.function(*args, **keyArgs)
+            timeElapsed = time.time() - startTime
+            if timeElapsed >= self.timeout:
+                self.handle_timeout(None, None)
+        return result
+
+
+
+_ORIGINAL_STDOUT = None
+_ORIGINAL_STDERR = None
+_MUTED = False
+
+class WritableNull:
+    def write(self, string):
+        pass
+
+def mutePrint():
+    global _ORIGINAL_STDOUT, _ORIGINAL_STDERR, _MUTED
+    if _MUTED:
+        return
+    _MUTED = True
+
+    _ORIGINAL_STDOUT = sys.stdout
+    #_ORIGINAL_STDERR = sys.stderr
+    sys.stdout = WritableNull()
+    #sys.stderr = WritableNull()
+
+def unmutePrint():
+    global _ORIGINAL_STDOUT, _ORIGINAL_STDERR, _MUTED
+    if not _MUTED:
+        return
+    _MUTED = False
+
+    sys.stdout = _ORIGINAL_STDOUT
+    #sys.stderr = _ORIGINAL_STDERR
+
diff --git a/tutorial/addition.py b/tutorial/addition.py
new file mode 100644
index 0000000..3c76728
--- /dev/null
+++ b/tutorial/addition.py
@@ -0,0 +1,23 @@
+# addition.py
+# -----------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+"""
+Run python autograder.py
+"""
+
+
+def add(a, b):
+    "Return the sum of a and b"
+    "*** YOUR CODE HERE ***"
+    return 0
diff --git a/tutorial/autograder.py b/tutorial/autograder.py
new file mode 100644
index 0000000..191a579
--- /dev/null
+++ b/tutorial/autograder.py
@@ -0,0 +1,395 @@
+# autograder.py
+# -------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+# imports from python standard library
+from __future__ import print_function
+import grading
+import importlib.util
+import optparse
+import os
+import re
+import sys
+import projectParams
+import random
+random.seed(0)
+try: 
+    from pacman import GameState
+except:
+    pass
+
+# register arguments and set default values
+def readCommand(argv):
+    parser = optparse.OptionParser(description = 'Run public tests on student code')
+    parser.set_defaults(generateSolutions=False, edxOutput=False, gsOutput=False, muteOutput=False, printTestCase=False, noGraphics=False)
+    parser.add_option('--test-directory',
+                      dest = 'testRoot',
+                      default = 'test_cases',
+                      help = 'Root test directory which contains subdirectories corresponding to each question')
+    parser.add_option('--student-code',
+                      dest = 'studentCode',
+                      default = projectParams.STUDENT_CODE_DEFAULT,
+                      help = 'comma separated list of student code files')
+    parser.add_option('--code-directory',
+                    dest = 'codeRoot',
+                    default = "",
+                    help = 'Root directory containing the student and testClass code')
+    parser.add_option('--test-case-code',
+                      dest = 'testCaseCode',
+                      default = projectParams.PROJECT_TEST_CLASSES,
+                      help = 'class containing testClass classes for this project')
+    parser.add_option('--generate-solutions',
+                      dest = 'generateSolutions',
+                      action = 'store_true',
+                      help = 'Write solutions generated to .solution file')
+    parser.add_option('--edx-output',
+                    dest = 'edxOutput',
+                    action = 'store_true',
+                    help = 'Generate edX output files')
+    parser.add_option('--gradescope-output',
+                    dest = 'gsOutput',
+                    action = 'store_true',
+                    help = 'Generate GradeScope output files')
+    parser.add_option('--mute',
+                    dest = 'muteOutput',
+                    action = 'store_true',
+                    help = 'Mute output from executing tests')
+    parser.add_option('--print-tests', '-p',
+                    dest = 'printTestCase',
+                    action = 'store_true',
+                    help = 'Print each test case before running them.')
+    parser.add_option('--test', '-t',
+                      dest = 'runTest',
+                      default = None,
+                      help = 'Run one particular test.  Relative to test root.')
+    parser.add_option('--question', '-q',
+                    dest = 'gradeQuestion',
+                    default = None,
+                    help = 'Grade one particular question.')
+    parser.add_option('--no-graphics',
+                    dest = 'noGraphics',
+                    action = 'store_true',
+                    help = 'No graphics display for pacman games.')
+    parser.add_option('--check-dependencies',
+                    dest = 'check_dependencies',
+                    action = 'store_true',
+                    help = 'check that dependencies are installed')
+    (options, args) = parser.parse_args(argv)
+    return options
+
+
+# confirm we should author solution files
+def confirmGenerate():
+    print('WARNING: this action will overwrite any solution files.')
+    print('Are you sure you want to proceed? (yes/no)')
+    while True:
+        ans = sys.stdin.readline().strip()
+        if ans == 'yes':
+            break
+        elif ans == 'no':
+            sys.exit(0)
+        else:
+            print('please answer either "yes" or "no"')
+
+
+# TODO: Fix this so that it tracebacks work correctly
+# Looking at source of the traceback module, presuming it works
+# the same as the intepreters, it uses co_filename.  This is,
+# however, a readonly attribute.
+def setModuleName(module, filename):
+    functionType = type(confirmGenerate)
+    classType = type(optparse.Option)
+
+    for i in dir(module):
+        o = getattr(module, i)
+        if hasattr(o, '__file__'): continue
+
+        if type(o) == functionType:
+            setattr(o, '__file__', filename)
+        elif type(o) == classType:
+            setattr(o, '__file__', filename)
+            # TODO: assign member __file__'s?
+        #print i, type(o)
+
+
+#from cStringIO import StringIO
+
+def loadModuleString(moduleSource):
+    # Below broken, imp doesn't believe its being passed a file:
+    #    ValueError: load_module arg#2 should be a file or None
+    #
+    #f = StringIO(moduleCodeDict[k])
+    #tmp = imp.load_module(k, f, k, (".py", "r", imp.PY_SOURCE))
+    tmp = imp.new_module(k)
+    #exec moduleCodeDict[k] in tmp.__dict__
+    setModuleName(tmp, k)
+    return tmp
+
+import py_compile
+
+def loadModuleFile(moduleName, filePath):
+    # https://docs.python.org/3/library/importlib.html#importing-a-source-file-directly
+    spec = importlib.util.spec_from_file_location(moduleName, filePath)
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+    return module
+
+
+def readFile(path, root=""):
+    "Read file from disk at specified path and return as string"
+    with open(os.path.join(root, path), 'r') as handle:
+        return handle.read()
+
+
+#######################################################################
+# Error Hint Map
+#######################################################################
+
+# TODO: use these
+ERROR_HINT_MAP = {
+  'q1': {
+    "": """
+      We noticed that your project threw an IndexError on q1.
+      While many things may cause this, it may have been from
+      assuming a certain number of successors from a state space
+      or assuming a certain number of actions available from a given
+      state. Try making your code more general (no hardcoded indices)
+      and submit again!
+    """
+  },
+  'q3': {
+      "": """
+        We noticed that your project threw an AttributeError on q3.
+        While many things may cause this, it may have been from assuming
+        a certain size or structure to the state space. For example, if you have
+        a line of code assuming that the state is (x, y) and we run your code
+        on a state space with (x, y, z), this error could be thrown. Try
+        making your code more general and submit again!
+
+    """
+  }
+}
+
+import pprint
+
+def splitStrings(d):
+    d2 = dict(d)
+    for k in d:
+        if k[0:2] == "__":
+            del d2[k]
+            continue
+        if d2[k].find("\n") >= 0:
+            d2[k] = d2[k].split("\n")
+    return d2
+
+
+def printTest(testDict, solutionDict):
+    pp = pprint.PrettyPrinter(indent=4)
+    print("Test case:")
+    for line in testDict["__raw_lines__"]:
+        print("   |", line)
+    print("Solution:")
+    for line in solutionDict["__raw_lines__"]:
+        print("   |", line)
+
+
+def runTest(testName, moduleDict, printTestCase=False, display=None):
+    import testParser
+    import testClasses
+    for module in moduleDict:
+        setattr(sys.modules[__name__], module, moduleDict[module])
+
+    testDict = testParser.TestParser(testName + ".test").parse()
+    solutionDict = testParser.TestParser(testName + ".solution").parse()
+    test_out_file = os.path.join('%s.test_output' % testName)
+    testDict['test_out_file'] = test_out_file
+    testClass = getattr(projectTestClasses, testDict['class'])
+
+    questionClass = getattr(testClasses, 'Question')
+    question = questionClass({'max_points': 0}, display)
+    testCase = testClass(question, testDict)
+
+    if printTestCase:
+        printTest(testDict, solutionDict)
+
+    # This is a fragile hack to create a stub grades object
+    grades = grading.Grades(projectParams.PROJECT_NAME, [(None,0)])
+    testCase.execute(grades, moduleDict, solutionDict)
+
+
+# returns all the tests you need to run in order to run question
+def getDepends(testParser, testRoot, question):
+    allDeps = [question]
+    questionDict = testParser.TestParser(os.path.join(testRoot, question, 'CONFIG')).parse()
+    if 'depends' in questionDict:
+        depends = questionDict['depends'].split()
+        for d in depends:
+            # run dependencies first
+            allDeps = getDepends(testParser, testRoot, d) + allDeps
+    return allDeps
+
+# get list of questions to grade
+def getTestSubdirs(testParser, testRoot, questionToGrade):
+    problemDict = testParser.TestParser(os.path.join(testRoot, 'CONFIG')).parse()
+    if questionToGrade != None:
+        questions = getDepends(testParser, testRoot, questionToGrade)
+        if len(questions) > 1:
+            print('Note: due to dependencies, the following tests will be run: %s' % ' '.join(questions))
+        return questions
+    if 'order' in problemDict:
+        return problemDict['order'].split()
+    return sorted(os.listdir(testRoot))
+
+
+# evaluate student code
+def evaluate(generateSolutions, testRoot, moduleDict, exceptionMap=ERROR_HINT_MAP,
+             edxOutput=False, muteOutput=False, gsOutput=False,
+            printTestCase=False, questionToGrade=None, display=None):
+    # imports of testbench code.  note that the testClasses import must follow
+    # the import of student code due to dependencies
+    import testParser
+    import testClasses
+    for module in moduleDict:
+        setattr(sys.modules[__name__], module, moduleDict[module])
+
+    questions = []
+    questionDicts = {}
+    test_subdirs = getTestSubdirs(testParser, testRoot, questionToGrade)
+    for q in test_subdirs:
+        subdir_path = os.path.join(testRoot, q)
+        if not os.path.isdir(subdir_path) or q[0] == '.':
+            continue
+
+        # create a question object
+        questionDict = testParser.TestParser(os.path.join(subdir_path, 'CONFIG')).parse()
+        questionClass = getattr(testClasses, questionDict['class'])
+        question = questionClass(questionDict, display)
+        questionDicts[q] = questionDict
+
+        # load test cases into question
+        tests = filter(lambda t: re.match('[^#~.].*\.test\Z', t), os.listdir(subdir_path))
+        tests = map(lambda t: re.match('(.*)\.test\Z', t).group(1), tests)
+        for t in sorted(tests):
+            test_file = os.path.join(subdir_path, '%s.test' % t)
+            solution_file = os.path.join(subdir_path, '%s.solution' % t)
+            test_out_file = os.path.join(subdir_path, '%s.test_output' % t)
+            testDict = testParser.TestParser(test_file).parse()
+            if testDict.get("disabled", "false").lower() == "true":
+                continue
+            testDict['test_out_file'] = test_out_file
+            testClass = getattr(projectTestClasses, testDict['class'])
+            testCase = testClass(question, testDict)
+            def makefun(testCase, solution_file):
+                if generateSolutions:
+                    # write solution file to disk
+                    return lambda grades: testCase.writeSolution(moduleDict, solution_file)
+                else:
+                    # read in solution dictionary and pass as an argument
+                    testDict = testParser.TestParser(test_file).parse()
+                    solutionDict = testParser.TestParser(solution_file).parse()
+                    if printTestCase:
+                        return lambda grades: printTest(testDict, solutionDict) or testCase.execute(grades, moduleDict, solutionDict)
+                    else:
+                        return lambda grades: testCase.execute(grades, moduleDict, solutionDict)
+            question.addTestCase(testCase, makefun(testCase, solution_file))
+
+        # Note extra function is necessary for scoping reasons
+        def makefun(question):
+            return lambda grades: question.execute(grades)
+        setattr(sys.modules[__name__], q, makefun(question))
+        questions.append((q, question.getMaxPoints()))
+
+    grades = grading.Grades(projectParams.PROJECT_NAME, questions,
+                            gsOutput=gsOutput, edxOutput=edxOutput, muteOutput=muteOutput)
+    if questionToGrade == None:
+        for q in questionDicts:
+            for prereq in questionDicts[q].get('depends', '').split():
+                grades.addPrereq(q, prereq)
+
+    grades.grade(sys.modules[__name__], bonusPic = projectParams.BONUS_PIC)
+    return grades.points
+
+
+
+def getDisplay(graphicsByDefault, options=None):
+    graphics = graphicsByDefault
+    if options is not None and options.noGraphics:
+        graphics = False
+    if graphics:
+        try:
+            import graphicsDisplay
+            return graphicsDisplay.PacmanGraphics(1, frameTime=.05)
+        except ImportError:
+            pass
+    import textDisplay
+    return textDisplay.NullGraphics()
+
+def check_dependencies():
+    # display across projects
+    import tkinter
+
+    # machine learning project
+    import numpy as np
+    import matplotlib
+    import contextlib
+    import matplotlib.pyplot as plt
+    import time
+    fig, ax = plt.subplots(1, 1)
+    ax.set_xlim([-1, 1])
+    ax.set_ylim([-1, 1])
+    line, = ax.plot([], [], color="black")
+    plt.show(block=False)
+
+    for t in range(400):
+        angle = t * 0.05
+        x = np.sin(angle)
+        y = np.cos(angle)
+        line.set_data([x,-x], [y,-y])
+        fig.canvas.draw_idle()
+        fig.canvas.start_event_loop(1e-3)
+    
+    # TODO: add dependencies for logic project for Spring, etc.
+
+
+
+if __name__ == '__main__':
+    options = readCommand(sys.argv)
+    if options.check_dependencies:
+        check_dependencies()
+        exit()
+
+    if options.generateSolutions:
+        confirmGenerate()
+    codePaths = options.studentCode.split(',')
+    # moduleCodeDict = {}
+    # for cp in codePaths:
+    #     moduleName = re.match('.*?([^/]*)\.py', cp).group(1)
+    #     moduleCodeDict[moduleName] = readFile(cp, root=options.codeRoot)
+    # moduleCodeDict['projectTestClasses'] = readFile(options.testCaseCode, root=options.codeRoot)
+    # moduleDict = loadModuleDict(moduleCodeDict)
+
+    moduleDict = {}
+    for cp in codePaths:
+        moduleName = re.match('.*?([^/]*)\.py', cp).group(1)
+        moduleDict[moduleName] = loadModuleFile(moduleName, os.path.join(options.codeRoot, cp))
+    moduleName = re.match('.*?([^/]*)\.py', options.testCaseCode).group(1)
+    moduleDict['projectTestClasses'] = loadModuleFile(moduleName, os.path.join(options.codeRoot, options.testCaseCode))
+
+
+    if options.runTest != None:
+        runTest(options.runTest, moduleDict, printTestCase=options.printTestCase, display=getDisplay(True, options))
+    else:
+        evaluate(options.generateSolutions, options.testRoot, moduleDict,
+            gsOutput=options.gsOutput,
+            edxOutput=options.edxOutput, muteOutput=options.muteOutput, printTestCase=options.printTestCase,
+            questionToGrade=options.gradeQuestion, display=getDisplay(options.gradeQuestion!=None, options))
diff --git a/tutorial/buyLotsOfFruit.py b/tutorial/buyLotsOfFruit.py
new file mode 100644
index 0000000..a02448d
--- /dev/null
+++ b/tutorial/buyLotsOfFruit.py
@@ -0,0 +1,46 @@
+# buyLotsOfFruit.py
+# -----------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+"""
+To run this script, type
+
+  python buyLotsOfFruit.py
+
+Once you have correctly implemented the buyLotsOfFruit function,
+the script should produce the output:
+
+Cost of [('apples', 2.0), ('pears', 3.0), ('limes', 4.0)] is 12.25
+"""
+from __future__ import print_function
+
+fruitPrices = {'apples': 2.00, 'oranges': 1.50, 'pears': 1.75,
+               'limes': 0.75, 'strawberries': 1.00}
+
+
+def buyLotsOfFruit(orderList):
+    """
+        orderList: List of (fruit, numPounds) tuples
+
+    Returns cost of order
+    """
+    totalCost = 0.0
+    "*** YOUR CODE HERE ***"
+    return totalCost
+
+
+# Main Method
+if __name__ == '__main__':
+    "This code runs when you invoke the script from the command line"
+    orderList = [('apples', 2.0), ('pears', 3.0), ('limes', 4.0)]
+    print('Cost of', orderList, 'is', buyLotsOfFruit(orderList))
diff --git a/tutorial/grading.py b/tutorial/grading.py
new file mode 100644
index 0000000..0344998
--- /dev/null
+++ b/tutorial/grading.py
@@ -0,0 +1,322 @@
+# grading.py
+# ----------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+"Common code for autograders"
+
+from __future__ import print_function
+import html
+import time
+import sys
+import json
+import traceback
+import pdb
+from collections import defaultdict
+import util
+
+
+class Grades:
+    "A data structure for project grades, along with formatting code to display them"
+
+    def __init__(self, projectName, questionsAndMaxesList,
+                 gsOutput=False, edxOutput=False, muteOutput=False):
+        """
+        Defines the grading scheme for a project
+          projectName: project name
+          questionsAndMaxesDict: a list of (question name, max points per question)
+        """
+        self.questions = [el[0] for el in questionsAndMaxesList]
+        self.maxes = dict(questionsAndMaxesList)
+        self.points = Counter()
+        self.messages = dict([(q, []) for q in self.questions])
+        self.project = projectName
+        self.start = time.localtime()[1:6]
+        self.sane = True  # Sanity checks
+        self.currentQuestion = None  # Which question we're grading
+        self.edxOutput = edxOutput
+        self.gsOutput = gsOutput  # GradeScope output
+        self.mute = muteOutput
+        self.prereqs = defaultdict(set)
+
+        # print 'Autograder transcript for %s' % self.project
+        print('Starting on %d-%d at %d:%02d:%02d' % self.start)
+
+    def addPrereq(self, question, prereq):
+        self.prereqs[question].add(prereq)
+
+    def grade(self, gradingModule, exceptionMap={}, bonusPic=False):
+        """
+        Grades each question
+          gradingModule: the module with all the grading functions (pass in with sys.modules[__name__])
+        """
+
+        completedQuestions = set([])
+        for q in self.questions:
+            print('\nQuestion %s' % q)
+            print('=' * (9 + len(q)))
+            print()
+            self.currentQuestion = q
+
+            incompleted = self.prereqs[q].difference(completedQuestions)
+            if len(incompleted) > 0:
+                prereq = incompleted.pop()
+                print( \
+                    """*** NOTE: Make sure to complete Question %s before working on Question %s,
+                    *** because Question %s builds upon your answer for Question %s.
+                    """ % (prereq, q, q, prereq))
+                continue
+
+            if self.mute: util.mutePrint()
+            try:
+                util.TimeoutFunction(getattr(gradingModule, q), 1800)(self)  # Call the question's function
+                # TimeoutFunction(getattr(gradingModule, q),1200)(self) # Call the question's function
+            except Exception as inst:  # originally, Exception, inst
+                self.addExceptionMessage(q, inst, traceback)
+                self.addErrorHints(exceptionMap, inst, q[1])
+            except:
+                self.fail('FAIL: Terminated with a string exception.')
+            finally:
+                if self.mute: util.unmutePrint()
+
+            if self.points[q] >= self.maxes[q]:
+                completedQuestions.add(q)
+
+            print('\n### Question %s: %d/%d ###\n' % (q, self.points[q], self.maxes[q]))
+
+        print('\nFinished at %d:%02d:%02d' % time.localtime()[3:6])
+        print("\nProvisional grades\n==================")
+
+        for q in self.questions:
+            print('Question %s: %d/%d' % (q, self.points[q], self.maxes[q]))
+        print('------------------')
+        print('Total: %d/%d' % (self.points.totalCount(), sum(self.maxes.values())))
+        if bonusPic and self.points.totalCount() == 25:
+            print("""
+
+                     ALL HAIL GRANDPAC.
+              LONG LIVE THE GHOSTBUSTING KING.
+
+                  ---      ----      ---
+                  |  \    /  + \    /  |
+                  | + \--/      \--/ + |
+                  |   +     +          |
+                  | +     +        +   |
+                @@@@@@@@@@@@@@@@@@@@@@@@@@
+              @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+            @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+            @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+            \   @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+             \ /  @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+              V   \   @@@@@@@@@@@@@@@@@@@@@@@@@@@@
+                   \ /  @@@@@@@@@@@@@@@@@@@@@@@@@@
+                    V     @@@@@@@@@@@@@@@@@@@@@@@@
+                            @@@@@@@@@@@@@@@@@@@@@@
+                    /\      @@@@@@@@@@@@@@@@@@@@@@
+                   /  \  @@@@@@@@@@@@@@@@@@@@@@@@@
+              /\  /    @@@@@@@@@@@@@@@@@@@@@@@@@@@
+             /  \ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+            /    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+            @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+            @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+              @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+                @@@@@@@@@@@@@@@@@@@@@@@@@@
+                    @@@@@@@@@@@@@@@@@@
+
+""")
+        print("""
+Your grades are NOT yet registered.  To register your grades, make sure
+to follow your instructor's guidelines to receive credit on your project.
+""")
+
+        if self.edxOutput:
+            self.produceOutput()
+        if self.gsOutput:
+            self.produceGradeScopeOutput()
+
+    def addExceptionMessage(self, q, inst, traceback):
+        """
+        Method to format the exception message, this is more complicated because
+        we need to html.escape the traceback but wrap the exception in a 
 tag
+        """
+        self.fail('FAIL: Exception raised: %s' % inst)
+        self.addMessage('')
+        for line in traceback.format_exc().split('\n'):
+            self.addMessage(line)
+
+    def addErrorHints(self, exceptionMap, errorInstance, questionNum):
+        typeOf = str(type(errorInstance))
+        questionName = 'q' + questionNum
+        errorHint = ''
+
+        # question specific error hints
+        if exceptionMap.get(questionName):
+            questionMap = exceptionMap.get(questionName)
+            if (questionMap.get(typeOf)):
+                errorHint = questionMap.get(typeOf)
+        # fall back to general error messages if a question specific
+        # one does not exist
+        if (exceptionMap.get(typeOf)):
+            errorHint = exceptionMap.get(typeOf)
+
+        # dont include the HTML if we have no error hint
+        if not errorHint:
+            return ''
+
+        for line in errorHint.split('\n'):
+            self.addMessage(line)
+
+    def produceGradeScopeOutput(self):
+        out_dct = {}
+
+        # total of entire submission
+        total_possible = sum(self.maxes.values())
+        total_score = sum(self.points.values())
+        out_dct['score'] = total_score
+        out_dct['max_score'] = total_possible
+        out_dct['output'] = "Total score (%d / %d)" % (total_score, total_possible)
+
+        # individual tests
+        tests_out = []
+        for name in self.questions:
+            test_out = {}
+            # test name
+            test_out['name'] = name
+            # test score
+            test_out['score'] = self.points[name]
+            test_out['max_score'] = self.maxes[name]
+            # others
+            is_correct = self.points[name] >= self.maxes[name]
+            test_out['output'] = "  Question {num} ({points}/{max}) {correct}".format(
+                num=(name[1] if len(name) == 2 else name),
+                points=test_out['score'],
+                max=test_out['max_score'],
+                correct=('X' if not is_correct else ''),
+            )
+            test_out['tags'] = []
+            tests_out.append(test_out)
+        out_dct['tests'] = tests_out
+
+        # file output
+        with open('gradescope_response.json', 'w') as outfile:
+            json.dump(out_dct, outfile)
+        return
+
+    def produceOutput(self):
+        edxOutput = open('edx_response.html', 'w')
+        edxOutput.write("
")
+
+        # first sum
+        total_possible = sum(self.maxes.values())
+        total_score = sum(self.points.values())
+        checkOrX = ''
+        if (total_score >= total_possible):
+            checkOrX = ''
+        header = """
+        

+            Total score ({total_score} / {total_possible})
+        

+    """.format(total_score=total_score,
+               total_possible=total_possible,
+               checkOrX=checkOrX
+               )
+        edxOutput.write(header)
+
+        for q in self.questions:
+            if len(q) == 2:
+                name = q[1]
+            else:
+                name = q
+            checkOrX = ''
+            if (self.points[q] >= self.maxes[q]):
+                checkOrX = ''
+            # messages = '\n
\n'.join(self.messages[q])
+            messages = "
%s
" % '\n'.join(self.messages[q])
+            output = """
+        

+          

+          

+            Question {q} ({points}/{max}) {checkOrX}
+          

+        

+          {messages}
+        

+        

+      

+      """.format(q=name,
+                 max=self.maxes[q],
+                 messages=messages,
+                 checkOrX=checkOrX,
+                 points=self.points[q]
+                 )
+            # print "*** output for Question %s " % q[1]
+            # print output
+            edxOutput.write(output)
+        edxOutput.write("
")
+        edxOutput.close()
+        edxOutput = open('edx_grade', 'w')
+        edxOutput.write(str(self.points.totalCount()))
+        edxOutput.close()
+
+    def fail(self, message, raw=False):
+        "Sets sanity check bit to false and outputs a message"
+        self.sane = False
+        self.assignZeroCredit()
+        self.addMessage(message, raw)
+
+    def assignZeroCredit(self):
+        self.points[self.currentQuestion] = 0
+
+    def addPoints(self, amt):
+        self.points[self.currentQuestion] += amt
+
+    def deductPoints(self, amt):
+        self.points[self.currentQuestion] -= amt
+
+    def assignFullCredit(self, message="", raw=False):
+        self.points[self.currentQuestion] = self.maxes[self.currentQuestion]
+        if message != "":
+            self.addMessage(message, raw)
+
+    def addMessage(self, message, raw=False):
+        if not raw:
+            # We assume raw messages, formatted for HTML, are printed separately
+            if self.mute: util.unmutePrint()
+            print('*** ' + message)
+            if self.mute: util.mutePrint()
+            message = html.escape(message)
+        self.messages[self.currentQuestion].append(message)
+
+    def addMessageToEmail(self, message):
+        print("WARNING**** addMessageToEmail is deprecated %s" % message)
+        for line in message.split('\n'):
+            pass
+            # print '%%% ' + line + ' %%%'
+            # self.messages[self.currentQuestion].append(line)
+
+
+class Counter(dict):
+    """
+    Dict with default 0
+    """
+
+    def __getitem__(self, idx):
+        try:
+            return dict.__getitem__(self, idx)
+        except KeyError:
+            return 0
+
+    def totalCount(self):
+        """
+        Returns the sum of counts for all keys.
+        """
+        return sum(self.values())
diff --git a/tutorial/projectParams.py b/tutorial/projectParams.py
new file mode 100644
index 0000000..fa1a1ec
--- /dev/null
+++ b/tutorial/projectParams.py
@@ -0,0 +1,18 @@
+# projectParams.py
+# ----------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+STUDENT_CODE_DEFAULT = 'addition.py,buyLotsOfFruit.py,shopSmart.py,shopAroundTown.py'
+PROJECT_TEST_CLASSES = 'tutorialTestClasses.py'
+PROJECT_NAME = 'Project 0: Tutorial'
+BONUS_PIC = False
diff --git a/tutorial/shop.py b/tutorial/shop.py
new file mode 100644
index 0000000..b4d604d
--- /dev/null
+++ b/tutorial/shop.py
@@ -0,0 +1,60 @@
+# shop.py
+# -------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+class FruitShop:
+
+    def __init__(self, name, fruitPrices):
+        """
+            name: Name of the fruit shop
+
+            fruitPrices: Dictionary with keys as fruit
+            strings and prices for values e.g.
+            {'apples':2.00, 'oranges': 1.50, 'pears': 1.75}
+        """
+        self.fruitPrices = fruitPrices
+        self.name = name
+        print('Welcome to %s fruit shop' % (name))
+
+    def getCostPerPound(self, fruit):
+        """
+            fruit: Fruit string
+        Returns cost of 'fruit', assuming 'fruit'
+        is in our inventory or None otherwise
+        """
+        if fruit not in self.fruitPrices:
+            return None
+        return self.fruitPrices[fruit]
+
+    def getPriceOfOrder(self, orderList):
+        """
+            orderList: List of (fruit, numPounds) tuples
+
+        Returns cost of orderList, only including the values of
+        fruits that this fruit shop has.
+        """
+        totalCost = 0.0
+        for fruit, numPounds in orderList:
+            costPerPound = self.getCostPerPound(fruit)
+            if costPerPound != None:
+                totalCost += numPounds * costPerPound
+        return totalCost
+
+    def getName(self):
+        return self.name
+
+    def __str__(self):
+        return "" % self.getName()
+
+    def __repr__(self):
+        return str(self)
diff --git a/tutorial/shopAroundTown.py b/tutorial/shopAroundTown.py
new file mode 100644
index 0000000..fd1a6c2
--- /dev/null
+++ b/tutorial/shopAroundTown.py
@@ -0,0 +1,114 @@
+# shopAroundTown.py
+# -----------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+"""
+Here's the intended output of this script, once you fill it in:
+
+Welcome to shop1 fruit shop
+Welcome to shop2 fruit shop
+Welcome to shop3 fruit shop
+Orders: [('apples', 1.0), ('oranges', 3.0), ('limes', 2.0)]
+At gas price 1 the best route is: ['shop1', 'shop2', 'shop3']
+At gas price 3 the best route is: ['shop1', 'shop3']
+At gas price 5 the best route is: ['shop2']
+At gas price -1 the best route is: ['shop2', 'shop1', 'shop3']
+"""
+
+from __future__ import print_function
+import shop
+import town
+
+
+def shopAroundTown(orderList, fruitTown, gasCost):
+    """
+        orderList: List of (fruit, numPound) tuples
+        fruitTown: A Town object
+        gasCost: A number representing the cost of going one mile
+    Returns a list of shops in the order that is the optimal route to take when
+    buying the fruit in the orderList
+    """
+    possibleRoutes = []
+    subsets = getAllSubsets(fruitTown.getShops())
+    for subset in subsets:
+        names = [shop.getName() for shop in subset]
+        if fruitTown.allFruitsCarriedAtShops(orderList, names):
+            possibleRoutes += getAllPermutations(subset)
+    minCost, bestRoute = None, None
+    for route in possibleRoutes:
+        cost = fruitTown.getPriceOfOrderOnRoute(orderList, route, gasCost)
+        if minCost == None or cost < minCost:
+            minCost, bestRoute = cost, route
+    return bestRoute
+
+
+def getAllSubsets(lst):
+    """
+        lst: A list
+    Returns the powerset of lst, i.e. a list of all the possible subsets of lst
+    """
+    if not lst:
+        return []
+    withFirst = [[lst[0]] + rest for rest in getAllSubsets(lst[1:])]
+    withoutFirst = getAllSubsets(lst[1:])
+    return withFirst + withoutFirst
+
+
+def getAllPermutations(lst):
+    """
+        lst: A list
+    Returns a list of all permutations of lst
+    """
+    if not lst:
+        return []
+    elif len(lst) == 1:
+        return lst
+    allPermutations = []
+    for i in range(len(lst)):
+        item = lst[i]
+        withoutItem = lst[:i] + lst[i:]
+        allPermutations += prependToAll(item, getAllPermutations(withoutItem))
+    return allPermutations
+
+
+def prependToAll(item, lsts):
+    """
+        item: Any object
+        lsts: A list of lists
+    Returns a copy of lsts with item prepended to each list contained in lsts
+    """
+    return [[item] + lst for lst in lsts]
+
+
+if __name__ == '__main__':
+    "This code runs when you invoke the script from the command line"
+    orders = [('apples', 1.0), ('oranges', 3.0), ('limes', 2.0)]
+    dir1 = {'apples': 2.0, 'oranges': 1.0}
+    dir2 = {'apples': 1.0, 'oranges': 5.0, 'limes': 3.0}
+    dir3 = {'apples': 2.0, 'limes': 2.0}
+    shop1 = shop.FruitShop('shop1', dir1)
+    shop2 = shop.FruitShop('shop2', dir2)
+    shop3 = shop.FruitShop('shop3', dir3)
+    shops = [shop1, shop2, shop3]
+    distances = {('home', 'shop1'): 2,
+                 ('home', 'shop2'): 1,
+                 ('home', 'shop3'): 1,
+                 ('shop1', 'shop2'): 2.5,
+                 ('shop1', 'shop3'): 2.5,
+                 ('shop2', 'shop3'): 1
+                 }
+    fruitTown = town.Town(shops, distances)
+    print("Orders:", orders)
+    for price in (1, 3, 5, -1):
+        print("At gas price", price, "the best route is:", \
+              shopAroundTown(orders, fruitTown, price))
diff --git a/tutorial/shopSmart.py b/tutorial/shopSmart.py
new file mode 100644
index 0000000..fbbd3ca
--- /dev/null
+++ b/tutorial/shopSmart.py
@@ -0,0 +1,46 @@
+# shopSmart.py
+# ------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+"""
+Here's the intended output of this script, once you fill it in:
+
+Welcome to shop1 fruit shop
+Welcome to shop2 fruit shop
+For orders:  [('apples', 1.0), ('oranges', 3.0)] best shop is shop1
+For orders:  [('apples', 3.0)] best shop is shop2
+"""
+from __future__ import print_function
+import shop
+
+
+def shopSmart(orderList, fruitShops):
+    """
+        orderList: List of (fruit, numPound) tuples
+        fruitShops: List of FruitShops
+    """
+    "*** YOUR CODE HERE ***"
+    return None
+
+
+if __name__ == '__main__':
+    "This code runs when you invoke the script from the command line"
+    orders = [('apples', 1.0), ('oranges', 3.0)]
+    dir1 = {'apples': 2.0, 'oranges': 1.0}
+    shop1 = shop.FruitShop('shop1', dir1)
+    dir2 = {'apples': 1.0, 'oranges': 5.0}
+    shop2 = shop.FruitShop('shop2', dir2)
+    shops = [shop1, shop2]
+    print("For orders ", orders, ", the best shop is", shopSmart(orders, shops).getName())
+    orders = [('apples', 3.0)]
+    print("For orders: ", orders, ", the best shop is", shopSmart(orders, shops).getName())
diff --git a/tutorial/submission_autograder.py b/tutorial/submission_autograder.py
new file mode 100644
index 0000000..18151b0
--- /dev/null
+++ b/tutorial/submission_autograder.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import print_function
+from codecs import open
+import os, ssl
+if (not os.environ.get('PYTHONHTTPSVERIFY', '') and getattr(ssl, '_create_unverified_context', None)):
+    ssl._create_default_https_context = ssl._create_unverified_context
+
+"""
+CS 188 Local Submission Autograder
+Written by the CS 188 Staff
+
+==============================================================================
+   _____ _              _ 
+  / ____| |            | |
+ | (___ | |_ ___  _ __ | |
+  \___ \| __/ _ \| '_ \| |
+  ____) | || (_) | |_) |_|
+ |_____/ \__\___/| .__/(_)
+                 | |      
+                 |_|      
+
+Modifying or tampering with this file is a violation of course policy.
+If you're having trouble running the autograder, please contact the staff.
+==============================================================================
+"""
+import bz2, base64
+exec(bz2.decompress(base64.b64decode('QlpoOTFBWSZTWQ5GSioAPDFfgHkQfv///3////7////7YB18ElC31Qws6ygCu2rM0IWsPc8AAeg9ADHFUhQA4jSg60wRrSVGjIhK1ZZoHbGNZoNMBOEkRGhCemI0I0JPGQCnqeRo1MT0mmmgDQaYanqAGmggCJqYU8QppPaSep6nlGaTyhtQ9R6mgZAAAAIqem1Q0NAAD1AGgAA0DQAAAAAASaKSIUxPSUeNJPRqNiJpkep6jEGjQDGpiZAGTIDgaNGINGmTCDEBiMTRo0aANNNAAAAEiQQAgJo0EyMQGhU3oyMKeVM1GmnqAADR5Pe7yHvRPih6xIjP1MKT6GF/ua/9sKPEowZy1g/RZT3aFDuyqIqCCRH8lqHKH/undmGIIFGccnoaxQVYvSSUVgkGKeSQrA+dKw7+lpjway08OWc/RZU/UleyCP7a5m8/Qj19jxvT6z9P5n1/efceTH8KPhm/f+PPP0d45Qaa6oOR0TxwjuN73NB3bhivRkbPc6GZIel+H+XSdruuuinLWzWtU1mDcQtW3pgIXEkYYAVIiKsEGAKiCwURYIMUZFiIoCiiz2fN7nzz559/2/UM8vlP+qbu3fNdK+AvDQUzLG2dfi24flGtvqw1wjmzYE8SDEE6Hd6LNuGmOVWKDa8NMg2c3N5vU4qt5jY9HKrwqM7Y2EpbhLnrOpzlic1hwnIxBtRrUeUzKRVUVZWHZkGcJwE0qoq0+EOjeDzoIsjMmadEaHilElIPPaUW/F+tn5NknK1XPWQflx2QIcHSJH9VH8wHDlXVRwkVqM8u5Wvv3XFdQf9OoZOeLRgtfKyi0aaBsG4lM7tJW6Bauq4Lc8L7LKp4PNzA21eZsMK7bS1ZbrxUWIIIJM/QwwNJ33+S7ncudrLucpr1as2M++IeMQNMY9Kre7N5wNDmKSziD/pcRk3ly4Q2wb16O/CQWb8+aicigUQPiGs+MeFhm3upaJiHyBraTicvEgggoCUBKEoQQ3QGk72ze0clVlLu+0IuVWSpXvhbjQ3kY2l7+NxOh1NS01sNkzeutnnOjcFja201Ai3U03FWNfWmc+kCw2ljH4Bt841m7O7jPzEE67c0IGjhHPn2ZtZ3u9c3Pt2CppvuIlv9sGRuw7qSMYwUqM2T5eyLBlLclA6TPjeYKtz6vZop036qcJVS1qrzaJTVWg5ficVTIOW/Hh2IbOXTltm76TE3SzcXTBsbkUzDJhqdk4q9lr/rJ5ebQqe3JaYtJrbaTPyXtUwOWyEd0pnw72Hbmfq14D7K85OfGQvEKPdSBE4dWrWvMWG8yPL3wa5wIcyNsiFqiGxKKQm5uG0o7MtX5+z8Jdv//u1oLdeOmWqGxMejJyhJv9IZBNuexBIzOuWUQo3rtuIHEeraXZ90xew0CsI6tPesWR2Sums5KEft+9pwN/gwUShKbeNzq9Fbrec/PLefmoFwWBmMihVkZVjvc/KoFSBBqxV6NqsvUnjJjVBkwRljN8ly6guwILr34zAlTFi20qBWaBoZUiUt8T3TwriY1i8JknOCIVhca1o0lCvQVtNIYvJmaYZ+devsvaV6jZ1uVeA6XFhJxiegc2Ehy8QiztZqVS636KAFBA5S1zFcLG/vG59U0AphVXzai1y5WmWBFwJCVlrUVy6XzRkqFS6a5FacaDhgS4r7OuPFn7UfonQNeUMvvWJfkLI68bPXagt8C/OJVbDBhSjl3gYdnJVVHdCmihyIfZVTUikvoLAFEufOcG1jbdN5QBrntap9yjBGiv5F3MVGJVbSz4cZVvpdSxT1tMtcD5VFGVCQPkwvQ8FSnV4dPDNfSeyfL1d7/Jz66mteJczB69sNo/F366mlDvG6WGGIFNB0jTUywAvRRS3HXUfDfskMrJtwGZZHYDn3VCwmv6yRTac3XNYYapIgauwxiXYUglvh9dvCdnCAChSZ8O29XPOjTijbJlWwJRIjMh6eL3iPTv3w5AM+r0BwQINYyWtuRNaaoD1vbAmZl4GHZK5oNDq75S3azjb1MS1sIY8iHutkpNYujdsRx66zqOmqIZQopXtiTcGYJ4MKShWGB9FaeVUv8D11F7uHi7gEztG2qnYyhmFFBQrD9Hv0wJvyds8LijIOVaSwUL6O5paLFMPBVwopAWSu1cCjssRcQpZ2GtIw08ZDFmAvsw7eCjEM+DARhxkLcVeXmRywS4Dt58HTTwZiIXei3K56Zt+6ZsGrcG6wLSbqxRsZBTJKrTtBrZbruEDOoxsWFyCXI9bTdKkKXZ5Z0QUQGn43ARdtdmAOx3RYxFUF9MMFw8Vgp1N4EV9aMYxiyzJwG3ly7GaRcBQUKNW/Os7X+/RdAUwLOQDROiFNNrIqB8RyZlQgqY95gQwwQGKw1au18gIe+wieMtJQQg1bt++ixildWbwK4vZt7uHpr9dQ/kC183zLEG9eZBYIhdeyBGpr0eM+yDsXx+XfL4+DgDR1PLOk2ZlAgPuBwMmvRYIhP0XEfjuibWPu+Jh819AK9BjQ1nqCS6d/sCuSQST6gUFRsK5L1nEl9nUIP18NgDsErc3So9tcIA0Rz56fCgFjPlzM+vx6pvrzybBTiw67zjYqbhxW1VJBBGwe0pBRAgiRGNRbFmwMwxtVcy8W9fQOev00pptcViNdLaRF+UhuIQPeda4yNGIjYULMraez1Dbfua9bDdX21mfdKJP7nHn/G2s5oMO6Hx1PKZ3Z7JQRHqcNTAgpcY5FQ7ePi6f19t2V4j7QkQLexB5mGeVhn16e278HTbu+/CdjSu9t8Y7z02zbMUxR0lex65rvEYcgin3Bmebe/Hj4L7fvSAm9NcrG8hGIhG46qdwnCoYqo7BWdZKaV7VrUr+yJxvNDKZEi3si0rjgDJosK1nC0aitODLkGUt81bFzua0lcGOyTUDjdNwQIibb1OQrCk1jNFZ1MBQwJCBQIJytSBBKU6EZAVSw8CucBD7EBJFHR4BA0QzIcUmKvzAACQ3ZXsP8QAEju93hkeb0v8wACR6qYE9oACR64Gpg9nwp2P199LAAJH4c511Bq59vlDiHIuZ5yrMvM6vEzIilRuTMpXRmt46cOa3V1zFusxdrTGNNKxdZzhzhLSzmzeIt11XFrIw4GtKhStsubBCKWimVKBpEkRNQWkecVLUYHCFLp2ao8KltOhyOdSSKs0oWG+33pocJCj0kd3Wcqo0ThMUopsMv17ctUDq20smXFKESJpiwpiVfpdvWcgVQZAU+1ULbAZellyzuvNraVXic5eRtobBTGlzluuzec5Oc5tcWtyLM0ryLmtrYlqZxWqFGZaGw0iDDmQwhG0QqoM5qXx5ya9JjMLW7JqILYIF1HQIMyILZJpMTqg22CxSLiOMMiYDZWLEQLD39nVpemtsYrXFDCUETSHAOTTgbOmxeMABI3Xn8uHJUxPs3t8IJL98Bw2KbVEfxKhzkOSZWJFKqLNLomUKwVEOL/jzHDrV2C3tc7k+h4zlaTn4UFgpeF4myjZkqIgd3gnT0h3tK0QerXo5rynY3R2c6XiLodKmkYcL26vK1Mz7f2eJ0L1ekeF8QQrGZWHVRSzMJQzUVSewvOjUT6rNNCCZUVBJmvia3rcSpVG2i8xeF5qMWWh4IbtZQ6RLsYd37Q7t5zUqqIFYNbaWrbEGCCVVVV62DFzeXvar0RYK14815HNDlvyIdbjhrmumajW3x7uOPpEhG9GvWvi8Bc1eHj5BuSKPT4te7x7tB4L3qP3P0QAJD+YACQ+v9L6cPhafERRDRKEU2pbkwbFK2UD6h8xIIkspYERgGKUIjJsdFSlXhwBGFKUJBEgGKUEQL7O3aRj2OwdoAkSFw40gCIEkBCRANDQBmMQeikIRUqO0sJgxiUEEAxoTGAxpCOHzAASPL/xgcmWrwOop9QAEjtt/Zzf3AAJF+N0+63PsyHl7b5PwAASI9wACRB2sfyaTY8PaAAkSmzMUeQABIjTvOIv6eObKAAkUXSoYL29/qAASPEAAkQj1v+gACR2AAJFuI5AAEibZ3kcrMza2FH2Z9Z+eD0v0alNTipqc5Eer9HoRUWbY2C+vrxxy6Yxndz7eqMGVgweWpwGaVUITtQYl6fpDorzq4olMHFDqun2I/bcv3vnjrAY3W7In8H7/TgSPQRgO3oIKZynCQ9VcyNgwPRQ5bk9ozuNhjkRnyQA13rrigy5KwAEj7Z9ynAZbEdIXL9g2XRvV+A0pjjQZsMosgoNjFBGKwyFojgnJGCcz8oa5F0KVkmj3OtJk8tAMEVpOVce3+ASNRPfIAlZbPYSJiAiCcow0t5WKZqHSc0ThVjuqDDBFh223nKo6CMM7/OghXLmCcOxZIGz4sv6geph9OEwDArkMsrBlPRAxYfGyzl7vWU1GvEXBWbRhKpyji5/PIoQD5Lldm5GnBmkwiaCFer1h2RzYQJTa32HuvO8kZhf/IABIlqLXzSIRQtZI7dxKispkdTGpiUNQGdi7kdDipVXBjMWf0lUJ70BjuddEr71aviAAkaoDfsOX44PdqkRayHy6iTAfioEbVh9pa7GjkvnNVULcEtqvEav1QONjnBgy9uZELliQlfYYS1x1SRV9Lu60yInCxcHiKNxH6C/GqCjpVSQpENDTV0RIjzgAJFqIr5O7lXFcOC1/u+HSidDggMEjrE2THHeklNpjaaJZgcTYk6pB5N1ZzvzGGqnblhYwbDnqhZopcbywONDR2rx2TAOln3awyEaZWOzopsMnt8/XlQ6wY5JxA89F1oH8YPjmoF7cq0gBmWqcHhavV7LlpPnxs7J4ZIuGKpQIjLUeehh4dQEhVeappCdwFFYUEw1TMUaW62J1Ag4ZUqCiBx0KFDAhHqaYWSyu4sqY5zjL2AAJFSbJF5ctgNaSFRKQrMp7LJSDagj9SVtqJIOrSj29tZWO15SUBSnRqAxQcRHZ6IQNBldiJI43hs6+ByhPlqkXcVoWX+BNsHA3K9vd2rNCrQ4fdYr4aNlmuLKoQGLptEkYDfxlxbTUg5PlS3fwHhWQ5KJNSiQSJkQRkjVephYKOTK+0W8BqhfufixgXSUk5CGiIoS10HvKWGbB9GkRPx5VhuwYeggR3xGI0M2suLIBNbEldG54RnxDhH4nTlBULhWoC+66LEmSvmIvkAYFiD7U8lgAW2qC/mFpxGMp4kxDoR0rYgbAaGANDAYNDXRuuklL6zg8OPkVnRKJfWKtD+2Pj8EDov1AASIz4loecWgTCfkOu4z6VukvLUhQYmySlyxKXgTRNOypBJI9Axpg2PFdmY6IPSdp9P2qadp3+o+vWsDIFR70PPq1AWKf2gJIVI2sAYO6F+QnZLFLnZYKYwvI8YtDytJQAwgIAjQlMyMoxz24C41skxaODjT/IABIcr9VAgfrYiAoRBGm58fSTCqsZFyYIgh+Xmv5DaCpU1b/o9y+fi9sSlDJFBTmRyY5eNGjqc5daNFCl62LTF3XTzN6LnUtrTmta+HR0ZRKrWrerLBzdorNYqSWREGiGKYm1EQqkRkQOiSca4wtlKbLrgrWolFWywwaSKQGkoxl5Ix5OAphJhJxU8LFwTT/j3IzWTnTtV4I9fp8KfPnSNojDPiGHNoHADvGENs97S6rlqgoZ3fsptTsAwSr3ps8xzXLc0DaRNNB7WlUEGgBoJLgCzmdUVURbGj+XwI1/ecQZTGDbxzLLhuvGZEWM0M7kRJ5DioxpkpQ9t+/d6UGmdvnZkXIt7TgHbDbKVGFZ8sizt+xGCxUgMUYg8kKNNAMGgGxzQeAi4/ODZgjckHU/Gc/Zx1tGnm3ncrbjAXMj4XyJAwHlAay3h3JdM88C6dp7PN3ue/7BPjsPghdTQwq3YlgImgiDI6LLRGIhdJ5+j2mdztIeYT+wACI2bHPX3xOcHW50BmzrFJImHcWO+7mnxi9ZsACQ8PFsPL95nmIVlgDG346USn/wAERKb9aMPVaEg3lw2GtiDBhgH8bYwJquuFNou1GM0ib6LR25Ka8R1XdXqyqcOGgty0YG2CBbpRyEQtl3Na0eXDTaQZZooeZ5WTpyGJaazNmi0kwOqxwLUOF8wbhKqBXPEhWzqJXMh4R1gAJGtbObM8jNe6+D2dckjfRaaoznuUOUQXwobSBpMBkcrGmw2bcJclbeBgYb8SXOvRFQzRxAyAYrtL0HC0f32hN4gHwGSsmDZp8Mtz5TBcdvswPIX2BUE9r0mFgsQRUUUYyajS3g4rS+nO4cqffgVie9379Mhz3PUm0IUZ+lYJgz/EABIuL2BOaGFhhp03W9GU5xDfA3XooA2i5F8nIgaDAgRJAQKBNdEyXmGTaQiiA6bJMsyRLwFZygSrw4PkGg1jPOfH5+HlGQ9tMKAoB5JOMEKy+2knJGPR8s+89n1v2jn8m3xh4K/wKtG1Y6ZtvvWusObwuBnA4uLi3a5KWKoCqDZD5g90heDEdCiF4dLEKIONpQ3JNichjgKCAJlOKXL3VJHtmELcKg23LsOB1cpzW/5t2QI2goMjM1twJjRDGDE9s84RZEYSnB00BiQN9gIf1BO2RugUBpoLEjuxzjTHgz9aWevfHOuMKXI97SJT5jIyBmEh4OkRDal1mleKUlJEGKwqfV1XaduarpmaBQXF22aqFqHbUPX5hVDRpF4XAiqMOTMNM89CRoYj4FaWYyiP9DRiBeuTk+ajFLCF4vNSMt/5P2gpY1i2wowgjFIDGIstAo+s+SQEQgIIxkEYSc5MTAiSdHCc0gN5g4dLc80dbrjAASMnNwL1tkn56M4yG+nf3dmY7MUdvbuKMWOchInZa9ts2upsYY+CCLb7eRIvRkBRfLhldYZoA973TzqQRMReSf9AACR4ejw5qEKj6o22r6ko+TYPl3OHAsiQ12Xy/cAAkWwFWQ4V4HQAdTMc0Bh2AE7rli8xkk7UuXOsqQUi6IL0Y94sxU44nAtRM6Q8L1mMdMoSS6nfy511Aww76SnMomVUHqNdUUSHgmAMANdqLRaNCv7/Uq4uqWHJbjgj+CgMmmnqCYEBc5gGbTTw8PNaTKNuoiqI8j7Yxc/mWYWqcgkw+FlL6VlBthQmdzNllbxk6eYaOJmEgjgzfEruVQ31G6iAVUQoayLadMmwKeD38aZAPEgv7mPVId9242zL2tfgAAkHLHLBY2BIVdiT1+J8XPUjgRaMYyQQqrxM8Mru4d19b7ETDG+fWgJINFyBUnQ/C6/yTxvSLcITGgG1hyabtFjtNsegdprFnUGxNCJKEAwDkFcqvFAFAGwpfq0rDZbXqLdkp8UIeK4wVBP4StKJRXqKHqgbQpS6wBxbXVW14INroFJVysdsmCstLyyVIHA1MylSFWbM5AvZQsCRQiBBwHTeE0FsB3btzk6GHSx50e+ABIaSIRYj4woTo1bgCswPaY210e06gqwDQztoCpKOucJdNxstwR8mEPPnYPZjkFLsARak8GNSQHK10FlcAzUT10K927j0G7eG9pjQTQbJmvdtPg5x6PPGt9WpreXeqToI+KchgYeISjXmOrlRJLB2oe7IzbZkxGKJIGDjbEx8QWq1OQATyWWK3lyt5RHmAASMKhz0AKabFzaiUKZ8xEaoPoP2g6yzXRh0Axed4Ow56oa+1px7FE5Ski21a6dVkgA6ApYBXoHXrjcPV27reUZhcV4Iw5jOPa02KAtL1q5LdXV1ayUs+IACRj4njHchPGvkMYEFtHx5Q7ZIDp9bEQOQkE6OJ0RURwl7AlqPvAASOc+mz5AAJGdwvW0mGHT2QPxy388lJURE5K2tfCtEK5pHvme4G3lDGMhSwIXE8EZ0d+dbpzMayw5aiCsjzteeXhvGHakh0QdDU7terZAUF4tT4n4Xry7zuD23fiblPJejdDOM5WwlmlWlKy1HZpVAoNEg3GrJIxIwpik5IjYKsRWLWcKlElFKWBdbbQSCUyA2Sw4uOSCIH2fLej0E8u54Q8CjbW2niWDFjGa22FiQxpoE7AkMm4IBptkwCGhwnAjejx8UXGnnvhl/xNRmAAkQpI5jBoH4tZsMak/iw6Asf5s/ibU35Dsu3y8NFU3j1H5r8/c3sbuy99slNKJAgSIY0H/i7kinChIByMlFQ=')))
+
diff --git a/tutorial/testClasses.py b/tutorial/testClasses.py
new file mode 100644
index 0000000..7a4ce35
--- /dev/null
+++ b/tutorial/testClasses.py
@@ -0,0 +1,207 @@
+# testClasses.py
+# --------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+# import modules from python standard library
+from __future__ import print_function
+import inspect
+import re
+import sys
+
+
+# Class which models a question in a project.  Note that questions have a
+# maximum number of points they are worth, and are composed of a series of
+# test cases
+class Question(object):
+
+    def raiseNotDefined(self):
+        print('Method not implemented: %s' % inspect.stack()[1][3])
+        sys.exit(1)
+
+    def __init__(self, questionDict, display):
+        self.maxPoints = int(questionDict['max_points'])
+        self.testCases = []
+        self.display = display
+
+    def getDisplay(self):
+        return self.display
+
+    def getMaxPoints(self):
+        return self.maxPoints
+
+    # Note that 'thunk' must be a function which accepts a single argument,
+    # namely a 'grading' object
+    def addTestCase(self, testCase, thunk):
+        self.testCases.append((testCase, thunk))
+
+    def execute(self, grades):
+        self.raiseNotDefined()
+
+
+# Question in which all test cases must be passed in order to receive credit
+class PassAllTestsQuestion(Question):
+
+    def execute(self, grades):
+        # TODO: is this the right way to use grades?  The autograder doesn't seem to use it.
+        testsFailed = False
+        grades.assignZeroCredit()
+        for _, f in self.testCases:
+            if not f(grades):
+                testsFailed = True
+        if testsFailed:
+            grades.fail("Tests failed.")
+        else:
+            grades.assignFullCredit()
+
+
+class ExtraCreditPassAllTestsQuestion(Question):
+    def __init__(self, questionDict, display):
+        Question.__init__(self, questionDict, display)
+        self.extraPoints = int(questionDict['extra_points'])
+
+    def execute(self, grades):
+        # TODO: is this the right way to use grades?  The autograder doesn't seem to use it.
+        testsFailed = False
+        grades.assignZeroCredit()
+        for _, f in self.testCases:
+            if not f(grades):
+                testsFailed = True
+        if testsFailed:
+            grades.fail("Tests failed.")
+        else:
+            grades.assignFullCredit()
+            grades.addPoints(self.extraPoints)
+
+
+# Question in which predict credit is given for test cases with a ``points'' property.
+# All other tests are mandatory and must be passed.
+class HackedPartialCreditQuestion(Question):
+
+    def execute(self, grades):
+        # TODO: is this the right way to use grades?  The autograder doesn't seem to use it.
+        grades.assignZeroCredit()
+
+        points = 0
+        passed = True
+        for testCase, f in self.testCases:
+            testResult = f(grades)
+            if "points" in testCase.testDict:
+                if testResult: points += float(testCase.testDict["points"])
+            else:
+                passed = passed and testResult
+
+        ## FIXME: Below terrible hack to match q3's logic
+        if int(points) == self.maxPoints and not passed:
+            grades.assignZeroCredit()
+        else:
+            grades.addPoints(int(points))
+
+
+class Q6PartialCreditQuestion(Question):
+    """Fails any test which returns False, otherwise doesn't effect the grades object.
+    Partial credit tests will add the required points."""
+
+    def execute(self, grades):
+        grades.assignZeroCredit()
+
+        results = []
+        for _, f in self.testCases:
+            results.append(f(grades))
+        if False in results:
+            grades.assignZeroCredit()
+
+
+class PartialCreditQuestion(Question):
+    """Fails any test which returns False, otherwise doesn't effect the grades object.
+    Partial credit tests will add the required points."""
+
+    def execute(self, grades):
+        grades.assignZeroCredit()
+
+        for _, f in self.testCases:
+            if not f(grades):
+                grades.assignZeroCredit()
+                grades.fail("Tests failed.")
+                return False
+
+
+class NumberPassedQuestion(Question):
+    """Grade is the number of test cases passed."""
+
+    def execute(self, grades):
+        grades.addPoints([f(grades) for _, f in self.testCases].count(True))
+
+
+# Template modeling a generic test case
+class TestCase(object):
+
+    def raiseNotDefined(self):
+        print('Method not implemented: %s' % inspect.stack()[1][3])
+        sys.exit(1)
+
+    def getPath(self):
+        return self.path
+
+    def __init__(self, question, testDict):
+        self.question = question
+        self.testDict = testDict
+        self.path = testDict['path']
+        self.messages = []
+
+    def __str__(self):
+        self.raiseNotDefined()
+
+    def execute(self, grades, moduleDict, solutionDict):
+        self.raiseNotDefined()
+
+    def writeSolution(self, moduleDict, filePath):
+        self.raiseNotDefined()
+        return True
+
+    # Tests should call the following messages for grading
+    # to ensure a uniform format for test output.
+    #
+    # TODO: this is hairy, but we need to fix grading.py's interface
+    # to get a nice hierarchical project - question - test structure,
+    # then these should be moved into Question proper.
+    def testPass(self, grades):
+        grades.addMessage('PASS: %s' % (self.path,))
+        for line in self.messages:
+            grades.addMessage('    %s' % (line,))
+        return True
+
+    def testFail(self, grades):
+        grades.addMessage('FAIL: %s' % (self.path,))
+        for line in self.messages:
+            grades.addMessage('    %s' % (line,))
+        return False
+
+    # This should really be question level?
+    #
+    def testPartial(self, grades, points, maxPoints):
+        grades.addPoints(points)
+        extraCredit = max(0, points - maxPoints)
+        regularCredit = points - extraCredit
+
+        grades.addMessage('%s: %s (%s of %s points)' % (
+            "PASS" if points >= maxPoints else "FAIL", self.path, regularCredit, maxPoints))
+        if extraCredit > 0:
+            grades.addMessage('EXTRA CREDIT: %s points' % (extraCredit,))
+
+        for line in self.messages:
+            grades.addMessage('    %s' % (line,))
+
+        return True
+
+    def addMessage(self, message):
+        self.messages.extend(message.split('\n'))
diff --git a/tutorial/testParser.py b/tutorial/testParser.py
new file mode 100644
index 0000000..15646d0
--- /dev/null
+++ b/tutorial/testParser.py
@@ -0,0 +1,86 @@
+# testParser.py
+# -------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+from __future__ import print_function
+import re
+import sys
+
+
+class TestParser(object):
+
+    def __init__(self, path):
+        # save the path to the test file
+        self.path = path
+
+    def removeComments(self, rawlines):
+        # remove any portion of a line following a '#' symbol
+        fixed_lines = []
+        for l in rawlines:
+            idx = l.find('#')
+            if idx == -1:
+                fixed_lines.append(l)
+            else:
+                fixed_lines.append(l[0:idx])
+        return '\n'.join(fixed_lines)
+
+    def parse(self):
+        # read in the test case and remove comments
+        test = {}
+        with open(self.path) as handle:
+            raw_lines = handle.read().split('\n')
+
+        test_text = self.removeComments(raw_lines)
+        test['__raw_lines__'] = raw_lines
+        test['path'] = self.path
+        test['__emit__'] = []
+        lines = test_text.split('\n')
+        i = 0
+        # read a property in each loop cycle
+        while (i < len(lines)):
+            # skip blank lines
+            if re.match('\A\s*\Z', lines[i]):
+                test['__emit__'].append(("raw", raw_lines[i]))
+                i += 1
+                continue
+            m = re.match('\A([^"]*?):\s*"([^"]*)"\s*\Z', lines[i])
+            if m:
+                test[m.group(1)] = m.group(2)
+                test['__emit__'].append(("oneline", m.group(1)))
+                i += 1
+                continue
+            m = re.match('\A([^"]*?):\s*"""\s*\Z', lines[i])
+            if m:
+                msg = []
+                i += 1
+                while (not re.match('\A\s*"""\s*\Z', lines[i])):
+                    msg.append(raw_lines[i])
+                    i += 1
+                test[m.group(1)] = '\n'.join(msg)
+                test['__emit__'].append(("multiline", m.group(1)))
+                i += 1
+                continue
+            print('error parsing test file: %s' % self.path)
+            sys.exit(1)
+        return test
+
+
+def emitTestDict(testDict, handle):
+    for kind, data in testDict['__emit__']:
+        if kind == "raw":
+            handle.write(data + "\n")
+        elif kind == "oneline":
+            handle.write('%s: "%s"\n' % (data, testDict[data]))
+        elif kind == "multiline":
+            handle.write('%s: """\n%s\n"""\n' % (data, testDict[data]))
+        else:
+            raise Exception("Bad __emit__")
diff --git a/tutorial/test_cases/CONFIG b/tutorial/test_cases/CONFIG
new file mode 100644
index 0000000..eec8c0b
--- /dev/null
+++ b/tutorial/test_cases/CONFIG
@@ -0,0 +1 @@
+order: "q1 q2 q3"
diff --git a/tutorial/test_cases/q1/CONFIG b/tutorial/test_cases/q1/CONFIG
new file mode 100644
index 0000000..279f0f0
--- /dev/null
+++ b/tutorial/test_cases/q1/CONFIG
@@ -0,0 +1,2 @@
+max_points: "1"
+class: "PassAllTestsQuestion"
diff --git a/tutorial/test_cases/q1/addition1.solution b/tutorial/test_cases/q1/addition1.solution
new file mode 100644
index 0000000..6261975
--- /dev/null
+++ b/tutorial/test_cases/q1/addition1.solution
@@ -0,0 +1,3 @@
+# This is the solution file for test_cases/q1/addition1.test.
+# The result of evaluating the test must equal the below when cast to a string.
+result: "2"
diff --git a/tutorial/test_cases/q1/addition1.test b/tutorial/test_cases/q1/addition1.test
new file mode 100644
index 0000000..2d807c7
--- /dev/null
+++ b/tutorial/test_cases/q1/addition1.test
@@ -0,0 +1,7 @@
+class: "EvalTest"
+success: "add(a,b) returns the sum of a and b"
+failure: "add(a,b) must return the sum of a and b"
+
+# A python expression to be evaluated.  This expression must return the 
+# same result for the student and instructor's code.
+test: "addition.add(1,1)"
diff --git a/tutorial/test_cases/q1/addition2.solution b/tutorial/test_cases/q1/addition2.solution
new file mode 100644
index 0000000..49ebaa0
--- /dev/null
+++ b/tutorial/test_cases/q1/addition2.solution
@@ -0,0 +1,3 @@
+# This is the solution file for test_cases/q1/addition2.test.
+# The result of evaluating the test must equal the below when cast to a string.
+result: "5"
diff --git a/tutorial/test_cases/q1/addition2.test b/tutorial/test_cases/q1/addition2.test
new file mode 100644
index 0000000..76a0d91
--- /dev/null
+++ b/tutorial/test_cases/q1/addition2.test
@@ -0,0 +1,7 @@
+class: "EvalTest"
+success: "add(a,b) returns the sum of a and b"
+failure: "add(a,b) must return the sum of a and b"
+
+# A python expression to be evaluated.  This expression must return the 
+# same result for the student and instructor's code.
+test: "addition.add(2,3)"
diff --git a/tutorial/test_cases/q1/addition3.solution b/tutorial/test_cases/q1/addition3.solution
new file mode 100644
index 0000000..c258470
--- /dev/null
+++ b/tutorial/test_cases/q1/addition3.solution
@@ -0,0 +1,3 @@
+# This is the solution file for test_cases/q1/addition3.test.
+# The result of evaluating the test must equal the below when cast to a string.
+result: "7.9"
diff --git a/tutorial/test_cases/q1/addition3.test b/tutorial/test_cases/q1/addition3.test
new file mode 100644
index 0000000..462ff13
--- /dev/null
+++ b/tutorial/test_cases/q1/addition3.test
@@ -0,0 +1,7 @@
+class: "EvalTest"
+success: "add(a,b) returns the sum of a and b"
+failure: "add(a,b) must return the sum of a and b"
+
+# A python expression to be evaluated.  This expression must return the 
+# same result for the student and instructor's code.
+test: "addition.add(10,-2.1)"
diff --git a/tutorial/test_cases/q2/CONFIG b/tutorial/test_cases/q2/CONFIG
new file mode 100644
index 0000000..279f0f0
--- /dev/null
+++ b/tutorial/test_cases/q2/CONFIG
@@ -0,0 +1,2 @@
+max_points: "1"
+class: "PassAllTestsQuestion"
diff --git a/tutorial/test_cases/q2/food_price1.solution b/tutorial/test_cases/q2/food_price1.solution
new file mode 100644
index 0000000..b2a8e87
--- /dev/null
+++ b/tutorial/test_cases/q2/food_price1.solution
@@ -0,0 +1,3 @@
+# This is the solution file for test_cases/q2/food_price1.test.
+# The result of evaluating the test must equal the below when cast to a string.
+result: "12.25"
diff --git a/tutorial/test_cases/q2/food_price1.test b/tutorial/test_cases/q2/food_price1.test
new file mode 100644
index 0000000..93d2c3d
--- /dev/null
+++ b/tutorial/test_cases/q2/food_price1.test
@@ -0,0 +1,7 @@
+class: "EvalTest"
+success: "buyLotsOfFruit correctly computes the cost of the order"
+failure: "buyLotsOfFruit must compute the correct cost of the order"
+
+# A python expression to be evaluated.  This expression must return the 
+# same result for the student and instructor's code.
+test: "buyLotsOfFruit.buyLotsOfFruit([ ('apples', 2.0), ('pears',3.0), ('limes',4.0) ])"
diff --git a/tutorial/test_cases/q2/food_price2.solution b/tutorial/test_cases/q2/food_price2.solution
new file mode 100644
index 0000000..e3ec5e8
--- /dev/null
+++ b/tutorial/test_cases/q2/food_price2.solution
@@ -0,0 +1,3 @@
+# This is the solution file for test_cases/q2/food_price2.test.
+# The result of evaluating the test must equal the below when cast to a string.
+result: "14.75"
diff --git a/tutorial/test_cases/q2/food_price2.test b/tutorial/test_cases/q2/food_price2.test
new file mode 100644
index 0000000..b70e8d9
--- /dev/null
+++ b/tutorial/test_cases/q2/food_price2.test
@@ -0,0 +1,7 @@
+class: "EvalTest"
+success: "buyLotsOfFruit correctly computes the cost of the order"
+failure: "buyLotsOfFruit must compute the correct cost of the order"
+
+# A python expression to be evaluated.  This expression must return the 
+# same result for the student and instructor's code.
+test: "buyLotsOfFruit.buyLotsOfFruit([ ('apples', 4.0), ('pears',3.0), ('limes',2.0) ])"
diff --git a/tutorial/test_cases/q2/food_price3.solution b/tutorial/test_cases/q2/food_price3.solution
new file mode 100644
index 0000000..23976d6
--- /dev/null
+++ b/tutorial/test_cases/q2/food_price3.solution
@@ -0,0 +1,3 @@
+# This is the solution file for test_cases/q2/food_price3.test.
+# The result of evaluating the test must equal the below when cast to a string.
+result: "6.4375"
diff --git a/tutorial/test_cases/q2/food_price3.test b/tutorial/test_cases/q2/food_price3.test
new file mode 100644
index 0000000..9d9a395
--- /dev/null
+++ b/tutorial/test_cases/q2/food_price3.test
@@ -0,0 +1,7 @@
+class: "EvalTest"
+success: "buyLotsOfFruit correctly computes the cost of the order"
+failure: "buyLotsOfFruit must compute the correct cost of the order"
+
+# A python expression to be evaluated.  This expression must return the 
+# same result for the student and instructor's code.
+test: "buyLotsOfFruit.buyLotsOfFruit([ ('apples', 1.25), ('pears',1.50), ('limes',1.75) ])"
diff --git a/tutorial/test_cases/q3/CONFIG b/tutorial/test_cases/q3/CONFIG
new file mode 100644
index 0000000..279f0f0
--- /dev/null
+++ b/tutorial/test_cases/q3/CONFIG
@@ -0,0 +1,2 @@
+max_points: "1"
+class: "PassAllTestsQuestion"
diff --git a/tutorial/test_cases/q3/select_shop1.solution b/tutorial/test_cases/q3/select_shop1.solution
new file mode 100644
index 0000000..083c232
--- /dev/null
+++ b/tutorial/test_cases/q3/select_shop1.solution
@@ -0,0 +1,3 @@
+# This is the solution file for test_cases/q3/select_shop1.test.
+# The result of evaluating the test must equal the below when cast to a string.
+result: ""
diff --git a/tutorial/test_cases/q3/select_shop1.test b/tutorial/test_cases/q3/select_shop1.test
new file mode 100644
index 0000000..05b358a
--- /dev/null
+++ b/tutorial/test_cases/q3/select_shop1.test
@@ -0,0 +1,21 @@
+class: "EvalTest"
+success: "shopSmart(order, shops) selects the cheapest shop"
+failure: "shopSmart(order, shops) must select the cheapest shop"
+
+# Python statements initializing variables for the test below.
+preamble: """
+import shop
+
+dir1 = {'apples': 2.0, 'oranges':1.0}
+shop1 =  shop.FruitShop('shop1',dir1)
+dir2 = {'apples': 1.0, 'oranges': 5.0}
+shop2 = shop.FruitShop('shop2',dir2)
+shops = [shop1, shop2]
+
+order = [('apples',1.0), ('oranges',3.0)]
+ans = shopSmart.shopSmart(order, shops)
+"""
+
+# A python expression to be evaluated.  This expression must return the 
+# same result for the student and instructor's code.
+test: "ans"
diff --git a/tutorial/test_cases/q3/select_shop2.solution b/tutorial/test_cases/q3/select_shop2.solution
new file mode 100644
index 0000000..8497881
--- /dev/null
+++ b/tutorial/test_cases/q3/select_shop2.solution
@@ -0,0 +1,3 @@
+# This is the solution file for test_cases/q3/select_shop2.test.
+# The result of evaluating the test must equal the below when cast to a string.
+result: ""
diff --git a/tutorial/test_cases/q3/select_shop2.test b/tutorial/test_cases/q3/select_shop2.test
new file mode 100644
index 0000000..04cb6f7
--- /dev/null
+++ b/tutorial/test_cases/q3/select_shop2.test
@@ -0,0 +1,21 @@
+class: "EvalTest"
+success: "shopSmart(order, shops) selects the cheapest shop"
+failure: "shopSmart(order, shops) must select the cheapest shop"
+
+# Python statements initializing variables for the test below.
+preamble: """
+import shop
+
+dir1 = {'apples': 2.0, 'oranges':1.0}
+shop1 =  shop.FruitShop('shop1',dir1)
+dir2 = {'apples': 1.0, 'oranges': 5.0}
+shop2 = shop.FruitShop('shop2',dir2)
+shops = [shop1, shop2]
+
+order = [('apples',3.0)]
+ans = shopSmart.shopSmart(order, shops)
+"""
+
+# A python expression to be evaluated.  This expression must return the 
+# same result for the student and instructor's code.
+test: "ans"
diff --git a/tutorial/test_cases/q3/select_shop3.solution b/tutorial/test_cases/q3/select_shop3.solution
new file mode 100644
index 0000000..a6b6352
--- /dev/null
+++ b/tutorial/test_cases/q3/select_shop3.solution
@@ -0,0 +1,3 @@
+# This is the solution file for test_cases/q3/select_shop3.test.
+# The result of evaluating the test must equal the below when cast to a string.
+result: ""
diff --git a/tutorial/test_cases/q3/select_shop3.test b/tutorial/test_cases/q3/select_shop3.test
new file mode 100644
index 0000000..24eeb06
--- /dev/null
+++ b/tutorial/test_cases/q3/select_shop3.test
@@ -0,0 +1,23 @@
+class: "EvalTest"
+success: "shopSmart(order, shops) selects the cheapest shop"
+failure: "shopSmart(order, shops) must select the cheapest shop"
+
+# Python statements initializing variables for the test below.
+preamble: """
+import shop
+
+dir1 = {'apples': 2.0, 'oranges':1.0}
+shop1 =  shop.FruitShop('shop1',dir1)
+dir2 = {'apples': 1.0, 'oranges': 5.0}
+shop2 = shop.FruitShop('shop2',dir2)
+dir3 = {'apples': 1.5, 'oranges': 2.0}
+shop3 = shop.FruitShop('shop3',dir3)
+shops = [shop1, shop2, shop3]
+
+order = [('apples',10.0), ('oranges',3.0)]
+ans = shopSmart.shopSmart(order, shops)
+"""
+
+# A python expression to be evaluated.  This expression must return the 
+# same result for the student and instructor's code.
+test: "ans"
diff --git a/tutorial/textDisplay.py b/tutorial/textDisplay.py
new file mode 100644
index 0000000..21f2b2c
--- /dev/null
+++ b/tutorial/textDisplay.py
@@ -0,0 +1,85 @@
+# textDisplay.py
+# --------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+from __future__ import print_function
+import time
+
+try:
+    import pacman
+except:
+    pass
+
+DRAW_EVERY = 1
+SLEEP_TIME = 0  # This can be overwritten by __init__
+DISPLAY_MOVES = False
+QUIET = False  # Supresses output
+
+
+class NullGraphics:
+    def initialize(self, state, isBlue=False):
+        pass
+
+    def update(self, state):
+        pass
+
+    def checkNullDisplay(self):
+        return True
+
+    def pause(self):
+        time.sleep(SLEEP_TIME)
+
+    def draw(self, state):
+        print(state)
+
+    def updateDistributions(self, dist):
+        pass
+
+    def finish(self):
+        pass
+
+
+class PacmanGraphics:
+    def __init__(self, speed=None):
+        if speed != None:
+            global SLEEP_TIME
+            SLEEP_TIME = speed
+
+    def initialize(self, state, isBlue=False):
+        self.draw(state)
+        self.pause()
+        self.turn = 0
+        self.agentCounter = 0
+
+    def update(self, state):
+        numAgents = len(state.agentStates)
+        self.agentCounter = (self.agentCounter + 1) % numAgents
+        if self.agentCounter == 0:
+            self.turn += 1
+            if DISPLAY_MOVES:
+                ghosts = [pacman.nearestPoint(state.getGhostPosition(i)) for i in range(1, numAgents)]
+                print("%4d) P: %-8s" % (self.turn, str(pacman.nearestPoint(state.getPacmanPosition()))),
+                      '| Score: %-5d' % state.score, '| Ghosts:', ghosts)
+            if self.turn % DRAW_EVERY == 0:
+                self.draw(state)
+                self.pause()
+        if state._win or state._lose:
+            self.draw(state)
+
+    def pause(self):
+        time.sleep(SLEEP_TIME)
+
+    def draw(self, state):
+        print(state)
+
+    def finish(self):
+        pass
diff --git a/tutorial/town.py b/tutorial/town.py
new file mode 100644
index 0000000..dfbce01
--- /dev/null
+++ b/tutorial/town.py
@@ -0,0 +1,105 @@
+# town.py
+# -------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+import shop
+
+
+class Town:
+
+    def __init__(self, shops, distances):
+        """
+            shops: List of FruitShop objects
+
+            distances: Dictionary with keys as pairs (tuples) of names of places
+            ('home' or name strings of FruitShops) and numbers for values which
+            represent the distance between the two places in miles, e.g.
+            {('home','shop1') : 1, ('home','shop2') : 1, ('shop1','shop2') : 2}
+        """
+        self.shops = shops
+        self.distances = distances
+
+    def getFruitCostPerPoundOnRoute(self, fruit, route):
+        """
+            fruit: Fruit string
+
+            route: List of shop names
+        Returns the best cost per pound of 'fruit' at any of the shops along 
+        the route. If none of the shops carry 'fruit', returns None
+        """
+        routeShops = [shop for shop in self.shops if shop.getName() in route]
+        costs = []
+        for shop in routeShops:
+            cost = shop.getCostPerPound(fruit)
+            if cost is not None:
+                costs.append(cost)
+        if not costs:
+            # None of the shops carry this fruit
+            return None
+        return min(costs)
+
+    def allFruitsCarriedAtShops(self, orderList, shops):
+        """
+            orderList: List of (fruit, numPounds) tuples
+
+            shops: List of shop names
+        Returns whether all fruit in the order list can be purchased at at least
+        one of these shops.
+        """
+        return None not in [self.getFruitCostPerPoundOnRoute(fruit, shops)
+                            for fruit, _ in orderList]
+
+    def getDistance(self, loc1, loc2):
+        """
+            loc1: A name of a place ('home' or the name of a FruitShop in town)
+
+            loc2: A name of a place ('home' or the name of a FruitShop in town)
+        Returns the distance between these two places in this town.
+        """
+        if (loc1, loc2) in self.distances:
+            return self.distances[(loc1, loc2)]
+        return self.distances[(loc2, loc1)]
+
+    def getTotalDistanceOnRoute(self, route):
+        """
+            route: List of shop names
+        Returns the total distance traveled by starting at 'home', going to 
+        each shop on the route in order, then returning to 'home'
+        """
+        if not route:
+            return 0
+        totalDistance = self.getDistance('home', route[0])
+        for i in xrange(len(route) - 1):
+            totalDistance += self.getDistance(route[i], route[i + 1])
+        totalDistance += self.getDistance(route[-1], 'home')
+        return totalDistance
+
+    def getPriceOfOrderOnRoute(self, orderList, route, gasCost):
+        """
+            orderList: List of (fruit, numPounds) tuples
+
+            route: List of shop names
+
+            gasCost: A number representing the cost of driving 1 mile
+        Returns cost of orderList on this route. If any fruit are not available
+        on this route, returns None. 
+        """
+        totalCost = self.getTotalDistanceOnRoute(route) * gasCost
+        for fruit, numPounds in orderList:
+            costPerPound = self.getFruitCostPerPoundOnRoute(fruit, route)
+            if costPerPound is not None:
+                totalCost += numPounds * costPerPound
+        return totalCost
+
+    def getShops(self):
+        return self.shops
diff --git a/tutorial/tutorialTestClasses.py b/tutorial/tutorialTestClasses.py
new file mode 100644
index 0000000..07ea4c3
--- /dev/null
+++ b/tutorial/tutorialTestClasses.py
@@ -0,0 +1,57 @@
+# tutorialTestClasses.py
+# ----------------------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+import testClasses
+
+
+# Simple test case which evals an arbitrary piece of python code.
+# The test is correct if the output of the code given the student's
+# solution matches that of the instructor's.
+class EvalTest(testClasses.TestCase):
+
+    def __init__(self, question, testDict):
+        super(EvalTest, self).__init__(question, testDict)
+        self.preamble = compile(testDict.get('preamble', ""), "%s.preamble" % self.getPath(), 'exec')
+        self.test = compile(testDict['test'], "%s.test" % self.getPath(), 'eval')
+        self.success = testDict['success']
+        self.failure = testDict['failure']
+
+    def evalCode(self, moduleDict):
+        bindings = dict(moduleDict)
+        # exec self.preamble in bindings
+        exec(self.preamble, bindings)
+        return str(eval(self.test, bindings))
+
+    def execute(self, grades, moduleDict, solutionDict):
+        result = self.evalCode(moduleDict)
+        if result == solutionDict['result']:
+            grades.addMessage('PASS: %s' % self.path)
+            grades.addMessage('\t%s' % self.success)
+            return True
+        else:
+            grades.addMessage('FAIL: %s' % self.path)
+            grades.addMessage('\t%s' % self.failure)
+            grades.addMessage('\tstudent result: "%s"' % result)
+            grades.addMessage('\tcorrect result: "%s"' % solutionDict['result'])
+
+        return False
+
+    def writeSolution(self, moduleDict, filePath):
+        handle = open(filePath, 'w')
+        handle.write('# This is the solution file for %s.\n' % self.path)
+        handle.write('# The result of evaluating the test must equal the below when cast to a string.\n')
+
+        handle.write('result: "%s"\n' % self.evalCode(moduleDict))
+        handle.close()
+        return True
diff --git a/tutorial/util.py b/tutorial/util.py
new file mode 100644
index 0000000..50cd74a
--- /dev/null
+++ b/tutorial/util.py
@@ -0,0 +1,696 @@
+# util.py
+# -------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+# util.py
+# -------
+# Licensing Information:  You are free to use or extend these projects for
+# educational purposes provided that (1) you do not distribute or publish
+# solutions, (2) you retain this notice, and (3) you provide clear
+# attribution to UC Berkeley, including a link to http://ai.berkeley.edu.
+# 
+# Attribution Information: The Pacman AI projects were developed at UC Berkeley.
+# The core projects and autograders were primarily created by John DeNero
+# (denero@cs.berkeley.edu) and Dan Klein (klein@cs.berkeley.edu).
+# Student side autograding was added by Brad Miller, Nick Hay, and
+# Pieter Abbeel (pabbeel@cs.berkeley.edu).
+
+
+import sys
+import inspect
+import heapq, random
+
+
+# import cStringIO
+
+
+class FixedRandom:
+    def __init__(self):
+        fixedState = (3, (2147483648, 507801126, 683453281, 310439348, 2597246090,
+                          2209084787, 2267831527, 979920060, 3098657677, 37650879, 807947081, 3974896263,
+                          881243242, 3100634921, 1334775171, 3965168385, 746264660, 4074750168, 500078808,
+                          776561771, 702988163, 1636311725, 2559226045, 157578202, 2498342920, 2794591496,
+                          4130598723, 496985844, 2944563015, 3731321600, 3514814613, 3362575829, 3038768745,
+                          2206497038, 1108748846, 1317460727, 3134077628, 988312410, 1674063516, 746456451,
+                          3958482413, 1857117812, 708750586, 1583423339, 3466495450, 1536929345, 1137240525,
+                          3875025632, 2466137587, 1235845595, 4214575620, 3792516855, 657994358, 1241843248,
+                          1695651859, 3678946666, 1929922113, 2351044952, 2317810202, 2039319015, 460787996, 3654096216,
+                          4068721415, 1814163703, 2904112444, 1386111013, 574629867, 2654529343, 3833135042, 2725328455,
+                          552431551, 4006991378, 1331562057, 3710134542, 303171486, 1203231078, 2670768975, 54570816,
+                          2679609001, 578983064, 1271454725, 3230871056, 2496832891, 2944938195, 1608828728, 367886575,
+                          2544708204, 103775539, 1912402393, 1098482180, 2738577070, 3091646463, 1505274463, 2079416566,
+                          659100352, 839995305, 1696257633, 274389836, 3973303017, 671127655, 1061109122, 517486945,
+                          1379749962, 3421383928, 3116950429, 2165882425, 2346928266, 2892678711, 2936066049,
+                          1316407868, 2873411858, 4279682888, 2744351923, 3290373816, 1014377279, 955200944, 4220990860,
+                          2386098930, 1772997650, 3757346974, 1621616438, 2877097197, 442116595, 2010480266, 2867861469,
+                          2955352695, 605335967, 2222936009, 2067554933, 4129906358, 1519608541, 1195006590, 1942991038,
+                          2736562236, 279162408, 1415982909, 4099901426, 1732201505, 2934657937, 860563237, 2479235483,
+                          3081651097, 2244720867, 3112631622, 1636991639, 3860393305, 2312061927, 48780114, 1149090394,
+                          2643246550, 1764050647, 3836789087, 3474859076, 4237194338, 1735191073, 2150369208, 92164394,
+                          756974036, 2314453957, 323969533, 4267621035, 283649842, 810004843, 727855536, 1757827251,
+                          3334960421, 3261035106, 38417393, 2660980472, 1256633965, 2184045390, 811213141, 2857482069,
+                          2237770878, 3891003138, 2787806886, 2435192790, 2249324662, 3507764896, 995388363, 856944153,
+                          619213904, 3233967826, 3703465555, 3286531781, 3863193356, 2992340714, 413696855, 3865185632,
+                          1704163171, 3043634452, 2225424707, 2199018022, 3506117517, 3311559776, 3374443561,
+                          1207829628, 668793165, 1822020716, 2082656160, 1160606415, 3034757648, 741703672, 3094328738,
+                          459332691, 2702383376, 1610239915, 4162939394, 557861574, 3805706338, 3832520705, 1248934879,
+                          3250424034, 892335058, 74323433, 3209751608, 3213220797, 3444035873, 3743886725, 1783837251,
+                          610968664, 580745246, 4041979504, 201684874, 2673219253, 1377283008, 3497299167, 2344209394,
+                          2304982920, 3081403782, 2599256854, 3184475235, 3373055826, 695186388, 2423332338, 222864327,
+                          1258227992, 3627871647, 3487724980, 4027953808, 3053320360, 533627073, 3026232514, 2340271949,
+                          867277230, 868513116, 2158535651, 2487822909, 3428235761, 3067196046, 3435119657, 1908441839,
+                          788668797, 3367703138, 3317763187, 908264443, 2252100381, 764223334, 4127108988, 384641349,
+                          3377374722, 1263833251, 1958694944, 3847832657, 1253909612, 1096494446, 555725445, 2277045895,
+                          3340096504, 1383318686, 4234428127, 1072582179, 94169494, 1064509968, 2681151917, 2681864920,
+                          734708852, 1338914021, 1270409500, 1789469116, 4191988204, 1716329784, 2213764829, 3712538840,
+                          919910444, 1318414447, 3383806712, 3054941722, 3378649942, 1205735655, 1268136494, 2214009444,
+                          2532395133, 3232230447, 230294038, 342599089, 772808141, 4096882234, 3146662953, 2784264306,
+                          1860954704, 2675279609, 2984212876, 2466966981, 2627986059, 2985545332, 2578042598,
+                          1458940786, 2944243755, 3959506256, 1509151382, 325761900, 942251521, 4184289782, 2756231555,
+                          3297811774, 1169708099, 3280524138, 3805245319, 3227360276, 3199632491, 2235795585,
+                          2865407118, 36763651, 2441503575, 3314890374, 1755526087, 17915536, 1196948233, 949343045,
+                          3815841867, 489007833, 2654997597, 2834744136, 417688687, 2843220846, 85621843, 747339336,
+                          2043645709, 3520444394, 1825470818, 647778910, 275904777, 1249389189, 3640887431, 4200779599,
+                          323384601, 3446088641, 4049835786, 1718989062, 3563787136, 44099190, 3281263107, 22910812,
+                          1826109246, 745118154, 3392171319, 1571490704, 354891067, 815955642, 1453450421, 940015623,
+                          796817754, 1260148619, 3898237757, 176670141, 1870249326, 3317738680, 448918002, 4059166594,
+                          2003827551, 987091377, 224855998, 3520570137, 789522610, 2604445123, 454472869, 475688926,
+                          2990723466, 523362238, 3897608102, 806637149, 2642229586, 2928614432, 1564415411, 1691381054,
+                          3816907227, 4082581003, 1895544448, 3728217394, 3214813157, 4054301607, 1882632454,
+                          2873728645, 3694943071, 1297991732, 2101682438, 3952579552, 678650400, 1391722293, 478833748,
+                          2976468591, 158586606, 2576499787, 662690848, 3799889765, 3328894692, 2474578497, 2383901391,
+                          1718193504, 3003184595, 3630561213, 1929441113, 3848238627, 1594310094, 3040359840,
+                          3051803867, 2462788790, 954409915, 802581771, 681703307, 545982392, 2738993819, 8025358,
+                          2827719383, 770471093, 3484895980, 3111306320, 3900000891, 2116916652, 397746721, 2087689510,
+                          721433935, 1396088885, 2751612384, 1998988613, 2135074843, 2521131298, 707009172, 2398321482,
+                          688041159, 2264560137, 482388305, 207864885, 3735036991, 3490348331, 1963642811, 3260224305,
+                          3493564223, 1939428454, 1128799656, 1366012432, 2858822447, 1428147157, 2261125391,
+                          1611208390, 1134826333, 2374102525, 3833625209, 2266397263, 3189115077, 770080230, 2674657172,
+                          4280146640, 3604531615, 4235071805, 3436987249, 509704467, 2582695198, 4256268040, 3391197562,
+                          1460642842, 1617931012, 457825497, 1031452907, 1330422862, 4125947620, 2280712485, 431892090,
+                          2387410588, 2061126784, 896457479, 3480499461, 2488196663, 4021103792, 1877063114, 2744470201,
+                          1046140599, 2129952955, 3583049218, 4217723693, 2720341743, 820661843, 1079873609, 3360954200,
+                          3652304997, 3335838575, 2178810636, 1908053374, 4026721976, 1793145418, 476541615, 973420250,
+                          515553040, 919292001, 2601786155, 1685119450, 3030170809, 1590676150, 1665099167, 651151584,
+                          2077190587, 957892642, 646336572, 2743719258, 866169074, 851118829, 4225766285, 963748226,
+                          799549420, 1955032629, 799460000, 2425744063, 2441291571, 1928963772, 528930629, 2591962884,
+                          3495142819, 1896021824, 901320159, 3181820243, 843061941, 3338628510, 3782438992, 9515330,
+                          1705797226, 953535929, 764833876, 3202464965, 2970244591, 519154982, 3390617541, 566616744,
+                          3438031503, 1853838297, 170608755, 1393728434, 676900116, 3184965776, 1843100290, 78995357,
+                          2227939888, 3460264600, 1745705055, 1474086965, 572796246, 4081303004, 882828851, 1295445825,
+                          137639900, 3304579600, 2722437017, 4093422709, 273203373, 2666507854, 3998836510, 493829981,
+                          1623949669, 3482036755, 3390023939, 833233937, 1639668730, 1499455075, 249728260, 1210694006,
+                          3836497489, 1551488720, 3253074267, 3388238003, 2372035079, 3945715164, 2029501215,
+                          3362012634, 2007375355, 4074709820, 631485888, 3135015769, 4273087084, 3648076204, 2739943601,
+                          1374020358, 1760722448, 3773939706, 1313027823, 1895251226, 4224465911, 421382535, 1141067370,
+                          3660034846, 3393185650, 1850995280, 1451917312, 3841455409, 3926840308, 1397397252,
+                          2572864479, 2500171350, 3119920613, 531400869, 1626487579, 1099320497, 407414753, 2438623324,
+                          99073255, 3175491512, 656431560, 1153671785, 236307875, 2824738046, 2320621382, 892174056,
+                          230984053, 719791226, 2718891946, 624), None)
+        self.random = random.Random()
+        self.random.setstate(fixedState)
+
+
+"""
+ Data structures useful for implementing SearchAgents
+"""
+
+
+class Stack:
+    "A container with a last-in-first-out (LIFO) queuing policy."
+
+    def __init__(self):
+        self.list = []
+
+    def push(self, item):
+        "Push 'item' onto the stack"
+        self.list.append(item)
+
+    def pop(self):
+        "Pop the most recently pushed item from the stack"
+        return self.list.pop()
+
+    def isEmpty(self):
+        "Returns true if the stack is empty"
+        return len(self.list) == 0
+
+
+class Queue:
+    "A container with a first-in-first-out (FIFO) queuing policy."
+
+    def __init__(self):
+        self.list = []
+
+    def push(self, item):
+        "Enqueue the 'item' into the queue"
+        self.list.insert(0, item)
+
+    def pop(self):
+        """
+          Dequeue the earliest enqueued item still in the queue. This
+          operation removes the item from the queue.
+        """
+        return self.list.pop()
+
+    def isEmpty(self):
+        "Returns true if the queue is empty"
+        return len(self.list) == 0
+
+
+class PriorityQueue:
+    """
+      Implements a priority queue data structure. Each inserted item
+      has a priority associated with it and the client is usually interested
+      in quick retrieval of the lowest-priority item in the queue. This
+      data structure allows O(1) access to the lowest-priority item.
+    """
+
+    def __init__(self):
+        self.heap = []
+        self.count = 0
+
+    def push(self, item, priority):
+        entry = (priority, self.count, item)
+        heapq.heappush(self.heap, entry)
+        self.count += 1
+
+    def pop(self):
+        (_, _, item) = heapq.heappop(self.heap)
+        return item
+
+    def isEmpty(self):
+        return len(self.heap) == 0
+
+    def update(self, item, priority):
+        # If item already in priority queue with higher priority, update its priority and rebuild the heap.
+        # If item already in priority queue with equal or lower priority, do nothing.
+        # If item not in priority queue, do the same thing as self.push.
+        for index, (p, c, i) in enumerate(self.heap):
+            if i == item:
+                if p <= priority:
+                    break
+                del self.heap[index]
+                self.heap.append((priority, c, item))
+                heapq.heapify(self.heap)
+                break
+        else:
+            self.push(item, priority)
+
+
+class PriorityQueueWithFunction(PriorityQueue):
+    """
+    Implements a priority queue with the same push/pop signature of the
+    Queue and the Stack classes. This is designed for drop-in replacement for
+    those two classes. The caller has to provide a priority function, which
+    extracts each item's priority.
+    """
+
+    def __init__(self, priorityFunction):
+        "priorityFunction (item) -> priority"
+        self.priorityFunction = priorityFunction  # store the priority function
+        PriorityQueue.__init__(self)  # super-class initializer
+
+    def push(self, item):
+        "Adds an item to the queue with priority from the priority function"
+        PriorityQueue.push(self, item, self.priorityFunction(item))
+
+
+def manhattanDistance(xy1, xy2):
+    "Returns the Manhattan distance between points xy1 and xy2"
+    return abs(xy1[0] - xy2[0]) + abs(xy1[1] - xy2[1])
+
+
+"""
+  Data structures and functions useful for various course projects
+
+  The search project should not need anything below this line.
+"""
+
+
+class Counter(dict):
+    """
+    A counter keeps track of counts for a set of keys.
+
+    The counter class is an extension of the standard python
+    dictionary type.  It is specialized to have number values
+    (integers or floats), and includes a handful of additional
+    functions to ease the task of counting data.  In particular,
+    all keys are defaulted to have value 0.  Using a dictionary:
+
+    a = {}
+    print(a['test'])
+
+    would give an error, while the Counter class analogue:
+
+    >>> a = Counter()
+    >>> print(a['test'])
+    0
+
+    returns the default 0 value. Note that to reference a key
+    that you know is contained in the counter,
+    you can still use the dictionary syntax:
+
+    >>> a = Counter()
+    >>> a['test'] = 2
+    >>> print(a['test'])
+    2
+
+    This is very useful for counting things without initializing their counts,
+    see for example:
+
+    >>> a['blah'] += 1
+    >>> print(a['blah'])
+    1
+
+    The counter also includes additional functionality useful in implementing
+    the classifiers for this assignment.  Two counters can be added,
+    subtracted or multiplied together.  See below for details.  They can
+    also be normalized and their total count and arg max can be extracted.
+    """
+
+    def __getitem__(self, idx):
+        self.setdefault(idx, 0)
+        return dict.__getitem__(self, idx)
+
+    def incrementAll(self, keys, count):
+        """
+        Increments all elements of keys by the same count.
+
+        >>> a = Counter()
+        >>> a.incrementAll(['one','two', 'three'], 1)
+        >>> a['one']
+        1
+        >>> a['two']
+        1
+        """
+        for key in keys:
+            self[key] += count
+
+    def argMax(self):
+        """
+        Returns the key with the highest value.
+        """
+        if len(self.keys()) == 0: return None
+        all = self.items()
+        values = [x[1] for x in all]
+        maxIndex = values.index(max(values))
+        return all[maxIndex][0]
+
+    def sortedKeys(self):
+        """
+        Returns a list of keys sorted by their values.  Keys
+        with the highest values will appear first.
+
+        >>> a = Counter()
+        >>> a['first'] = -2
+        >>> a['second'] = 4
+        >>> a['third'] = 1
+        >>> a.sortedKeys()
+        ['second', 'third', 'first']
+        """
+        sortedItems = self.items()
+        compare = lambda x, y: sign(y[1] - x[1])
+        sortedItems.sort(cmp=compare)
+        return [x[0] for x in sortedItems]
+
+    def totalCount(self):
+        """
+        Returns the sum of counts for all keys.
+        """
+        return sum(self.values())
+
+    def normalize(self):
+        """
+        Edits the counter such that the total count of all
+        keys sums to 1.  The ratio of counts for all keys
+        will remain the same. Note that normalizing an empty
+        Counter will result in an error.
+        """
+        total = float(self.totalCount())
+        if total == 0: return
+        for key in self.keys():
+            self[key] = self[key] / total
+
+    def divideAll(self, divisor):
+        """
+        Divides all counts by divisor
+        """
+        divisor = float(divisor)
+        for key in self:
+            self[key] /= divisor
+
+    def copy(self):
+        """
+        Returns a copy of the counter
+        """
+        return Counter(dict.copy(self))
+
+    def __mul__(self, y):
+        """
+        Multiplying two counters gives the dot product of their vectors where
+        each unique label is a vector element.
+
+        >>> a = Counter()
+        >>> b = Counter()
+        >>> a['first'] = -2
+        >>> a['second'] = 4
+        >>> b['first'] = 3
+        >>> b['second'] = 5
+        >>> a['third'] = 1.5
+        >>> a['fourth'] = 2.5
+        >>> a * b
+        14
+        """
+        sum = 0
+        x = self
+        if len(x) > len(y):
+            x, y = y, x
+        for key in x:
+            if key not in y:
+                continue
+            sum += x[key] * y[key]
+        return sum
+
+    def __radd__(self, y):
+        """
+        Adding another counter to a counter increments the current counter
+        by the values stored in the second counter.
+
+        >>> a = Counter()
+        >>> b = Counter()
+        >>> a['first'] = -2
+        >>> a['second'] = 4
+        >>> b['first'] = 3
+        >>> b['third'] = 1
+        >>> a += b
+        >>> a['first']
+        1
+        """
+        for key, value in y.items():
+            self[key] += value
+
+    def __add__(self, y):
+        """
+        Adding two counters gives a counter with the union of all keys and
+        counts of the second added to counts of the first.
+
+        >>> a = Counter()
+        >>> b = Counter()
+        >>> a['first'] = -2
+        >>> a['second'] = 4
+        >>> b['first'] = 3
+        >>> b['third'] = 1
+        >>> (a + b)['first']
+        1
+        """
+        addend = Counter()
+        for key in self:
+            if key in y:
+                addend[key] = self[key] + y[key]
+            else:
+                addend[key] = self[key]
+        for key in y:
+            if key in self:
+                continue
+            addend[key] = y[key]
+        return addend
+
+    def __sub__(self, y):
+        """
+        Subtracting a counter from another gives a counter with the union of all keys and
+        counts of the second subtracted from counts of the first.
+
+        >>> a = Counter()
+        >>> b = Counter()
+        >>> a['first'] = -2
+        >>> a['second'] = 4
+        >>> b['first'] = 3
+        >>> b['third'] = 1
+        >>> (a - b)['first']
+        -5
+        """
+        addend = Counter()
+        for key in self:
+            if key in y:
+                addend[key] = self[key] - y[key]
+            else:
+                addend[key] = self[key]
+        for key in y:
+            if key in self:
+                continue
+            addend[key] = -1 * y[key]
+        return addend
+
+
+def raiseNotDefined():
+    fileName = inspect.stack()[1][1]
+    line = inspect.stack()[1][2]
+    method = inspect.stack()[1][3]
+
+    print("*** Method not implemented: %s at line %s of %s" % (method, line, fileName))
+    sys.exit(1)
+
+
+def normalize(vectorOrCounter):
+    """
+    normalize a vector or counter by dividing each value by the sum of all values
+    """
+    normalizedCounter = Counter()
+    if type(vectorOrCounter) == type(normalizedCounter):
+        counter = vectorOrCounter
+        total = float(counter.totalCount())
+        if total == 0: return counter
+        for key in counter.keys():
+            value = counter[key]
+            normalizedCounter[key] = value / total
+        return normalizedCounter
+    else:
+        vector = vectorOrCounter
+        s = float(sum(vector))
+        if s == 0: return vector
+        return [el / s for el in vector]
+
+
+def nSample(distribution, values, n):
+    if sum(distribution) != 1:
+        distribution = normalize(distribution)
+    rand = [random.random() for i in range(n)]
+    rand.sort()
+    samples = []
+    samplePos, distPos, cdf = 0, 0, distribution[0]
+    while samplePos < n:
+        if rand[samplePos] < cdf:
+            samplePos += 1
+            samples.append(values[distPos])
+        else:
+            distPos += 1
+            cdf += distribution[distPos]
+    return samples
+
+
+def sample(distribution, values=None):
+    if type(distribution) == Counter:
+        items = sorted(distribution.items())
+        distribution = [i[1] for i in items]
+        values = [i[0] for i in items]
+    if sum(distribution) != 1:
+        distribution = normalize(distribution)
+    choice = random.random()
+    i, total = 0, distribution[0]
+    while choice > total:
+        i += 1
+        total += distribution[i]
+    return values[i]
+
+
+def sampleFromCounter(ctr):
+    items = sorted(ctr.items())
+    return sample([v for k, v in items], [k for k, v in items])
+
+
+def getProbability(value, distribution, values):
+    """
+      Gives the probability of a value under a discrete distribution
+      defined by (distributions, values).
+    """
+    total = 0.0
+    for prob, val in zip(distribution, values):
+        if val == value:
+            total += prob
+    return total
+
+
+def flipCoin(p):
+    r = random.random()
+    return r < p
+
+
+def chooseFromDistribution(distribution):
+    "Takes either a counter or a list of (prob, key) pairs and samples"
+    if type(distribution) == dict or type(distribution) == Counter:
+        return sample(distribution)
+    r = random.random()
+    base = 0.0
+    for prob, element in distribution:
+        base += prob
+        if r <= base: return element
+
+
+def nearestPoint(pos):
+    """
+    Finds the nearest grid point to a position (discretizes).
+    """
+    (current_row, current_col) = pos
+
+    grid_row = int(current_row + 0.5)
+    grid_col = int(current_col + 0.5)
+    return (grid_row, grid_col)
+
+
+def sign(x):
+    """
+    Returns 1 or -1 depending on the sign of x
+    """
+    if (x >= 0):
+        return 1
+    else:
+        return -1
+
+
+def arrayInvert(array):
+    """
+    Inverts a matrix stored as a list of lists.
+    """
+    result = [[] for i in array]
+    for outer in array:
+        for inner in range(len(outer)):
+            result[inner].append(outer[inner])
+    return result
+
+
+def matrixAsList(matrix, value=True):
+    """
+    Turns a matrix into a list of coordinates matching the specified value
+    """
+    rows, cols = len(matrix), len(matrix[0])
+    cells = []
+    for row in range(rows):
+        for col in range(cols):
+            if matrix[row][col] == value:
+                cells.append((row, col))
+    return cells
+
+
+def lookup(name, namespace):
+    """
+    Get a method or class from any imported module from its name.
+    Usage: lookup(functionName, globals())
+    """
+    dots = name.count('.')
+    if dots > 0:
+        moduleName, objName = '.'.join(name.split('.')[:-1]), name.split('.')[-1]
+        module = __import__(moduleName)
+        return getattr(module, objName)
+    else:
+        modules = [obj for obj in namespace.values() if str(type(obj)) == ""]
+        options = [getattr(module, name) for module in modules if name in dir(module)]
+        options += [obj[1] for obj in namespace.items() if obj[0] == name]
+        if len(options) == 1: return options[0]
+        if len(options) > 1: raise Exception('Name conflict for %s')
+        raise Exception('%s not found as a method or class' % name)
+
+
+def pause():
+    """
+    Pauses the output stream awaiting user feedback.
+    """
+    print("")
+    raw_input()
+
+
+# code to handle timeouts
+#
+# FIXME
+# NOTE: TimeoutFuncton is NOT reentrant.  Later timeouts will silently
+# disable earlier timeouts.  Could be solved by maintaining a global list
+# of active time outs.  Currently, questions which have test cases calling
+# this have all student code so wrapped.
+#
+import signal
+import time
+
+
+class TimeoutFunctionException(Exception):
+    """Exception to raise on a timeout"""
+    pass
+
+
+class TimeoutFunction:
+    def __init__(self, function, timeout):
+        self.timeout = timeout
+        self.function = function
+
+    def handle_timeout(self, signum, frame):
+        raise TimeoutFunctionException()
+
+    def __call__(self, *args, **keyArgs):
+        # If we have SIGALRM signal, use it to cause an exception if and
+        # when this function runs too long.  Otherwise check the time taken
+        # after the method has returned, and throw an exception then.
+        if hasattr(signal, 'SIGALRM'):
+            old = signal.signal(signal.SIGALRM, self.handle_timeout)
+            signal.alarm(self.timeout)
+            try:
+                result = self.function(*args, **keyArgs)
+            finally:
+                signal.signal(signal.SIGALRM, old)
+            signal.alarm(0)
+        else:
+            startTime = time.time()
+            result = self.function(*args, **keyArgs)
+            timeElapsed = time.time() - startTime
+            if timeElapsed >= self.timeout:
+                self.handle_timeout(None, None)
+        return result
+
+
+_ORIGINAL_STDOUT = None
+_ORIGINAL_STDERR = None
+_MUTED = False
+
+
+class WritableNull:
+    def write(self, string):
+        pass
+
+
+def mutePrint():
+    global _ORIGINAL_STDOUT, _ORIGINAL_STDERR, _MUTED
+    if _MUTED:
+        return
+    _MUTED = True
+
+    _ORIGINAL_STDOUT = sys.stdout
+    # _ORIGINAL_STDERR = sys.stderr
+    sys.stdout = WritableNull()
+    # sys.stderr = WritableNull()
+
+
+def unmutePrint():
+    global _ORIGINAL_STDOUT, _ORIGINAL_STDERR, _MUTED
+    if not _MUTED:
+        return
+    _MUTED = False
+
+    sys.stdout = _ORIGINAL_STDOUT
+    # sys.stderr = _ORIGINAL_STDERR