Mid-work commit

Changed workstation and I don't remember all
the changed I made => Commit Everything and fix
it in latter commits.

Author: phikal

.gitignore

@@ -23,7 +23,7 @@
 
 # Generated files
 bin/
-gen/
+taskClass/
 
 # Gradle files
 .gradle/
@@ -40,7 +40,7 @@ proguard/
 *.log
 
 ### Android Patch ###
-gen-external-apklibs
+taskClass-external-apklibs
 
 
 ### Intellij ###

app/src/main/java/com/phikal/regex/games/match/MatchTask.java

@@ -13,18 +13,19 @@
 import com.phikal.regex.models.Task;
 import com.phikal.regex.models.Word;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-public abstract class MatchTask extends Task {
+public abstract class MatchTask extends Task implements Serializable {
 
     private Collection<MatchWord> allWords = new ArrayList<>();
-    MatchInput input;
-    List<Collumn> collumns;
+    private MatchInput input;
+    private List<Collumn> collumns;
 
     MatchTask(Context ctx, Game g, Progress p, Progress.ProgressCallback pc) {
         super(ctx, g, p, pc);
@@ -47,7 +48,7 @@ public Input getInput() {
         return input;
     }
 
-    protected class MatchWord extends Word {
+    protected class MatchWord extends Word implements Serializable {
         private final boolean match;
         private final String word;
 
@@ -64,7 +65,7 @@ public String getString() {
 
     }
 
-    protected class MatchCollumn implements Collumn {
+    protected class MatchCollumn implements Collumn, Serializable {
         private Context ctx;
         private List<MatchWord> words = null;
         private boolean match;
@@ -89,7 +90,7 @@ public List<? extends Word> getWords() {
         }
     }
 
-    protected class MatchInput extends Input {
+    protected class MatchInput extends Input implements Serializable {
         Context ctx;
 
         MatchInput(Context ctx) {
@@ -118,9 +119,9 @@ public void afterTextChanged(Editable pat) {
                             Word.Matches.NONE);
                 }
 
-                if (allMatch) {
-                    getProgressCallback().progress(new Progress(ctx,
-                            getGame().name(), getProgress()));
+                if (allMatch && pat.length() > 0) {
+                    getProgressCallback().progress(getProgress()
+                            .next(maxLength/pat.length()));
                 }
             } catch (PatternSyntaxException pse) {
                 for (MatchWord w : allWords)

app/src/main/java/com/phikal/regex/games/match/MutMatchTask.java

@@ -5,13 +5,15 @@
 import com.phikal.regex.games.Game;
 import com.phikal.regex.models.Progress;
 
+import static com.phikal.regex.Util.*;
+
 public class MutMatchTask extends SimpleMatchTask {
 
     private static final double GAMMA = (1 - Math.sqrt(5)) / 2 + 1;
 
     private String mutateOn = null;
 
-    public MutMatchTask(Context ctx, Game g, Progress p, Progress.ProgressCallback pc) {
+    MutMatchTask(Context ctx, Game g, Progress p, Progress.ProgressCallback pc) {
         super(ctx, g, p, pc);
     }
 

app/src/main/java/com/phikal/regex/games/match/SimpleMatchTask.java

@@ -5,18 +5,18 @@
 import com.phikal.regex.games.Game;
 import com.phikal.regex.models.Progress;
 
-import java.security.SecureRandom;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Random;
 import java.util.Set;
 
-public class SimpleMatchTask extends MatchTask {
+import static com.phikal.regex.Util.*;
+
+public class SimpleMatchTask extends MatchTask implements Serializable {
 
-    final static Random rnd = new SecureRandom(); // because why not?
     final static int MAX_LENGTH = 12;
     final static Character[] CHARS;
 
@@ -34,30 +34,27 @@ public class SimpleMatchTask extends MatchTask {
     }
 
     private List<MatchWord>
-            toMatch,
-            notToMatch;
+            toMatch = new LinkedList<>(),
+            notToMatch = new LinkedList<>();
 
-    private Set<String> words;
+    private transient Set<String> words = new HashSet<>();
 
-    public SimpleMatchTask(Context ctx, Game g, Progress p, Progress.ProgressCallback pc) {
+    SimpleMatchTask(Context ctx, Game g, Progress p, Progress.ProgressCallback pc) {
         super(ctx, g, p, pc);
 
-        toMatch = new LinkedList<>();
-        notToMatch = new LinkedList<>();
-        words = new HashSet<>();
-
-        int max = getProgress().getMaxTasks() + 1;
+        int max = (int) (Math.pow(getProgress().getDifficutly(),3)+
+                Math.sqrt(getProgress().getRound()+1));
         int i = 0;
         do {
             toMatch.add(new MatchWord(randString(), true));
             i++;
-        } while ((i / max) * (i / max) > rnd.nextDouble());
+        } while ((i / max) * (i / max) < rnd.nextDouble());
 
         i = 0;
         do {
             notToMatch.add(new MatchWord(randString(), false));
             i++;
-        } while ((i / max) * (i / max) > rnd.nextDouble());
+        } while ((i / max) * (i / max) < rnd.nextDouble());
     }
 
     @Override
@@ -74,7 +71,7 @@ String randString() {
 
         for (; ; ) {
             StringBuilder b = new StringBuilder();
-            for (int i = 0; i < len; i++)
+            for (int i = 0; i < len * rnd.nextDouble() + 1; i++)
                 b.append(CHARS[rnd.nextInt(range)]);
             if (words.contains(b.toString()))
                 continue;

app/src/main/java/com/phikal/regex/games/match/WordTask.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 
+import com.phikal.regex.R;
 import com.phikal.regex.games.Game;
 import com.phikal.regex.models.Progress;
 
@@ -13,12 +14,14 @@
 import java.util.List;
 import java.util.zip.GZIPInputStream;
 
+import static com.phikal.regex.Util.*;
+
 public class WordTask extends SimpleMatchTask {
 
     static private List<String> words = null;
     static private int request = 0;
 
-    public WordTask(Context ctx, Game g, Progress p, Progress.ProgressCallback pc) {
+    WordTask(Context ctx, Game g, Progress p, Progress.ProgressCallback pc) {
         super(ctx, g, p, pc);
     }
 
@@ -28,7 +31,7 @@ String randString() {
             try {
                 words = new ArrayList<>(8711); // current length
                 BufferedReader bis = new BufferedReader(new InputStreamReader(new GZIPInputStream(
-                        getContext().getAssets().open("words.gz"))));
+                        getContext().getResources().openRawResource(R.raw.words))));
                 for (String line; (line = bis.readLine()) != null; )
                     words.add(line);
                 Collections.shuffle(words, rnd);

app/src/main/java/com/phikal/regex/models/Task.java

@@ -11,7 +11,7 @@ public abstract class Task implements Serializable {
     private final Progress p;
     private final Game g;
     private final Progress.ProgressCallback pc;
-    private final Context ctx;
+    private transient final Context ctx;
 
     public Task(Context ctx, Game g, Progress p, Progress.ProgressCallback pc) {
         this.ctx = ctx;