Got rid fo Constants class

src/main/java/de/nqueensfaf/impl/CPUSolver.java

@@ -17,7 +17,6 @@
 import com.esotericsoftware.kryo.io.Output;
 
 import de.nqueensfaf.Config;
-import de.nqueensfaf.Constants;
 import de.nqueensfaf.Solver;
 import de.nqueensfaf.persistence.SolverState;
 
@@ -28,6 +27,12 @@ public class CPUSolver extends Solver {
     // method for such n
     // smallestN marks the border, when to use this simpler solver
     private static final int smallestN = 6;
+    private static final Kryo kryo = new Kryo();
+    static {
+	kryo.register(SolverState.class);
+	kryo.register(Constellation.class);
+	kryo.register(ArrayList.class);
+    }
 
     private long start, end;
     private ArrayList<Constellation> constellations;
@@ -116,7 +121,6 @@ protected void save_(String filepath) throws IOException {
 	if (constellations.size() == 0) {
 	    throw new IllegalStateException("Nothing to be saved");
 	}
-	Kryo kryo = Constants.kryo;
 	try (Output output = new Output(new GZIPOutputStream(new FileOutputStream(filepath)))) {
 	    kryo.writeObject(output,
 		    new SolverState(n, System.currentTimeMillis() - start + storedDuration, constellations));
@@ -129,7 +133,6 @@ protected void load_(String filepath) throws IOException, ClassNotFoundException
 	if (!isIdle()) {
 	    throw new IllegalStateException("Cannot load a state while the Solver is running");
 	}
-	Kryo kryo = Constants.kryo;
 	try (Input input = new Input(new GZIPInputStream(new FileInputStream(filepath)))) {
 	    SolverState state = kryo.readObject(input, SolverState.class);
 	    setN(state.getN());

src/main/java/de/nqueensfaf/impl/GPUSolver.java

@@ -38,13 +38,19 @@
 import static org.lwjgl.system.MemoryUtil.*;
 
 import de.nqueensfaf.Config;
-import de.nqueensfaf.Constants;
 import de.nqueensfaf.Solver;
 import de.nqueensfaf.SolverException;
 import de.nqueensfaf.persistence.SolverState;
 
 public class GPUSolver extends Solver {
 
+    private static final Kryo kryo = new Kryo();
+    static {
+	kryo.register(SolverState.class);
+	kryo.register(Constellation.class);
+	kryo.register(ArrayList.class);
+    }
+
     private long[] contexts, programs;
     private ArrayList<Device> devices, availableDevices;
     private ArrayList<Constellation> constellations;
@@ -469,7 +475,6 @@ protected void save_(String filepath) throws IOException {
 	    throw new IllegalStateException("nothing to be saved");
 	}
 
-	Kryo kryo = Constants.kryo;
 	try (Output output = new Output(new GZIPOutputStream(new FileOutputStream(filepath)))) {
 	    kryo.writeObject(output,
 		    new SolverState(n, System.currentTimeMillis() - start + storedDuration, constellations));
@@ -482,7 +487,6 @@ protected void load_(String filepath) throws IOException, ClassNotFoundException
 	if (!isIdle()) {
 	    throw new IllegalStateException("Cannot load a state while the solver is running");
 	}
-	Kryo kryo = Constants.kryo;
 	try (Input input = new Input(new GZIPInputStream(new FileInputStream(filepath)))) {
 	    SolverState state = kryo.readObject(input, SolverState.class);
 	    setN(state.getN());