diff --git a/.idea/misc.xml b/.idea/misc.xml
index 31a15a2c8451f9426e5948022935a9520266e514..1b2350bb6262dc1f211315fd0a72b9640d1d97a4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
<component name="PreferredVcsStorage">
<preferredVcsName>ApexVCS</preferredVcsName>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11.0.1" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index e91d92e76284fe6800c8b7437927c76a8481b684..c4f2b1cde9e9a35b87f4c616d374622cc5977bbd 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/lab03-debugging.iml" filepath="$PROJECT_DIR$/lab03-debugging.iml" />
+ <module fileurl="file://$PROJECT_DIR$/lab02-debugging.iml" filepath="$PROJECT_DIR$/lab02-debugging.iml" />
</modules>
</component>
-</project>
\ No newline at end of file
+</project>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c2365ab11f9ba6b763735c8fd976420234bb3521..94a25f7f4cb416c083d265558da75d457237d671 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4307605931d4b6e1868197302c5839a43f3b36ec..51bef09f552a3202e2eb03dae45442d3ad332e5e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,15 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="33ee2760-e338-4bce-beda-496772b46940" name="Default Changelist" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<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/lab03/Searcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/edu/caltech/cs2/lab03/Searcher.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/BinarySearcherTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/BinarySearcherTests.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../../../Projects/project02/project02-hangman/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../../Projects/project02/project02-hangman/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/lab03-debugging.iml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/lab03/Searcher.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/edu/caltech/cs2/lab03/SearcherClient.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/BinarySearcherTests.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/LinearSearcherTests.java" beforeDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -23,13 +28,14 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/lab03/Searcher.java">
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/lab02/Searcher.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#402#403#0" expanded="true" />
- <element signature="e#425#426#0" expanded="true" />
+ <element signature="e#427#428#0" expanded="true" />
+ <element signature="e#493#494#0" expanded="true" />
<element signature="e#518#519#0" expanded="true" />
</folding>
</state>
@@ -37,41 +43,21 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/LinearSearcherTests.java">
+ <entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab02/LinearSearcherTests.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="imports" expanded="true" />
- <element signature="e#856#857#0" expanded="true" />
- <element signature="e#884#885#0" expanded="true" />
- <element signature="e#950#951#0" expanded="true" />
- <element signature="e#977#978#0" expanded="true" />
- <element signature="e#1046#1047#0" expanded="true" />
- <element signature="e#1074#1075#0" expanded="true" />
- <element signature="e#1138#1139#0" expanded="true" />
- <element signature="e#1165#1166#0" expanded="true" />
- <element signature="e#1234#1235#0" expanded="true" />
- <element signature="e#1262#1263#0" expanded="true" />
- <element signature="e#1322#1323#0" expanded="true" />
- <element signature="e#1349#1350#0" expanded="true" />
- <element signature="e#1414#1415#0" expanded="true" />
- <element signature="e#1442#1443#0" expanded="true" />
- <element signature="e#1426#1427#0" expanded="true" />
- <element signature="e#1459#1460#0" expanded="true" />
- <element signature="e#1374#1375#0" expanded="true" />
- <element signature="e#1407#1408#0" expanded="true" />
- <element signature="e#1461#1462#0" expanded="true" />
- <element signature="e#1494#1495#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/BinarySearcherTests.java">
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab02/BinarySearcherTests.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="15" column="25" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" />
+ <state relative-caret-position="414">
+ <caret line="49" column="84" selection-start-line="49" selection-start-column="84" selection-end-line="49" selection-end-column="84" />
</state>
</provider>
</entry>
@@ -86,26 +72,26 @@
</option>
</component>
<component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../.." />
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/Searcher.java" />
- <option value="$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/BodyTests.java" />
- <option value="$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/OurSearcherTests.java" />
+ <option value="$PROJECT_DIR$/tests/edu/caltech/cs2/lab02/BodyTests.java" />
+ <option value="$PROJECT_DIR$/tests/edu/caltech/cs2/lab02/OurSearcherTests.java" />
<option value="$PROJECT_DIR$/tests/edu/caltech/cs2/helpers/Reflection.java" />
- <option value="$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/StudentSearcherTests.java" />
- <option value="$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/StaffSearcherTests.java" />
- <option value="$PROJECT_DIR$/lab03-debugging.iml" />
- <option value="$PROJECT_DIR$/src/edu/caltech/cs2/lab03/SearcherClient.java" />
- <option value="$PROJECT_DIR$/src/edu/caltech/cs2/lab03/StudentSearcherTests.java" />
- <option value="$PROJECT_DIR$/src/edu/caltech/cs2/lab03/SearcherTests.java" />
- <option value="$PROJECT_DIR$/src/edu/caltech/cs2/lab03/tests/LinearSearcherTests.java" />
- <option value="$PROJECT_DIR$/src/edu/caltech/cs2/lab03/LinearSearcherTests.java" />
- <option value="$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/LinearSearcherTests.java" />
- <option value="$PROJECT_DIR$/src/edu/caltech/cs2/lab03/Searcher.java" />
- <option value="$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/BinarySearcherTests.java" />
+ <option value="$PROJECT_DIR$/tests/edu/caltech/cs2/lab02/StudentSearcherTests.java" />
+ <option value="$PROJECT_DIR$/tests/edu/caltech/cs2/lab02/StaffSearcherTests.java" />
+ <option value="$PROJECT_DIR$/lab02-debugging.iml" />
+ <option value="$PROJECT_DIR$/src/edu/caltech/cs2/lab02/SearcherClient.java" />
+ <option value="$PROJECT_DIR$/src/edu/caltech/cs2/lab02/StudentSearcherTests.java" />
+ <option value="$PROJECT_DIR$/src/edu/caltech/cs2/lab02/SearcherTests.java" />
+ <option value="$PROJECT_DIR$/src/edu/caltech/cs2/lab02/tests/LinearSearcherTests.java" />
+ <option value="$PROJECT_DIR$/src/edu/caltech/cs2/lab02/LinearSearcherTests.java" />
+ <option value="$PROJECT_DIR$/tests/edu/caltech/cs2/lab02/LinearSearcherTests.java" />
+ <option value="$PROJECT_DIR$/src/edu/caltech/cs2/lab02/Searcher.java" />
+ <option value="$PROJECT_DIR$/tests/edu/caltech/cs2/lab02/BinarySearcherTests.java" />
</list>
</option>
</component>
@@ -127,47 +113,36 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
- <item name="lab03-debugging" type="b2602c69:ProjectViewProjectNode" />
- <item name="lab03-debugging" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="lab03-debugging" type="b2602c69:ProjectViewProjectNode" />
- <item name="lab03-debugging" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="lab03-debugging" type="b2602c69:ProjectViewProjectNode" />
- <item name="lab03-debugging" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="lab03" type="462c0819:PsiDirectoryNode" />
+ <item name="lab02" type="b2602c69:ProjectViewProjectNode" />
+ <item name="lab02" type="462c0819:PsiDirectoryNode" />
</path>
<path>
- <item name="lab03-debugging" type="b2602c69:ProjectViewProjectNode" />
- <item name="lab03-debugging" type="462c0819:PsiDirectoryNode" />
+ <item name="lab02" type="b2602c69:ProjectViewProjectNode" />
+ <item name="lab02" type="462c0819:PsiDirectoryNode" />
<item name="tests" type="462c0819:PsiDirectoryNode" />
</path>
<path>
- <item name="lab03-debugging" type="b2602c69:ProjectViewProjectNode" />
- <item name="lab03-debugging" type="462c0819:PsiDirectoryNode" />
+ <item name="lab02" type="b2602c69:ProjectViewProjectNode" />
+ <item name="lab02" type="462c0819:PsiDirectoryNode" />
<item name="tests" type="462c0819:PsiDirectoryNode" />
<item name="cs2" type="462c0819:PsiDirectoryNode" />
</path>
<path>
- <item name="lab03-debugging" type="b2602c69:ProjectViewProjectNode" />
- <item name="lab03-debugging" type="462c0819:PsiDirectoryNode" />
+ <item name="lab02" type="b2602c69:ProjectViewProjectNode" />
+ <item name="lab02" type="462c0819:PsiDirectoryNode" />
<item name="tests" type="462c0819:PsiDirectoryNode" />
<item name="cs2" type="462c0819:PsiDirectoryNode" />
- <item name="lab03" type="462c0819:PsiDirectoryNode" />
+ <item name="lab02" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
+ <pane id="Scope" />
<pane id="PackagesPane" />
<pane id="Course" />
</panes>
@@ -186,14 +161,14 @@
<property name="project.structure.last.edited" value="Libraries" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.2" />
- <property name="settings.editor.selected.configurable" value="preferences.remoteExternalTools" />
+ <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
</component>
<component name="RecentsManager">
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
- <recent name="edu.caltech.cs2.lab03" />
+ <recent name="edu.caltech.cs2.lab02" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
- <recent name="edu.caltech.cs2.lab03" />
+ <recent name="edu.caltech.cs2.lab02" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$" />
@@ -211,19 +186,19 @@
</list>
</option>
</component>
- <component name="RunManager" selected="JUnit.Linear Search Tests">
+ <component name="RunManager" selected="JUnit.Binary Search Tests">
<configuration name="SearcherClient" type="Application" factoryName="Application">
- <option name="MAIN_CLASS_NAME" value="edu.caltech.cs2.lab03.SearcherClient" />
- <module name="lab03-debugging" />
+ <option name="MAIN_CLASS_NAME" value="edu.caltech.cs2.lab02.SearcherClient" />
+ <module name="lab02-debugging" />
<option name="VM_PARAMETERS" value="-ea" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Binary Search Tests" type="JUnit" factoryName="JUnit">
- <module name="lab03-debugging" />
- <option name="PACKAGE_NAME" value="edu.caltech.cs2.lab03" />
- <option name="MAIN_CLASS_NAME" value="edu.caltech.cs2.lab03.BinarySearcherTests" />
+ <module name="lab02-debugging" />
+ <option name="PACKAGE_NAME" value="edu.caltech.cs2.lab02" />
+ <option name="MAIN_CLASS_NAME" value="edu.caltech.cs2.lab02.BinarySearcherTests" />
<option name="METHOD_NAME" value="" />
<option name="PARAMETERS" value="" />
<method v="2">
@@ -231,9 +206,9 @@
</method>
</configuration>
<configuration name="Linear Search Tests" type="JUnit" factoryName="JUnit">
- <module name="lab03-debugging" />
- <option name="PACKAGE_NAME" value="edu.caltech.cs2.lab03" />
- <option name="MAIN_CLASS_NAME" value="edu.caltech.cs2.lab03.LinearSearcherTests" />
+ <module name="lab02-debugging" />
+ <option name="PACKAGE_NAME" value="edu.caltech.cs2.lab02" />
+ <option name="MAIN_CLASS_NAME" value="edu.caltech.cs2.lab02.LinearSearcherTests" />
<option name="METHOD_NAME" value="" />
<option name="PARAMETERS" value="" />
<method v="2">
@@ -261,12 +236,6 @@
<servers />
</component>
<component name="TestHistory">
- <history-entry file="All_Tests - 2018.12.02 at 06h 46m 19s.xml">
- <configuration name="All Tests" configurationId="JUnit" />
- </history-entry>
- <history-entry file="All_Tests - 2018.12.02 at 06h 49m 27s.xml">
- <configuration name="All Tests" configurationId="JUnit" />
- </history-entry>
<history-entry file="Student_Tests - 2018.12.28 at 07h 30m 01s.xml">
<configuration name="Student Tests" configurationId="JUnit" />
</history-entry>
@@ -291,6 +260,12 @@
<history-entry file="Student_Tests - 2018.12.28 at 07h 58m 36s.xml">
<configuration name="Student Tests" configurationId="JUnit" />
</history-entry>
+ <history-entry file="Linear_Search_Tests - 2019.01.17 at 08h 37m 06s.xml">
+ <configuration name="Linear Search Tests" configurationId="JUnit" />
+ </history-entry>
+ <history-entry file="Binary_Search_Tests - 2019.01.17 at 08h 37m 22s.xml">
+ <configuration name="Binary Search Tests" configurationId="JUnit" />
+ </history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="3298000" />
@@ -299,16 +274,17 @@
<frame x="23" y="23" width="1402" height="834" extended-state="0" />
<editor active="true" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25367647" />
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25735295" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
<window_info id="UI Designer" order="4" />
<window_info id="Favorites" order="5" side_tool="true" />
<window_info id="Capture Tool" order="6" />
+ <window_info anchor="bottom" id="Floobits" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
- <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49926472" visible="true" weight="0.32884097" />
+ <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49926472" weight="0.32884097" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.39892185" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -322,7 +298,6 @@
<window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="14" />
<window_info anchor="bottom" id="SOQL Query" order="15" />
- <window_info anchor="right" id="Maven" />
<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" />
@@ -332,11 +307,17 @@
<window_info anchor="right" id="Maven Projects" order="6" />
<window_info anchor="right" id="Database" order="7" />
<window_info anchor="right" id="Theme Preview" order="8" />
+ <window_info anchor="right" id="Maven" order="9" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
+ <component name="VcsManagerConfiguration">
+ <ignored-roots>
+ <path value="$PROJECT_DIR$/../../.." />
+ </ignored-roots>
+ </component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/helpers/Images.java">
<provider selected="true" editor-type-id="text-editor" />
@@ -351,25 +332,15 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lab03-debugging.iml">
+ <entry file="file://$PROJECT_DIR$/lab02-debugging.iml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="13" selection-start-line="13" selection-end-line="13" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/StudentSearcherTests.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="17" column="52" selection-start-line="17" selection-start-column="52" selection-end-line="17" selection-end-column="52" />
- <folding>
- <element signature="e#547#548#0" expanded="true" />
- <element signature="e#568#569#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/lab03/SearcherClient.java">
+ <entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab02/StudentSearcherTests.java" />
+ <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/lab02/SearcherClient.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="343">
<caret line="73" selection-start-line="73" selection-end-line="73" />
@@ -379,60 +350,32 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/StaffSearcherTests.java">
+ <entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab02/StaffSearcherTests.java" />
+ <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/lab02/Searcher.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="195">
- <caret line="13" column="13" lean-forward="true" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+ <state>
<folding>
- <element signature="imports" expanded="true" />
+ <element signature="e#402#403#0" expanded="true" />
+ <element signature="e#427#428#0" expanded="true" />
+ <element signature="e#493#494#0" expanded="true" />
+ <element signature="e#518#519#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/LinearSearcherTests.java">
+ <entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab02/LinearSearcherTests.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="imports" expanded="true" />
- <element signature="e#856#857#0" expanded="true" />
- <element signature="e#884#885#0" expanded="true" />
- <element signature="e#950#951#0" expanded="true" />
- <element signature="e#977#978#0" expanded="true" />
- <element signature="e#1046#1047#0" expanded="true" />
- <element signature="e#1074#1075#0" expanded="true" />
- <element signature="e#1138#1139#0" expanded="true" />
- <element signature="e#1165#1166#0" expanded="true" />
- <element signature="e#1234#1235#0" expanded="true" />
- <element signature="e#1262#1263#0" expanded="true" />
- <element signature="e#1322#1323#0" expanded="true" />
- <element signature="e#1349#1350#0" expanded="true" />
- <element signature="e#1414#1415#0" expanded="true" />
- <element signature="e#1442#1443#0" expanded="true" />
- <element signature="e#1426#1427#0" expanded="true" />
- <element signature="e#1459#1460#0" expanded="true" />
- <element signature="e#1374#1375#0" expanded="true" />
- <element signature="e#1407#1408#0" expanded="true" />
- <element signature="e#1461#1462#0" expanded="true" />
- <element signature="e#1494#1495#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/BinarySearcherTests.java">
+ <entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab02/BinarySearcherTests.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="15" column="25" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/lab03/Searcher.java">
- <provider selected="true" editor-type-id="text-editor">
- <state>
- <folding>
- <element signature="e#402#403#0" expanded="true" />
- <element signature="e#425#426#0" expanded="true" />
- <element signature="e#518#519#0" expanded="true" />
- </folding>
+ <state relative-caret-position="414">
+ <caret line="49" column="84" selection-start-line="49" selection-start-column="84" selection-end-line="49" selection-end-column="84" />
</state>
</provider>
</entry>
@@ -488,7 +431,7 @@
</state>
<state key="ModuleStructureConfigurable.UI">
<settings>
- <last-edited>lab03-debugging</last-edited>
+ <last-edited>lab02-debugging</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
diff --git a/lab03-debugging.iml b/lab02-debugging.iml
similarity index 100%
rename from lab03-debugging.iml
rename to lab02-debugging.iml
diff --git a/src/edu/caltech/cs2/lab03/Searcher.java b/src/edu/caltech/cs2/lab02/Searcher.java
similarity index 94%
rename from src/edu/caltech/cs2/lab03/Searcher.java
rename to src/edu/caltech/cs2/lab02/Searcher.java
index f9a81a664aae8f9a48d3f8216cdbfda5c0d64bbc..830ecad2bc287d117550062fcb265e4fa68b2719 100644
--- a/src/edu/caltech/cs2/lab03/Searcher.java
+++ b/src/edu/caltech/cs2/lab02/Searcher.java
@@ -1,4 +1,4 @@
-package edu.caltech.cs2.lab03;
+package edu.caltech.cs2.lab02;
public class Searcher {
public static boolean isSorted(int[] array) {
diff --git a/src/edu/caltech/cs2/lab03/SearcherClient.java b/src/edu/caltech/cs2/lab02/SearcherClient.java
similarity index 98%
rename from src/edu/caltech/cs2/lab03/SearcherClient.java
rename to src/edu/caltech/cs2/lab02/SearcherClient.java
index abc37d8331013525eca5e48232c4e4c66cbe755f..96d18979dc18d60d9dc34b7101f54aa93b3f54b0 100644
--- a/src/edu/caltech/cs2/lab03/SearcherClient.java
+++ b/src/edu/caltech/cs2/lab02/SearcherClient.java
@@ -1,4 +1,4 @@
-package edu.caltech.cs2.lab03;
+package edu.caltech.cs2.lab02;
import org.junit.jupiter.api.*;
diff --git a/tests/edu/caltech/cs2/lab03/BinarySearcherTests.java b/tests/edu/caltech/cs2/lab02/BinarySearcherTests.java
similarity index 97%
rename from tests/edu/caltech/cs2/lab03/BinarySearcherTests.java
rename to tests/edu/caltech/cs2/lab02/BinarySearcherTests.java
index c2669f9765bdaca6a4bfbcd19d6df6ee4664355d..f766718f516b766922398384468688800a591acb 100644
--- a/tests/edu/caltech/cs2/lab03/BinarySearcherTests.java
+++ b/tests/edu/caltech/cs2/lab02/BinarySearcherTests.java
@@ -1,4 +1,4 @@
-package edu.caltech.cs2.lab03;
+package edu.caltech.cs2.lab02;
import org.junit.jupiter.api.*;
@@ -47,7 +47,7 @@ public class BinarySearcherTests {
int trial = 0;
while (trial < TRIALS) {
// Generate a random array of a random length
- int[] arr = generateRandomSortedArray(r, Math.abs(r.nextInt()));
+ int[] arr = generateRandomSortedArray(r, Math.abs(r.nextInt() % 10000));
// We want to test both elements that are in the array and not in the array
// So, run through all the elements in the array, and for each one test both
diff --git a/tests/edu/caltech/cs2/lab03/LinearSearcherTests.java b/tests/edu/caltech/cs2/lab02/LinearSearcherTests.java
similarity index 98%
rename from tests/edu/caltech/cs2/lab03/LinearSearcherTests.java
rename to tests/edu/caltech/cs2/lab02/LinearSearcherTests.java
index abec5bcbc55c3d81e93ed4719e2e290458cfc81f..ea180d79011b0083871cd789b02da3ef4161ee14 100644
--- a/tests/edu/caltech/cs2/lab03/LinearSearcherTests.java
+++ b/tests/edu/caltech/cs2/lab02/LinearSearcherTests.java
@@ -1,4 +1,4 @@
-package edu.caltech.cs2.lab03;
+package edu.caltech.cs2.lab02;
import org.junit.jupiter.api.*;