Merge remote-tracking branch 'origin/master'

Author: Lukas Molzberger

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

@@ -20,6 +20,7 @@
 import network.aika.lattice.InputNode;
 import network.aika.lattice.Node;
 import network.aika.neuron.INeuron;
+import network.aika.neuron.INeuron.Type;
 import network.aika.neuron.Neuron;
 import network.aika.Provider.SuspensionMode;
 import network.aika.neuron.activation.Linker;
@@ -159,7 +160,13 @@ public Neuron createNeuron(String label) {
 
 
     public Neuron createNeuron(String label, String outputText) {
-        INeuron n = new INeuron(this, label, outputText);
+        INeuron n = new INeuron(this, label, outputText, null, ActivationFunction.RECTIFIED_HYPERBOLIC_TANGENT);
+        return n.getProvider();
+    }
+
+
+    public Neuron createNeuron(String label, String outputText, Type type, ActivationFunction actF) {
+        INeuron n = new INeuron(this, label, outputText, type, actF);
         return n.getProvider();
     }
 

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

@@ -64,6 +64,7 @@ public class INeuron extends AbstractNode<Neuron> implements Comparable<INeuron>
 
 
     public enum Type {
+        INPUT,
         EXCITATORY,
         INHIBITORY
     }
@@ -81,7 +82,7 @@ public enum Type {
 
     private Writable extension;
 
-    ActivationFunction activationFunction = ActivationFunction.RECTIFIED_HYPERBOLIC_TANGENT;
+    ActivationFunction activationFunction;
 
 
     private volatile int synapseIdCounter = 0;
@@ -176,6 +177,11 @@ public Collection<Synapse> getPassiveInputSynapses() {
     }
 
 
+    public void addRequiredSlot(int slot) {
+        slotRequired.add(slot);
+    }
+
+
     public ActivationFunction getActivationFunction() {
         return activationFunction;
     }
@@ -348,8 +354,11 @@ private INeuron() {
     }
 
 
-    public INeuron(Model m, String label, String outputText) {
+    public INeuron(Model m, String label, String outputText, Type type, ActivationFunction actF) {
         this.label = label;
+        this.type = type;
+        this.activationFunction = actF;
+
         setOutputText(outputText);
 
         if(m.getNeuronExtensionFactory() != null) {
@@ -747,6 +756,21 @@ public void setBias(double b) {
     }
 
 
+    public void updateBiasDelta(double biasDelta) {
+        this.biasDelta += biasDelta;
+    }
+
+
+    public double getBias() {
+        return bias;
+    }
+
+
+    public double getNewBias() {
+        return bias + biasDelta;
+    }
+
+
     public void register(Activation act) {
         Document doc = act.getDocument();
 

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

@@ -25,6 +25,7 @@
 import network.aika.neuron.INeuron.Type;
 
 import java.util.*;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 /**
@@ -296,30 +297,47 @@ public Activation getActivation(Document doc, int begin, int end, boolean onlyFi
     }
 
 
-    public void addInMemoryInputSynapse(Synapse s) {
+    public Synapse selectInputSynapse(Neuron inputNeuron, Predicate<Synapse> filter) {
+        lock.acquireWriteLock();
+        Synapse synapse = inMemoryInputSynapses.subMap(
+                new Synapse(inputNeuron, this, Integer.MIN_VALUE), true,
+                new Synapse(inputNeuron, this, Integer.MAX_VALUE), true
+        )
+                .keySet()
+                .stream()
+                .filter(filter)
+                .findAny()
+                .orElse(null);
+
+        lock.releaseWriteLock();
+        return synapse;
+    }
+
+
+    void addInMemoryInputSynapse(Synapse s) {
         lock.acquireWriteLock();
         inMemoryInputSynapses.put(s, s);
         inputSynapsesById.put(s.getId(), s);
         lock.releaseWriteLock();
     }
 
 
-    public void removeInMemoryInputSynapse(Synapse s) {
+    void removeInMemoryInputSynapse(Synapse s) {
         lock.acquireWriteLock();
         inMemoryInputSynapses.remove(s);
         inputSynapsesById.remove(s.getId());
         lock.releaseWriteLock();
     }
 
 
-    public void addInMemoryOutputSynapse(Synapse s) {
+    void addInMemoryOutputSynapse(Synapse s) {
         lock.acquireWriteLock();
         inMemoryOutputSynapses.put(s, s);
         lock.releaseWriteLock();
     }
 
 
-    public void removeInMemoryOutputSynapse(Synapse s) {
+    void removeInMemoryOutputSynapse(Synapse s) {
         lock.acquireWriteLock();
         inMemoryOutputSynapses.remove(s);
         lock.releaseWriteLock();
@@ -349,6 +367,11 @@ public Collection<Synapse> getInMemoryInputSynapses() {
     }
 
 
+    public Collection<Synapse> getInMemoryOutputSynapses() {
+        return inMemoryOutputSynapses.values();
+    }
+
+
     private static Collection<Synapse.Builder> getSynapseBuilders(Collection<Builder> builders) {
         ArrayList<Synapse.Builder> result = new ArrayList<>();
         for(Builder b: builders) {

src/main/java/network/aika/neuron/relation/PositionRelation.java

@@ -107,7 +107,7 @@ public Stream<Activation> getActivations(INeuron n, Activation linkedAct) {
 
     @Override
     public void registerRequiredSlots(Neuron input) {
-        input.get().slotRequired.add(fromSlot);
+        input.get().addRequiredSlot(fromSlot);
     }