From 7e936824b133babdbe413873f6ec44fc07bf35bf Mon Sep 17 00:00:00 2001 From: wgroeneveld Date: Sat, 17 Mar 2018 19:26:33 +0100 Subject: [PATCH] cleanup --- dictee/java/.idea/workspace.xml | 208 +++++++++++++----- .../src/com/brainbaking/dictee/Dictee.java | 12 +- .../src/com/brainbaking/dictee/Tuple.java | 65 +++--- 3 files changed, 199 insertions(+), 86 deletions(-) diff --git a/dictee/java/.idea/workspace.xml b/dictee/java/.idea/workspace.xml index faa720c..2badee8 100644 --- a/dictee/java/.idea/workspace.xml +++ b/dictee/java/.idea/workspace.xml @@ -15,8 +15,8 @@ - - + + @@ -27,25 +27,27 @@ - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -434,9 +436,6 @@ - - - @@ -449,6 +448,9 @@ + + + @@ -467,6 +469,7 @@ + @@ -477,11 +480,12 @@ - + + @@ -489,11 +493,31 @@ + + + + + + + + + + + + + + + + + + + + @@ -577,31 +601,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -614,10 +613,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dictee/java/src/com/brainbaking/dictee/Dictee.java b/dictee/java/src/com/brainbaking/dictee/Dictee.java index cff033e..10c793b 100644 --- a/dictee/java/src/com/brainbaking/dictee/Dictee.java +++ b/dictee/java/src/com/brainbaking/dictee/Dictee.java @@ -16,8 +16,7 @@ public class Dictee { } private Tuple zoekIndexInInvoer(int in, List tuples) { - List laatstVoorkomendeTuple = tuples.stream().filter(t -> t.isChar(in)).collect(Collectors.toList()); - int index = !laatstVoorkomendeTuple.isEmpty() ? laatstVoorkomendeTuple.get(laatstVoorkomendeTuple.size() - 1).getIndex() + 1 : 0; + int index = getLaatstVoorkomendeTupleIndexMetChar(in, tuples); int charTeZoeken = Character.isUpperCase(in) ? Character.toLowerCase(in) : Character.toUpperCase(in); int indexFromIndexHf = invoer.indexOf(charTeZoeken, index); @@ -34,6 +33,11 @@ public class Dictee { return new Tuple(in, indexFromIndexGewoon); } + private int getLaatstVoorkomendeTupleIndexMetChar(int in, List tuples) { + List 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() { List tuples = berekenTupleLijst(); int score = 0; @@ -46,9 +50,7 @@ public class Dictee { if(curr.komtNietVoor()) { score += 2; - } else if(curr.komtNietVoor() && next.komtNietVoor()) { - score += 2 * 2; - } else if(next.getIndex() - curr.getIndex() > 1) { + } else if(curr.sluitNietMooiAanMet(next)) { score += 2; } diff --git a/dictee/java/src/com/brainbaking/dictee/Tuple.java b/dictee/java/src/com/brainbaking/dictee/Tuple.java index 811a31e..d77f5ce 100644 --- a/dictee/java/src/com/brainbaking/dictee/Tuple.java +++ b/dictee/java/src/com/brainbaking/dictee/Tuple.java @@ -1,46 +1,51 @@ package com.brainbaking.dictee; public class Tuple { - private final Character character; - private final int index; - private final int extraMinpunt; - public int getExtraMinpunt() { - return extraMinpunt; - } + private final Character character; + private final int index; + private final int extraMinpunt; - public static Tuple nietGevonden(int character) { - return new Tuple(character, -1, 0); - } + public int getExtraMinpunt() { + return extraMinpunt; + } - public static Tuple hoofdletter(int character, int index) { - return new Tuple(character, index, 1); - } + public static Tuple nietGevonden(int character) { + return new Tuple(character, -1, 0); + } - public boolean isChar(int chara) { - return character == (char) chara; - } + public static Tuple hoofdletter(int character, int index) { + return new Tuple(character, index, 1); + } - public Tuple(int ch, int index) { - this(ch, index, 0); - } + public boolean isChar(int chara) { + return character == (char) chara; + } - public boolean komtNietVoor() { - return index < 0; - } + public Tuple(int ch, int index) { + this(ch, index, 0); + } + + public boolean komtNietVoor() { + return index < 0; + } public int getIndex() { return index; } private Tuple(int character, int index, int extraMinpunt) { - this.character = (char) character; - this.index = index; - this.extraMinpunt = extraMinpunt; - } - - @Override - public String toString() { - return "(" + character + "," + index + ")"; - } + this.character = (char) character; + this.index = index; + this.extraMinpunt = extraMinpunt; } + + @Override + public String toString() { + return "(" + character + "," + index + ")"; + } + + boolean sluitNietMooiAanMet(Tuple next) { + return next.getIndex() - getIndex() > 1; + } +}