factory refactoring

Author: LukasMolzberger

src/main/java/network/aika/AbstractNode.java

@@ -51,7 +51,7 @@ public void reactivate() {}
     public static <P extends Provider> AbstractNode read(DataInput in, P p) throws IOException {
         AbstractNode n;
         if(in.readBoolean()) {
-            n = INeuron.readNeuron(in, (Neuron) p);
+            n = p.getModel().readNeuron(in, (Neuron) p);
         } else {
             n = Node.readNode(in, p);
         }

src/main/java/network/aika/Document.java

@@ -160,12 +160,17 @@ public Document(Model model, int id, String content, int threadId) {
 
         this.model = model;
         this.threadId = threadId;
-        this.linker = model.getLinkerFactory().createLinker(this);
+        this.linker = initLinker();
 
         model.acquireThread(threadId, this);
     }
 
 
+    protected Linker initLinker() {
+        return new Linker(this);
+    }
+
+
     public int getId() {
         return id;
     }

src/main/java/network/aika/Model.java

@@ -26,6 +26,9 @@
 import network.aika.neuron.activation.Linker;
 import network.aika.neuron.activation.SearchNode;
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -54,10 +57,6 @@ public class Model {
 
     public SuspensionHook suspensionHook;
 
-
-    protected SynapseFactory synapseFactory =  (input, output, id) -> new Synapse(input, output, id);
-    protected LinkerFactory linkerFactory = (doc) -> new Linker(doc);
-
     public SearchNode.SkipSelectStep skipSelectStep = (act) -> false;
 
     public AtomicInteger docIdCounter = new AtomicInteger(0);
@@ -90,14 +89,6 @@ public Model(SuspensionHook sh, int numberOfThreads) {
     }
 
 
-    public SynapseFactory getSynapseFactory() {
-        return synapseFactory;
-    }
-
-    public void setSynapseFactory(SynapseFactory synapseFactory) {
-        this.synapseFactory = synapseFactory;
-    }
-
     public SuspensionHook getSuspensionHook() {
         return suspensionHook;
     }
@@ -108,15 +99,6 @@ public void setSuspensionHook(SuspensionHook suspensionHook) {
     }
 
 
-    public LinkerFactory getLinkerFactory() {
-        return linkerFactory;
-    }
-
-    public void setLinkerFactory(LinkerFactory linkerFactory) {
-        this.linkerFactory = linkerFactory;
-    }
-
-
     public SearchNode.SkipSelectStep getSkipSelectStep() {
         return skipSelectStep;
     }
@@ -150,6 +132,25 @@ public Neuron createNeuron(String label, Type type, ActivationFunction actF, Str
     }
 
 
+    public INeuron readNeuron(DataInput in, Neuron p) throws IOException {
+        INeuron n = new INeuron(p);
+        n.readFields(in, this);
+        return n;
+    }
+
+
+    public Synapse readSynapse(DataInput in) throws IOException {
+        Synapse s = new Synapse();
+        s.readFields(in, this);
+        return s;
+    }
+
+
+    public void writeSynapse(Synapse s, DataOutput out) throws IOException {
+        s.write(out);
+    }
+
+
     public int getNewDocumentId() {
         return docIdCounter.addAndGet(1);
     }
@@ -275,17 +276,6 @@ public void removeProvider(Provider p) {
     }
 
 
-    public interface SynapseFactory {
-        Synapse createSynapse(Neuron input, Neuron output, Integer id);
-    }
-
-
-    public interface LinkerFactory {
-
-        Linker createLinker(Document doc);
-    }
-
-
     public static class StaleDocumentException extends RuntimeException {
 
         public StaleDocumentException() {

src/main/java/network/aika/neuron/INeuron.java

@@ -362,6 +362,12 @@ private INeuron() {
     }
 
 
+    public INeuron(Neuron p) {
+        provider = p;
+        threads = new INeuron.ThreadState[p.getModel().numberOfThreads];
+    }
+
+
     public INeuron(Model m, String label, Type type, ActivationFunction actF) {
         this(m, label, null, type, actF);
     }
@@ -575,7 +581,7 @@ public void write(DataOutput out) throws IOException {
         for (Synapse s : inputSynapses.values()) {
             if (s.getInput() != null) {
                 out.writeBoolean(true);
-                s.write(out);
+                getModel().writeSynapse(s, out);
 
                 out.writeBoolean(passiveInputSynapses != null && passiveInputSynapses.containsKey(s));
             }
@@ -584,7 +590,7 @@ public void write(DataOutput out) throws IOException {
         for (Synapse s : outputSynapses.values()) {
             if (s.getOutput() != null) {
                 out.writeBoolean(true);
-                s.write(out);
+                getModel().writeSynapse(s, out);
             }
         }
         out.writeBoolean(false);
@@ -630,7 +636,7 @@ public void readFields(DataInput in, Model m) throws IOException {
 
         synapseIdCounter = in.readInt();
         while (in.readBoolean()) {
-            Synapse syn = Synapse.read(in, m);
+            Synapse syn = m.readSynapse(in);
             inputSynapses.put(syn, syn);
 
             if(in.readBoolean()) {
@@ -639,7 +645,7 @@ public void readFields(DataInput in, Model m) throws IOException {
         }
 
         while (in.readBoolean()) {
-            Synapse syn = Synapse.read(in, m);
+            Synapse syn = m.readSynapse(in);
             outputSynapses.put(syn, syn);
         }
 
@@ -764,15 +770,6 @@ public void register(Activation act) {
     }
 
 
-    public static INeuron readNeuron(DataInput in, Neuron p) throws IOException {
-        INeuron n = new INeuron();
-        n.provider = p;
-        n.threads = new ThreadState[p.getModel().numberOfThreads];
-        n.readFields(in, p.getModel());
-        return n;
-    }
-
-
     public boolean isPassiveInputNeuron() {
         return passiveInputFunction != null;
     }

src/main/java/network/aika/neuron/Synapse.java

@@ -426,15 +426,7 @@ public void readFields(DataInput in, Model m) throws IOException {
     }
 
 
-    public static Synapse read(DataInput in, Model m) throws IOException {
-        Synapse s = new Synapse();
-        s.readFields(in, m);
-        return s;
-    }
-
-
-
-    public static Synapse createOrReplace(Document doc, Integer synapseId, Neuron inputNeuron, Neuron outputNeuron) {
+    public static Synapse createOrReplace(Document doc, Integer synapseId, Neuron inputNeuron, Neuron outputNeuron, SynapseFactory synapseFactory) {
         outputNeuron.get(doc);
         inputNeuron.get(doc);
         outputNeuron.lock.acquireWriteLock();
@@ -445,7 +437,7 @@ public static Synapse createOrReplace(Document doc, Integer synapseId, Neuron in
         outputNeuron.lock.releaseWriteLock();
 
         if(synapse == null) {
-            synapse = outputNeuron.getModel().getSynapseFactory().createSynapse(inputNeuron, outputNeuron, synapseId);
+            synapse = synapseFactory.createSynapse(inputNeuron, outputNeuron, synapseId);
         } else {
             synapse.input = inputNeuron;
             synapse.output = outputNeuron;
@@ -580,7 +572,7 @@ public void registerSynapseIds(Neuron n) {
 
 
         public Synapse getSynapse(Neuron outputNeuron) {
-            Synapse s = createOrReplace(null, synapseId, neuron, outputNeuron);
+            Synapse s = createOrReplace(null, synapseId, neuron, outputNeuron, (input, output, id) -> new Synapse(input, output, id));
 
             s.isRecurrent = recurrent;
             s.identity = identity;
@@ -589,4 +581,8 @@ public Synapse getSynapse(Neuron outputNeuron) {
             return s;
         }
     }
+
+    public interface SynapseFactory {
+        Synapse createSynapse(Neuron input, Neuron output, Integer id);
+    }
 }