wgroeneveld
/
algorithms-sandbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

This commit is contained in:
wgroeneveld 2018-03-17 19:26:33 +01:00
parent b5504912ce
commit 7e936824b1
3 changed files with 199 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208
dictee/java/.idea/workspace.xml
View File

@ -15,8 +15,8 @@
<file leaf-file-name="Dictee.java" pinned="false" current-in-tab="true"> <file leaf-file-name="Dictee.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/com/brainbaking/dictee/Dictee.java"> <entry file="file://$PROJECT_DIR$/src/com/brainbaking/dictee/Dictee.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="986"> <state relative-caret-position="304">
<caret line="58" column="0" lean-forward="false" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" /> <caret line="27" column="20" lean-forward="true" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@ -27,25 +27,27 @@
<file leaf-file-name="Tuple.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Tuple.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/brainbaking/dictee/Tuple.java"> <entry file="file://$PROJECT_DIR$/src/com/brainbaking/dictee/Tuple.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="45">
<caret line="20" column="45" lean-forward="false" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="45" /> <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding> <folding>
<element signature="e#208#209#0" expanded="true" /> <element signature="e#193#194#0" expanded="true" />
<element signature="e#251#252#0" expanded="true" /> <element signature="e#228#229#0" expanded="true" />
<element signature="e#310#311#0" expanded="true" /> <element signature="e#283#284#0" expanded="true" />
<element signature="e#368#369#0" expanded="true" /> <element signature="e#333#334#0" expanded="true" />
<element signature="e#437#438#0" expanded="true" /> <element signature="e#398#399#0" expanded="true" />
<element signature="e#498#499#0" expanded="true" /> <element signature="e#451#452#0" expanded="true" />
<element signature="e#542#543#0" expanded="true" /> <element signature="e#491#492#0" expanded="true" />
<element signature="e#598#599#0" expanded="true" /> <element signature="e#539#540#0" expanded="true" />
<element signature="e#641#642#0" expanded="true" /> <element signature="e#578#579#0" expanded="true" />
<element signature="e#683#684#0" expanded="true" /> <element signature="e#612#613#0" expanded="true" />
<element signature="e#724#725#0" expanded="true" /> <element signature="e#649#650#0" expanded="true" />
<element signature="e#764#765#0" expanded="true" /> <element signature="e#681#682#0" expanded="true" />
<element signature="e#793#794#0" expanded="true" /> <element signature="e#710#711#0" expanded="true" />
<element signature="e#821#822#0" expanded="true" /> <element signature="e#738#739#0" expanded="true" />
<element signature="e#1075#1076#0" expanded="true" /> <element signature="e#968#969#0" expanded="true" />
<element signature="e#1141#1142#0" expanded="true" /> <element signature="e#1026#1027#0" expanded="true" />
<element signature="e#1073#1074#0" expanded="true" />
<element signature="e#1128#1129#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -434,9 +436,6 @@
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
<history-entry file="DicteeTests - 2018.03.17 at 19h 10m 47s.xml">
<configuration name="DicteeTests" configurationId="JUnit" />
</history-entry>
<history-entry file="DicteeTests - 2018.03.17 at 19h 11m 53s.xml"> <history-entry file="DicteeTests - 2018.03.17 at 19h 11m 53s.xml">
<configuration name="DicteeTests" configurationId="JUnit" /> <configuration name="DicteeTests" configurationId="JUnit" />
</history-entry> </history-entry>
@ -449,6 +448,9 @@
<history-entry file="DicteeTests - 2018.03.17 at 19h 16m 35s.xml"> <history-entry file="DicteeTests - 2018.03.17 at 19h 16m 35s.xml">
<configuration name="DicteeTests" configurationId="JUnit" /> <configuration name="DicteeTests" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="DicteeTests - 2018.03.17 at 19h 25m 09s.xml">
<configuration name="DicteeTests" configurationId="JUnit" />
</history-entry>
<history-entry file="DicteeTests_combinatieGeval_zonderHoofdletters - 2018.03.17 at 18h 28m 11s.xml"> <history-entry file="DicteeTests_combinatieGeval_zonderHoofdletters - 2018.03.17 at 18h 28m 11s.xml">
<configuration name="DicteeTests.combinatieGeval_zonderHoofdletters" configurationId="JUnit" /> <configuration name="DicteeTests.combinatieGeval_zonderHoofdletters" configurationId="JUnit" />
</history-entry> </history-entry>
@ -467,6 +469,7 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="873" extended-state="6" /> <frame x="0" y="23" width="1440" height="873" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@ -477,11 +480,12 @@
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32958803" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32958803" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.125" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.125" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@ -489,11 +493,31 @@
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39950064" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39950064" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39950064" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32958803" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32958803" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.125" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
</layout> </layout>
</component> </component>
<component name="VcsContentAnnotationSettings"> <component name="VcsContentAnnotationSettings">
@ -577,31 +601,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/com/brainbaking/dictee/Tuple.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="20" column="45" lean-forward="false" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="45" />
<folding>
<element signature="e#208#209#0" expanded="true" />
<element signature="e#251#252#0" expanded="true" />
<element signature="e#310#311#0" expanded="true" />
<element signature="e#368#369#0" expanded="true" />
<element signature="e#437#438#0" expanded="true" />
<element signature="e#498#499#0" expanded="true" />
<element signature="e#542#543#0" expanded="true" />
<element signature="e#598#599#0" expanded="true" />
<element signature="e#641#642#0" expanded="true" />
<element signature="e#683#684#0" expanded="true" />
<element signature="e#724#725#0" expanded="true" />
<element signature="e#764#765#0" expanded="true" />
<element signature="e#793#794#0" expanded="true" />
<element signature="e#821#822#0" expanded="true" />
<element signature="e#1075#1076#0" expanded="true" />
<element signature="e#1141#1142#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/com/brainbaking/dictee/DicteeTests.java"> <entry file="file://$PROJECT_DIR$/test/com/brainbaking/dictee/DicteeTests.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="960"> <state relative-caret-position="960">
@ -614,10 +613,117 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/com/brainbaking/dictee/Tuple.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="13" column="23" lean-forward="false" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
<folding>
<element signature="e#193#194#0" expanded="true" />
<element signature="e#228#229#0" expanded="true" />
<element signature="e#283#284#0" expanded="true" />
<element signature="e#333#334#0" expanded="true" />
<element signature="e#398#399#0" expanded="true" />
<element signature="e#451#452#0" expanded="true" />
<element signature="e#491#492#0" expanded="true" />
<element signature="e#539#540#0" expanded="true" />
<element signature="e#578#579#0" expanded="true" />
<element signature="e#612#613#0" expanded="true" />
<element signature="e#649#650#0" expanded="true" />
<element signature="e#681#682#0" expanded="true" />
<element signature="e#710#711#0" expanded="true" />
<element signature="e#738#739#0" expanded="true" />
<element signature="e#968#969#0" expanded="true" />
<element signature="e#1026#1027#0" expanded="true" />
<element signature="e#1073#1074#0" expanded="true" />
<element signature="e#1128#1129#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/brainbaking/dictee/Dictee.java"> <entry file="file://$PROJECT_DIR$/src/com/brainbaking/dictee/Dictee.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="986"> <state relative-caret-position="207">
<caret line="58" column="0" lean-forward="false" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" /> <caret line="49" column="27" lean-forward="true" selection-start-line="49" selection-start-column="27" selection-end-line="49" selection-end-column="27" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/brainbaking/dictee/Dictee.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/brainbaking/dictee/Diff.java" />
<entry file="file://$PROJECT_DIR$/test/com/brainbaking/dictee/DicteeTests.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2176#2177#0" expanded="true" />
<element signature="e#2238#2239#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar:///Library/Java/JavaVirtualMachines/jdk-9.0.4.jdk/Contents/Home/lib/src.zip!/java.base/java/lang/NumberFormatException.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="169">
<caret line="64" column="0" lean-forward="false" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/brainbaking/dictee/Diff.java" />
<entry file="file://$PROJECT_DIR$/test/com/brainbaking/dictee/DicteeTests.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="960">
<caret line="64" column="0" lean-forward="false" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2176#2177#0" expanded="true" />
<element signature="e#2238#2239#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/brainbaking/dictee/Tuple.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding>
<element signature="e#193#194#0" expanded="true" />
<element signature="e#228#229#0" expanded="true" />
<element signature="e#283#284#0" expanded="true" />
<element signature="e#333#334#0" expanded="true" />
<element signature="e#398#399#0" expanded="true" />
<element signature="e#451#452#0" expanded="true" />
<element signature="e#491#492#0" expanded="true" />
<element signature="e#539#540#0" expanded="true" />
<element signature="e#578#579#0" expanded="true" />
<element signature="e#612#613#0" expanded="true" />
<element signature="e#649#650#0" expanded="true" />
<element signature="e#681#682#0" expanded="true" />
<element signature="e#710#711#0" expanded="true" />
<element signature="e#738#739#0" expanded="true" />
<element signature="e#968#969#0" expanded="true" />
<element signature="e#1026#1027#0" expanded="true" />
<element signature="e#1073#1074#0" expanded="true" />
<element signature="e#1128#1129#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/brainbaking/dictee/Dictee.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="27" column="20" lean-forward="true" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>

12
dictee/java/src/com/brainbaking/dictee/Dictee.java
View File

@ -16,8 +16,7 @@ public class Dictee {
} }
private Tuple zoekIndexInInvoer(int in, List<Tuple> tuples) { private Tuple zoekIndexInInvoer(int in, List<Tuple> tuples) {
List<Tuple> laatstVoorkomendeTuple = tuples.stream().filter(t -> t.isChar(in)).collect(Collectors.toList()); int index = getLaatstVoorkomendeTupleIndexMetChar(in, tuples);
int index = !laatstVoorkomendeTuple.isEmpty() ? laatstVoorkomendeTuple.get(laatstVoorkomendeTuple.size() - 1).getIndex() + 1 : 0;
int charTeZoeken = Character.isUpperCase(in) ? Character.toLowerCase(in) : Character.toUpperCase(in); int charTeZoeken = Character.isUpperCase(in) ? Character.toLowerCase(in) : Character.toUpperCase(in);
int indexFromIndexHf = invoer.indexOf(charTeZoeken, index); int indexFromIndexHf = invoer.indexOf(charTeZoeken, index);
@ -34,6 +33,11 @@ public class Dictee {
return new Tuple(in, indexFromIndexGewoon); return new Tuple(in, indexFromIndexGewoon);
} }
private int getLaatstVoorkomendeTupleIndexMetChar(int in, List<Tuple> tuples) {
List<Tuple> laatstVoorkomendeTuple = tuples.stream().filter(t -> t.isChar(in)).collect(Collectors.toList());
return !laatstVoorkomendeTuple.isEmpty() ? laatstVoorkomendeTuple.get(laatstVoorkomendeTuple.size() - 1).getIndex() + 1 : 0;
}
public int verbeter() { public int verbeter() {
List<Tuple> tuples = berekenTupleLijst(); List<Tuple> tuples = berekenTupleLijst();
int score = 0; int score = 0;
@ -46,9 +50,7 @@ public class Dictee {
if(curr.komtNietVoor()) { if(curr.komtNietVoor()) {
score += 2; score += 2;
} else if(curr.komtNietVoor() && next.komtNietVoor()) { } else if(curr.sluitNietMooiAanMet(next)) {
score += 2 * 2;
} else if(next.getIndex() - curr.getIndex() > 1) {
score += 2; score += 2;
} }

65
dictee/java/src/com/brainbaking/dictee/Tuple.java
View File

@ -1,46 +1,51 @@
package com.brainbaking.dictee; package com.brainbaking.dictee;
public class Tuple { public class Tuple {
private final Character character;
private final int index;
private final int extraMinpunt;
public int getExtraMinpunt() { private final Character character;
return extraMinpunt; private final int index;
} private final int extraMinpunt;
public static Tuple nietGevonden(int character) { public int getExtraMinpunt() {
return new Tuple(character, -1, 0); return extraMinpunt;
} }
public static Tuple hoofdletter(int character, int index) { public static Tuple nietGevonden(int character) {
return new Tuple(character, index, 1); return new Tuple(character, -1, 0);
} }
public boolean isChar(int chara) { public static Tuple hoofdletter(int character, int index) {
return character == (char) chara; return new Tuple(character, index, 1);
} }
public Tuple(int ch, int index) { public boolean isChar(int chara) {
this(ch, index, 0); return character == (char) chara;
} }
public boolean komtNietVoor() { public Tuple(int ch, int index) {
return index < 0; this(ch, index, 0);
} }
public boolean komtNietVoor() {
return index < 0;
}
public int getIndex() { public int getIndex() {
return index; return index;
} }
private Tuple(int character, int index, int extraMinpunt) { private Tuple(int character, int index, int extraMinpunt) {
this.character = (char) character; this.character = (char) character;
this.index = index; this.index = index;
this.extraMinpunt = extraMinpunt; this.extraMinpunt = extraMinpunt;
}
@Override
public String toString() {
return "(" + character + "," + index + ")";
}
} }
@Override
public String toString() {
return "(" + character + "," + index + ")";
}
boolean sluitNietMooiAanMet(Tuple next) {
return next.getIndex() - getIndex() > 1;
}
}