diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d717e7bc3c458bfe48758fae14d84e9f9bbd202c..7eb5327be1d05757a21e6cf151acd6b5a3b5b6e4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,124 +1,47 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="5c539cf3-5e55-47e3-a081-0dc06e4e72ed" name="Default Changelist" comment=""> - <change beforePath="$PROJECT_DIR$/lib/engine.io-client-1.0.0.jar" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/lib/json-20090211.jar" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/lib/okhttp-3.8.1.jar" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/lib/okio-1.13.0.jar" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/lib/socket.io-client-1.0.0.jar" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/project08-othello.iml" beforeDir="false" afterPath="$PROJECT_DIR$/project08-othello.iml" afterDir="false" /> + <list default="true" id="5c539cf3-5e55-47e3-a081-0dc06e4e72ed" name="Default Changelist" comment="rename to project09"> + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/board/ArrayBoard.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/board/ArrayBoard.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/board/ArrayBoardFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/board/ArrayBoardFactory.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/bots/AbstractSearcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/bots/AbstractSearcher.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/bots/AlphaBetaSearcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/bots/AlphaBetaSearcher.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/bots/BestMove.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/bots/BestMove.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/bots/MinimaxSearcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/bots/MinimaxSearcher.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/datastructures/ArrayDeque.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/datastructures/ArrayDeque.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/datastructures/LinkedDeque.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/datastructures/LinkedDeque.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/game/Board.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/game/Board.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/game/BoardFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/game/BoardFactory.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/game/Evaluator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/game/Evaluator.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/game/Move.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/game/Move.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/game/Searcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/game/Searcher.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/game/SimpleEvaluator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/game/SimpleEvaluator.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/game/SimpleTimer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/game/SimpleTimer.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/game/Timer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/game/Timer.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/interfaces/ICollection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/interfaces/ICollection.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/interfaces/IDeque.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/interfaces/IDeque.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/interfaces/IQueue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/interfaces/IQueue.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/project08/interfaces/IStack.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/project09/interfaces/IStack.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/play/Bot.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/play/Bot.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/play/Play.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/play/Play.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/tests/edu/caltech/cs2/project08/GenerateTestFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/tests/edu/caltech/cs2/project09/GenerateTestFiles.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/tests/edu/caltech/cs2/project08/TestEvaluator.java" beforeDir="false" afterPath="$PROJECT_DIR$/tests/edu/caltech/cs2/project09/TestEvaluator.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/tests/edu/caltech/cs2/project08/TestSearches.java" beforeDir="false" afterPath="$PROJECT_DIR$/tests/edu/caltech/cs2/project09/TestSearches.java" afterDir="false" /> </list> - <ignored path="$PROJECT_DIR$/out/" /> - <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="LAST_RESOLUTION" value="IGNORE" /> </component> - <component name="FileEditorManager"> - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/project08/bots/MinimaxSearcher.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="96"> - <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/project08/bots/AlphaBetaSearcher.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="96"> - <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/play/Bot.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="96"> - <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/play/Play.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="96"> - <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" /> - </state> - </provider> - </entry> - </file> - </leaf> - </component> <component name="Git.Settings"> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> </component> - <component name="IdeDocumentHistory"> - <option name="CHANGED_PATHS"> - <list> - <option value="$PROJECT_DIR$/src/edu/caltech/cs2/project08/bots/AbstractSearcher.java" /> - </list> - </option> - </component> - <component name="ProjectFrameBounds" extendedState="6"> - <option name="x" value="1" /> - <option name="y" value="23" /> - <option name="width" value="1440" /> - <option name="height" value="877" /> - </component> - <component name="ProjectView"> - <navigator proportions="" version="1"> - <foldersAlwaysOnTop value="true" /> - </navigator> - <panes> - <pane id="ProjectPane"> - <subPane> - <expand> - <path> - <item name="project08-bulbasaur" type="b2602c69:ProjectViewProjectNode" /> - <item name="project08-bulbasaur" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="project08-bulbasaur" type="b2602c69:ProjectViewProjectNode" /> - <item name="project08-bulbasaur" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="project08-bulbasaur" type="b2602c69:ProjectViewProjectNode" /> - <item name="project08-bulbasaur" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="project08" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="project08-bulbasaur" type="b2602c69:ProjectViewProjectNode" /> - <item name="project08-bulbasaur" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="project08" type="462c0819:PsiDirectoryNode" /> - <item name="bots" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="project08-bulbasaur" type="b2602c69:ProjectViewProjectNode" /> - <item name="project08-bulbasaur" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="play" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="project08-bulbasaur" type="b2602c69:ProjectViewProjectNode" /> - <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" /> - </path> - </expand> - <select /> - </subPane> - </pane> - <pane id="PackagesPane" /> - <pane id="Scope" /> - </panes> + <component name="ProjectId" id="1Ydsnjod0qMegTJYF77i3oz1zKg" /> + <component name="ProjectViewState"> + <option name="hideEmptyMiddlePackages" value="true" /> + <option name="showExcludedFiles" value="true" /> + <option name="showLibraryContents" value="true" /> </component> <component name="PropertiesComponent"> <property name="Downloaded.Files.Path.Enabled" value="false" /> @@ -131,18 +54,6 @@ <property name="project.structure.proportion" value="0.0" /> <property name="project.structure.side.proportion" value="0.2" /> </component> - <component name="RunDashboard"> - <option name="ruleStates"> - <list> - <RuleState> - <option name="name" value="ConfigurationTypeDashboardGroupingRule" /> - </RuleState> - <RuleState> - <option name="name" value="StatusDashboardGroupingRule" /> - </RuleState> - </list> - </option> - </component> <component name="RunManager" selected="JUnit.C Tests"> <configuration name="Run" type="Application" factoryName="Application"> <option name="MAIN_CLASS_NAME" value="play.Play" /> @@ -180,83 +91,31 @@ </task> <servers /> </component> - <component name="TestHistory"> - <history-entry file="C_Tests - 2019.03.09 at 09h 51m 05s.xml"> - <configuration name="C Tests" configurationId="JUnit" /> - </history-entry> - </component> - <component name="ToolWindowManager"> - <frame x="0" y="23" width="1440" height="877" extended-state="6" /> - <editor active="true" /> - <layout> - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2532189" /> - <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> - <window_info id="Image Layers" order="2" /> - <window_info id="Designer" order="3" /> - <window_info id="UI Designer" order="4" /> - <window_info id="Capture Tool" order="5" /> - <window_info id="Favorites" order="6" side_tool="true" /> - <window_info anchor="bottom" id="Messages" /> - <window_info anchor="bottom" id="Message" order="0" /> - <window_info anchor="bottom" id="Find" order="1" /> - <window_info anchor="bottom" id="Run" order="2" weight="0.3299363" /> - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> - <window_info anchor="bottom" id="TODO" order="6" /> - <window_info anchor="bottom" id="Floobits" order="7" /> - <window_info anchor="bottom" id="Terminal" order="8" /> - <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" /> - <window_info anchor="bottom" id="Version Control" order="10" /> - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> - <window_info anchor="right" id="Palette" order="3" /> - <window_info anchor="right" id="Theme Preview" order="4" /> - <window_info anchor="right" id="Maven" order="5" /> - <window_info anchor="right" id="Capture Analysis" order="6" /> - <window_info anchor="right" id="Palette	" order="7" /> - </layout> + <component name="VcsManagerConfiguration"> + <MESSAGE value="rename to project09" /> + <option name="LAST_COMMIT_MESSAGE" value="rename to project09" /> </component> - <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/project08/bots/AbstractSearcher.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="48"> - <caret line="2" selection-start-line="2" selection-end-line="2" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/play/Play.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="96"> - <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/project08/bots/MinimaxSearcher.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="96"> - <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/play/Bot.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="96"> - <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/project08/bots/AlphaBetaSearcher.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="96"> - <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" /> - </state> - </provider> - </entry> + <component name="WindowStateProjectService"> + <state x="395" y="9" key="CommitChangelistDialog2" timestamp="1583284303227"> + <screen x="0" y="0" width="1536" height="824" /> + </state> + <state x="395" y="9" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1583284303227" /> + <state width="1493" height="211" key="GridCell.Tab.0.bottom" timestamp="1583284236006"> + <screen x="0" y="0" width="1536" height="824" /> + </state> + <state width="1493" height="211" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1583284236006" /> + <state width="1493" height="211" key="GridCell.Tab.0.center" timestamp="1583284236006"> + <screen x="0" y="0" width="1536" height="824" /> + </state> + <state width="1493" height="211" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1583284236006" /> + <state width="1493" height="211" key="GridCell.Tab.0.left" timestamp="1583284236005"> + <screen x="0" y="0" width="1536" height="824" /> + </state> + <state width="1493" height="211" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1583284236005" /> + <state width="1493" height="211" key="GridCell.Tab.0.right" timestamp="1583284236006"> + <screen x="0" y="0" width="1536" height="824" /> + </state> + <state width="1493" height="211" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1583284236006" /> </component> <component name="masterDetails"> <states> diff --git a/src/edu/caltech/cs2/project08/board/ArrayBoard.java b/src/edu/caltech/cs2/project09/board/ArrayBoard.java similarity index 95% rename from src/edu/caltech/cs2/project08/board/ArrayBoard.java rename to src/edu/caltech/cs2/project09/board/ArrayBoard.java index f1208fad72d4a9daa37c5b3f3038781cc4c2768b..76786cf5f7700d3d148f76d014a296a51de20c1f 100644 --- a/src/edu/caltech/cs2/project08/board/ArrayBoard.java +++ b/src/edu/caltech/cs2/project09/board/ArrayBoard.java @@ -1,11 +1,11 @@ -package edu.caltech.cs2.project08.board; - -import edu.caltech.cs2.project08.datastructures.ArrayDeque; -import edu.caltech.cs2.project08.datastructures.LinkedDeque; -import edu.caltech.cs2.project08.game.Board; -import edu.caltech.cs2.project08.interfaces.IDeque; -import edu.caltech.cs2.project08.game.Move; -import edu.caltech.cs2.project08.interfaces.IStack; +package edu.caltech.cs2.project09.board; + +import edu.caltech.cs2.project09.datastructures.ArrayDeque; +import edu.caltech.cs2.project09.datastructures.LinkedDeque; +import edu.caltech.cs2.project09.game.Board; +import edu.caltech.cs2.project09.interfaces.IDeque; +import edu.caltech.cs2.project09.game.Move; +import edu.caltech.cs2.project09.interfaces.IStack; public class ArrayBoard implements Board { public static final int BLACK = -1; diff --git a/src/edu/caltech/cs2/project08/board/ArrayBoardFactory.java b/src/edu/caltech/cs2/project09/board/ArrayBoardFactory.java similarity index 72% rename from src/edu/caltech/cs2/project08/board/ArrayBoardFactory.java rename to src/edu/caltech/cs2/project09/board/ArrayBoardFactory.java index 876e2177214172a933adee5abced2a4eab7e0b4a..349eb61285602b6cbf7d65d9ec00b218ecc1ed71 100644 --- a/src/edu/caltech/cs2/project08/board/ArrayBoardFactory.java +++ b/src/edu/caltech/cs2/project09/board/ArrayBoardFactory.java @@ -1,6 +1,6 @@ -package edu.caltech.cs2.project08.board; +package edu.caltech.cs2.project09.board; -import edu.caltech.cs2.project08.game.BoardFactory; +import edu.caltech.cs2.project09.game.BoardFactory; public class ArrayBoardFactory implements BoardFactory<ArrayBoard> { private String pos; diff --git a/src/edu/caltech/cs2/project08/bots/AbstractSearcher.java b/src/edu/caltech/cs2/project09/bots/AbstractSearcher.java similarity index 93% rename from src/edu/caltech/cs2/project08/bots/AbstractSearcher.java rename to src/edu/caltech/cs2/project09/bots/AbstractSearcher.java index 24f9502541504a95dd8aef3a68181eb2d3beaae4..f229d1e4961415bfc68884f3b977c502617a5d31 100644 --- a/src/edu/caltech/cs2/project08/bots/AbstractSearcher.java +++ b/src/edu/caltech/cs2/project09/bots/AbstractSearcher.java @@ -1,6 +1,6 @@ -package edu.caltech.cs2.project08.bots; +package edu.caltech.cs2.project09.bots; -import edu.caltech.cs2.project08.game.*; +import edu.caltech.cs2.project09.game.*; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; diff --git a/src/edu/caltech/cs2/project08/bots/AlphaBetaSearcher.java b/src/edu/caltech/cs2/project09/bots/AlphaBetaSearcher.java similarity index 68% rename from src/edu/caltech/cs2/project08/bots/AlphaBetaSearcher.java rename to src/edu/caltech/cs2/project09/bots/AlphaBetaSearcher.java index bad0e66f80b4307549c6db03d70ee17d221c956d..c50e27d48f7a98f41d412daf4c7c1e193ebac4c6 100644 --- a/src/edu/caltech/cs2/project08/bots/AlphaBetaSearcher.java +++ b/src/edu/caltech/cs2/project09/bots/AlphaBetaSearcher.java @@ -1,8 +1,8 @@ -package edu.caltech.cs2.project08.bots; +package edu.caltech.cs2.project09.bots; -import edu.caltech.cs2.project08.game.Board; -import edu.caltech.cs2.project08.game.Evaluator; -import edu.caltech.cs2.project08.game.Move; +import edu.caltech.cs2.project09.game.Board; +import edu.caltech.cs2.project09.game.Evaluator; +import edu.caltech.cs2.project09.game.Move; public class AlphaBetaSearcher<B extends Board> extends AbstractSearcher<B> { @Override diff --git a/src/edu/caltech/cs2/project08/bots/BestMove.java b/src/edu/caltech/cs2/project09/bots/BestMove.java similarity index 78% rename from src/edu/caltech/cs2/project08/bots/BestMove.java rename to src/edu/caltech/cs2/project09/bots/BestMove.java index def94ae6329141b0b2dca43d6cc8d8941b45fc4c..5de9404809adf1eb2e7c0cf843f008f82354e3e3 100644 --- a/src/edu/caltech/cs2/project08/bots/BestMove.java +++ b/src/edu/caltech/cs2/project09/bots/BestMove.java @@ -1,6 +1,6 @@ -package edu.caltech.cs2.project08.bots; +package edu.caltech.cs2.project09.bots; -import edu.caltech.cs2.project08.game.Move; +import edu.caltech.cs2.project09.game.Move; public class BestMove { public Move move; diff --git a/src/edu/caltech/cs2/project08/bots/MinimaxSearcher.java b/src/edu/caltech/cs2/project09/bots/MinimaxSearcher.java similarity index 67% rename from src/edu/caltech/cs2/project08/bots/MinimaxSearcher.java rename to src/edu/caltech/cs2/project09/bots/MinimaxSearcher.java index 874e3fa5d68f0269e54daae733878e38c64dddc0..9db854c388870cfe52b186a2f7ab40e62b1978ff 100644 --- a/src/edu/caltech/cs2/project08/bots/MinimaxSearcher.java +++ b/src/edu/caltech/cs2/project09/bots/MinimaxSearcher.java @@ -1,8 +1,8 @@ -package edu.caltech.cs2.project08.bots; +package edu.caltech.cs2.project09.bots; -import edu.caltech.cs2.project08.game.Board; -import edu.caltech.cs2.project08.game.Evaluator; -import edu.caltech.cs2.project08.game.Move; +import edu.caltech.cs2.project09.game.Board; +import edu.caltech.cs2.project09.game.Evaluator; +import edu.caltech.cs2.project09.game.Move; public class MinimaxSearcher<B extends Board> extends AbstractSearcher<B> { @Override diff --git a/src/edu/caltech/cs2/project08/datastructures/ArrayDeque.java b/src/edu/caltech/cs2/project09/datastructures/ArrayDeque.java similarity index 82% rename from src/edu/caltech/cs2/project08/datastructures/ArrayDeque.java rename to src/edu/caltech/cs2/project09/datastructures/ArrayDeque.java index 039c5d6931787b18d51342ff1269c251036b3a54..aee7f3c5a905ef6e8447216a7f89cda9cf307b1f 100644 --- a/src/edu/caltech/cs2/project08/datastructures/ArrayDeque.java +++ b/src/edu/caltech/cs2/project09/datastructures/ArrayDeque.java @@ -1,8 +1,8 @@ -package edu.caltech.cs2.project08.datastructures; +package edu.caltech.cs2.project09.datastructures; -import edu.caltech.cs2.project08.interfaces.IDeque; -import edu.caltech.cs2.project08.interfaces.IQueue; -import edu.caltech.cs2.project08.interfaces.IStack; +import edu.caltech.cs2.project09.interfaces.IDeque; +import edu.caltech.cs2.project09.interfaces.IQueue; +import edu.caltech.cs2.project09.interfaces.IStack; import java.util.Iterator; diff --git a/src/edu/caltech/cs2/project08/datastructures/LinkedDeque.java b/src/edu/caltech/cs2/project09/datastructures/LinkedDeque.java similarity index 82% rename from src/edu/caltech/cs2/project08/datastructures/LinkedDeque.java rename to src/edu/caltech/cs2/project09/datastructures/LinkedDeque.java index 110fa6fed5874868eb30446e4afc98dbc16c7838..c76fff51ae49392608be46fa86780ad0f3bac605 100644 --- a/src/edu/caltech/cs2/project08/datastructures/LinkedDeque.java +++ b/src/edu/caltech/cs2/project09/datastructures/LinkedDeque.java @@ -1,8 +1,8 @@ -package edu.caltech.cs2.project08.datastructures; +package edu.caltech.cs2.project09.datastructures; -import edu.caltech.cs2.project08.interfaces.IDeque; -import edu.caltech.cs2.project08.interfaces.IQueue; -import edu.caltech.cs2.project08.interfaces.IStack; +import edu.caltech.cs2.project09.interfaces.IDeque; +import edu.caltech.cs2.project09.interfaces.IQueue; +import edu.caltech.cs2.project09.interfaces.IStack; import java.util.Iterator; diff --git a/src/edu/caltech/cs2/project08/game/Board.java b/src/edu/caltech/cs2/project09/game/Board.java similarity index 93% rename from src/edu/caltech/cs2/project08/game/Board.java rename to src/edu/caltech/cs2/project09/game/Board.java index d37e5e26c68cb74257ea656147590f16d3f1b0b7..ff5c5f441995abbe130dc8784083fe4b199cae92 100644 --- a/src/edu/caltech/cs2/project08/game/Board.java +++ b/src/edu/caltech/cs2/project09/game/Board.java @@ -1,6 +1,6 @@ -package edu.caltech.cs2.project08.game; +package edu.caltech.cs2.project09.game; -import edu.caltech.cs2.project08.interfaces.IDeque; +import edu.caltech.cs2.project09.interfaces.IDeque; public interface Board { // Stuff for Board string parsing. diff --git a/src/edu/caltech/cs2/project08/game/BoardFactory.java b/src/edu/caltech/cs2/project09/game/BoardFactory.java similarity index 90% rename from src/edu/caltech/cs2/project08/game/BoardFactory.java rename to src/edu/caltech/cs2/project09/game/BoardFactory.java index d2c6575d737f2de3e5194cf3484f3c7bbba7cd9b..81d043455cf0cba33eb20323a66b5e9e341c1aa3 100644 --- a/src/edu/caltech/cs2/project08/game/BoardFactory.java +++ b/src/edu/caltech/cs2/project09/game/BoardFactory.java @@ -1,4 +1,4 @@ -package edu.caltech.cs2.project08.game; +package edu.caltech.cs2.project09.game; public interface BoardFactory<B extends Board> { /** diff --git a/src/edu/caltech/cs2/project08/game/Evaluator.java b/src/edu/caltech/cs2/project09/game/Evaluator.java similarity index 86% rename from src/edu/caltech/cs2/project08/game/Evaluator.java rename to src/edu/caltech/cs2/project09/game/Evaluator.java index 75b393acc735c20b042ad6cd6db6474518c151e1..5a0c594c15ba48a2ee7a203dcd4ac79da1ae556b 100644 --- a/src/edu/caltech/cs2/project08/game/Evaluator.java +++ b/src/edu/caltech/cs2/project09/game/Evaluator.java @@ -1,4 +1,4 @@ -package edu.caltech.cs2.project08.game; +package edu.caltech.cs2.project09.game; public interface Evaluator<B extends Board> { /** diff --git a/src/edu/caltech/cs2/project08/game/Move.java b/src/edu/caltech/cs2/project09/game/Move.java similarity index 95% rename from src/edu/caltech/cs2/project08/game/Move.java rename to src/edu/caltech/cs2/project09/game/Move.java index 1730d7893b0bc76fabad0bf9c03c6cdc9e88cfdd..b01a2c9c775d854566417da25c213b964356f230 100644 --- a/src/edu/caltech/cs2/project08/game/Move.java +++ b/src/edu/caltech/cs2/project09/game/Move.java @@ -1,4 +1,4 @@ -package edu.caltech.cs2.project08.game; +package edu.caltech.cs2.project09.game; public class Move { public static final int PASS = -1; diff --git a/src/edu/caltech/cs2/project08/game/Searcher.java b/src/edu/caltech/cs2/project09/game/Searcher.java similarity index 95% rename from src/edu/caltech/cs2/project08/game/Searcher.java rename to src/edu/caltech/cs2/project09/game/Searcher.java index f7818f760d77e3551469f29bd6d7b9580b0cbad5..1ead226e89c435d63f0481c5e3bf39fc0c9e1c31 100644 --- a/src/edu/caltech/cs2/project08/game/Searcher.java +++ b/src/edu/caltech/cs2/project09/game/Searcher.java @@ -1,4 +1,4 @@ -package edu.caltech.cs2.project08.game; +package edu.caltech.cs2.project09.game; import java.beans.PropertyChangeListener; @@ -50,7 +50,7 @@ public interface Searcher<B extends Board> { * This is typically done by extending the Observable class and using its * addObserver, setChanged, and notifyObservers methods. * - * @param o the new Observer + * @param listener the new Observer */ public void addOnBestMoveListener(PropertyChangeListener listener); } \ No newline at end of file diff --git a/src/edu/caltech/cs2/project08/game/SimpleEvaluator.java b/src/edu/caltech/cs2/project09/game/SimpleEvaluator.java similarity index 94% rename from src/edu/caltech/cs2/project08/game/SimpleEvaluator.java rename to src/edu/caltech/cs2/project09/game/SimpleEvaluator.java index 93c503427111d402a19089779230acb7028b936a..4cce0f7b49ebb28f95b572e371ca8517d5f51c1c 100644 --- a/src/edu/caltech/cs2/project08/game/SimpleEvaluator.java +++ b/src/edu/caltech/cs2/project09/game/SimpleEvaluator.java @@ -1,4 +1,4 @@ -package edu.caltech.cs2.project08.game; +package edu.caltech.cs2.project09.game; public class SimpleEvaluator<B extends Board> implements Evaluator<B> { /** diff --git a/src/edu/caltech/cs2/project08/game/SimpleTimer.java b/src/edu/caltech/cs2/project09/game/SimpleTimer.java similarity index 95% rename from src/edu/caltech/cs2/project08/game/SimpleTimer.java rename to src/edu/caltech/cs2/project09/game/SimpleTimer.java index 85a59a61e27e345a79cd2ebf8dc0c17ef4f684e5..8a65d89c7b1b08362c5c9a4e84dd719f850cab5f 100644 --- a/src/edu/caltech/cs2/project08/game/SimpleTimer.java +++ b/src/edu/caltech/cs2/project09/game/SimpleTimer.java @@ -1,4 +1,4 @@ -package edu.caltech.cs2.project08.game; +package edu.caltech.cs2.project09.game; public class SimpleTimer implements Timer { @SuppressWarnings("unused") diff --git a/src/edu/caltech/cs2/project08/game/Timer.java b/src/edu/caltech/cs2/project09/game/Timer.java similarity index 96% rename from src/edu/caltech/cs2/project08/game/Timer.java rename to src/edu/caltech/cs2/project09/game/Timer.java index 5be8c18d3259fa7a29285a8075a05f973898f722..353d4f326c3a8f580e7580ed57bea3139ea9a89d 100644 --- a/src/edu/caltech/cs2/project08/game/Timer.java +++ b/src/edu/caltech/cs2/project09/game/Timer.java @@ -1,4 +1,4 @@ -package edu.caltech.cs2.project08.game; +package edu.caltech.cs2.project09.game; public interface Timer { /** diff --git a/src/edu/caltech/cs2/project08/interfaces/ICollection.java b/src/edu/caltech/cs2/project09/interfaces/ICollection.java similarity index 96% rename from src/edu/caltech/cs2/project08/interfaces/ICollection.java rename to src/edu/caltech/cs2/project09/interfaces/ICollection.java index 0763470abc1ecb3d4c89475f9fec423c64714d94..3c2a42f4bab3346055324031fb67ea9cd9104a9d 100644 --- a/src/edu/caltech/cs2/project08/interfaces/ICollection.java +++ b/src/edu/caltech/cs2/project09/interfaces/ICollection.java @@ -1,4 +1,4 @@ -package edu.caltech.cs2.project08.interfaces; +package edu.caltech.cs2.project09.interfaces; import java.util.Iterator; diff --git a/src/edu/caltech/cs2/project08/interfaces/IDeque.java b/src/edu/caltech/cs2/project09/interfaces/IDeque.java similarity index 97% rename from src/edu/caltech/cs2/project08/interfaces/IDeque.java rename to src/edu/caltech/cs2/project09/interfaces/IDeque.java index 02eaec88ac48764b34070f55ea8fc05ad9942acc..356b7de7dca1eaab88c452c11ed0134647e1a339 100644 --- a/src/edu/caltech/cs2/project08/interfaces/IDeque.java +++ b/src/edu/caltech/cs2/project09/interfaces/IDeque.java @@ -1,4 +1,4 @@ -package edu.caltech.cs2.project08.interfaces; +package edu.caltech.cs2.project09.interfaces; /** * This interface represents a deque - a data structure that can add and remove elements from either end of a list. diff --git a/src/edu/caltech/cs2/project08/interfaces/IQueue.java b/src/edu/caltech/cs2/project09/interfaces/IQueue.java similarity index 95% rename from src/edu/caltech/cs2/project08/interfaces/IQueue.java rename to src/edu/caltech/cs2/project09/interfaces/IQueue.java index 5d6bf746b30a858015b25b0a7e9dea11a6a7491d..90a037e1e6a8a183fa6b5680f7a87b813f4a9cf6 100644 --- a/src/edu/caltech/cs2/project08/interfaces/IQueue.java +++ b/src/edu/caltech/cs2/project09/interfaces/IQueue.java @@ -1,4 +1,4 @@ -package edu.caltech.cs2.project08.interfaces; +package edu.caltech.cs2.project09.interfaces; /** * This interface represents a queue - a data structure that can add elements at one end and remove them from the other. diff --git a/src/edu/caltech/cs2/project08/interfaces/IStack.java b/src/edu/caltech/cs2/project09/interfaces/IStack.java similarity index 95% rename from src/edu/caltech/cs2/project08/interfaces/IStack.java rename to src/edu/caltech/cs2/project09/interfaces/IStack.java index a27338ef6fe4702fa14c5254067782384de30a1f..968cd1657fc597c098cfe1e817dfbd84d6a1333b 100644 --- a/src/edu/caltech/cs2/project08/interfaces/IStack.java +++ b/src/edu/caltech/cs2/project09/interfaces/IStack.java @@ -1,4 +1,4 @@ -package edu.caltech.cs2.project08.interfaces; +package edu.caltech.cs2.project09.interfaces; /** * This interface represents a stack - a data structure that can add elements remove elements from a single end. diff --git a/src/play/Bot.java b/src/play/Bot.java index 3d9c5176b498a3c66ccf3b42e0a649e32103491f..931921b25445e5d0e9f693f48c238cb5ee63c6ac 100644 --- a/src/play/Bot.java +++ b/src/play/Bot.java @@ -1,13 +1,13 @@ package play; -import edu.caltech.cs2.project08.board.ArrayBoard; -import edu.caltech.cs2.project08.board.ArrayBoardFactory; -import edu.caltech.cs2.project08.bots.AbstractSearcher; -import edu.caltech.cs2.project08.bots.AlphaBetaSearcher; -import edu.caltech.cs2.project08.game.BoardFactory; -import edu.caltech.cs2.project08.game.Evaluator; -import edu.caltech.cs2.project08.game.Move; -import edu.caltech.cs2.project08.game.SimpleEvaluator; +import edu.caltech.cs2.project09.board.ArrayBoard; +import edu.caltech.cs2.project09.board.ArrayBoardFactory; +import edu.caltech.cs2.project09.bots.AbstractSearcher; +import edu.caltech.cs2.project09.bots.AlphaBetaSearcher; +import edu.caltech.cs2.project09.game.BoardFactory; +import edu.caltech.cs2.project09.game.Evaluator; +import edu.caltech.cs2.project09.game.Move; +import edu.caltech.cs2.project09.game.SimpleEvaluator; public class Bot { public static final String BOT_NAME = "MyBotName"; diff --git a/src/play/Play.java b/src/play/Play.java index bb326874488e4deb68ab00fa73bc5f133acaddcb..f6e509cdc737c854329c51848d4aa52abb306d11 100644 --- a/src/play/Play.java +++ b/src/play/Play.java @@ -1,6 +1,6 @@ package play; -import edu.caltech.cs2.project08.game.Move; +import edu.caltech.cs2.project09.game.Move; import io.socket.client.IO; import io.socket.client.Socket; import org.json.JSONArray; diff --git a/tests/edu/caltech/cs2/project08/GenerateTestFiles.java b/tests/edu/caltech/cs2/project09/GenerateTestFiles.java similarity index 89% rename from tests/edu/caltech/cs2/project08/GenerateTestFiles.java rename to tests/edu/caltech/cs2/project09/GenerateTestFiles.java index f92b03613d3b2632341c522b8ee146c4985e1f7e..fd57c75c03312233e677579fca95879672acb7a5 100644 --- a/tests/edu/caltech/cs2/project08/GenerateTestFiles.java +++ b/tests/edu/caltech/cs2/project09/GenerateTestFiles.java @@ -1,11 +1,11 @@ -package edu.caltech.cs2.project08; +package edu.caltech.cs2.project09; -import edu.caltech.cs2.project08.board.ArrayBoard; -import edu.caltech.cs2.project08.bots.AbstractSearcher; -import edu.caltech.cs2.project08.interfaces.IDeque; -import edu.caltech.cs2.project08.game.Move; -import edu.caltech.cs2.project08.bots.MinimaxSearcher; -import edu.caltech.cs2.project08.bots.AlphaBetaSearcher; +import edu.caltech.cs2.project09.board.ArrayBoard; +import edu.caltech.cs2.project09.bots.AbstractSearcher; +import edu.caltech.cs2.project09.interfaces.IDeque; +import edu.caltech.cs2.project09.game.Move; +import edu.caltech.cs2.project09.bots.MinimaxSearcher; +import edu.caltech.cs2.project09.bots.AlphaBetaSearcher; import java.io.IOException; import java.nio.charset.Charset; diff --git a/tests/edu/caltech/cs2/project08/TestEvaluator.java b/tests/edu/caltech/cs2/project09/TestEvaluator.java similarity index 73% rename from tests/edu/caltech/cs2/project08/TestEvaluator.java rename to tests/edu/caltech/cs2/project09/TestEvaluator.java index 1fca793f3416d76c8b8aa3542318892c6fb2047e..b0076ff99b66d1148f511c8af0424df403ad7764 100644 --- a/tests/edu/caltech/cs2/project08/TestEvaluator.java +++ b/tests/edu/caltech/cs2/project09/TestEvaluator.java @@ -1,7 +1,7 @@ -package edu.caltech.cs2.project08; +package edu.caltech.cs2.project09; -import edu.caltech.cs2.project08.board.ArrayBoard; -import edu.caltech.cs2.project08.game.Evaluator; +import edu.caltech.cs2.project09.board.ArrayBoard; +import edu.caltech.cs2.project09.game.Evaluator; import java.util.ArrayList; import java.util.List; diff --git a/tests/edu/caltech/cs2/project08/TestSearches.java b/tests/edu/caltech/cs2/project09/TestSearches.java similarity index 92% rename from tests/edu/caltech/cs2/project08/TestSearches.java rename to tests/edu/caltech/cs2/project09/TestSearches.java index 751c173778bc70d01dc34434e2acb4bf308bbd12..d17838f3de50842fd85f407c9fb2537f0c994325 100644 --- a/tests/edu/caltech/cs2/project08/TestSearches.java +++ b/tests/edu/caltech/cs2/project09/TestSearches.java @@ -1,11 +1,11 @@ -package edu.caltech.cs2.project08; +package edu.caltech.cs2.project09; -import edu.caltech.cs2.project08.board.ArrayBoard; -import edu.caltech.cs2.project08.bots.AbstractSearcher; -import edu.caltech.cs2.project08.bots.AlphaBetaSearcher; -import edu.caltech.cs2.project08.bots.MinimaxSearcher; -import edu.caltech.cs2.project08.interfaces.IDeque; -import edu.caltech.cs2.project08.game.Move; +import edu.caltech.cs2.project09.board.ArrayBoard; +import edu.caltech.cs2.project09.bots.AbstractSearcher; +import edu.caltech.cs2.project09.bots.AlphaBetaSearcher; +import edu.caltech.cs2.project09.bots.MinimaxSearcher; +import edu.caltech.cs2.project09.interfaces.IDeque; +import edu.caltech.cs2.project09.game.Move; import org.hamcrest.MatcherAssert; import org.hamcrest.collection.IsIterableContainingInOrder; import org.junit.jupiter.api.*;