small refactoring

Author: Lukas Molzberger

src/main/java/org/aika/Converter.java

@@ -149,10 +149,13 @@ private boolean convert() {
     }
 
 
+    public static final int DIRECT = 0;
+    public static final int RECURRENT = 1;
+    public static final int POSITIVE = 0;
+    public static final int NEGATIVE = 1;
+
     private void initInputNodesAndComputeWeightSums() {
-        double negDirSumDelta = 0.0;
-        double negRecSumDelta = 0.0;
-        double posRecSumDelta = 0.0;
+        double[][] sumDelta = new double[2][2];
         double maxRecurrentSumDelta = 0.0;
 
         for (Synapse s : modifiedSynapses) {
@@ -171,35 +174,19 @@ private void initInputNodesAndComputeWeightSums() {
                 neuron.provider.setModified();
             }
 
-            if (s.isNegative()) {
-                if (!s.key.isRecurrent) {
-                    negDirSumDelta -= s.w;
-                } else {
-                    negRecSumDelta -= s.w;
-                }
-            } else if (s.key.isRecurrent) {
-                posRecSumDelta -= s.w;
-            }
-
-            if (s.nw <= 0.0) {
-                if (!s.key.isRecurrent) {
-                    negDirSumDelta += s.nw;
-                } else {
-                    negRecSumDelta += s.nw;
-                }
-            } else if (s.key.isRecurrent) {
-                posRecSumDelta += s.nw;
-            }
+            sumDelta[s.key.isRecurrent ? RECURRENT : DIRECT][s.isNegative() ? NEGATIVE : POSITIVE] -= s.w;
+            sumDelta[s.key.isRecurrent ? RECURRENT : DIRECT][s.nw <= 0.0 ? NEGATIVE : POSITIVE] += s.nw;
 
             s.w = s.nw;
 
             in.lock.releaseWriteLock();
         }
 
         neuron.maxRecurrentSum += maxRecurrentSumDelta;
-        neuron.negDirSum += negDirSumDelta;
-        neuron.negRecSum += negRecSumDelta;
-        neuron.posRecSum += posRecSumDelta;
+        neuron.posDirSum += sumDelta[DIRECT][POSITIVE];
+        neuron.negDirSum += sumDelta[DIRECT][NEGATIVE];
+        neuron.negRecSum += sumDelta[RECURRENT][NEGATIVE];
+        neuron.posRecSum += sumDelta[RECURRENT][POSITIVE];
     }
 
 

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

@@ -66,6 +66,7 @@ public class INeuron extends AbstractNode<Neuron> implements Comparable<INeuron>
     public String outputText;
 
     public volatile double bias;
+    public volatile double posDirSum;
     public volatile double negDirSum;
     public volatile double negRecSum;
     public volatile double posRecSum;
@@ -605,6 +606,7 @@ public void write(DataOutput out) throws IOException {
         }
 
         out.writeDouble(bias);
+        out.writeDouble(posDirSum);
         out.writeDouble(negDirSum);
         out.writeDouble(negRecSum);
         out.writeDouble(posRecSum);
@@ -641,6 +643,7 @@ public void readFields(DataInput in, Model m) throws IOException {
         }
 
         bias = in.readDouble();
+        posDirSum = in.readDouble();
         negDirSum = in.readDouble();
         negRecSum = in.readDouble();
         posRecSum = in.readDouble();