Removed DistanceFunction

Author: Lukas Molzberger

src/main/java/network/aika/DistanceFunction.java

@@ -89,8 +89,6 @@ public class Synapse implements Writable {
 
     private Map<Integer, Relation> relations = new TreeMap<>();
 
-    private DistanceFunction distanceFunction = null;
-
     private boolean inactive;
     private boolean inactiveNew;
 
@@ -148,15 +146,6 @@ public void setRelations(Map<Integer, Relation> relations) {
         this.relations = relations;
     }
 
-    public DistanceFunction getDistanceFunction() {
-        return distanceFunction;
-    }
-
-    public void setDistanceFunction(DistanceFunction distanceFunction) {
-        this.distanceFunction = distanceFunction;
-    }
-
-
     public boolean isInactive() {
         return inactive;
     }
@@ -387,11 +376,6 @@ public void write(DataOutput out) throws IOException {
             me.getValue().write(out);
         }
 
-        out.writeBoolean(distanceFunction != null);
-        if(distanceFunction != null) {
-            out.writeUTF(distanceFunction.name());
-        }
-
         out.writeDouble(weight);
         out.writeDouble(limit);
 
@@ -415,10 +399,6 @@ public void readFields(DataInput in, Model m) throws IOException {
             relations.put(relId, Relation.read(in, m));
         }
 
-        if(in.readBoolean()) {
-            distanceFunction = DistanceFunction.valueOf(in.readUTF());
-        }
-
         weight = in.readDouble();
         limit = in.readDouble();
 
@@ -482,7 +462,6 @@ public static class Builder implements Neuron.Builder {
         private Neuron neuron;
         double weight;
         double limit = 1.0;
-        private DistanceFunction distanceFunction;
         private boolean identity;
         private Integer synapseId;
 
@@ -546,12 +525,6 @@ public Builder setLimit(double limit) {
         }
 
 
-        public Builder setDistanceFunction(DistanceFunction distFunc) {
-            this.distanceFunction = distFunc;
-            return this;
-        }
-
-
         public Builder setIdentity(boolean identity) {
             this.identity = identity;
             return this;
@@ -576,7 +549,6 @@ public Synapse getSynapse(Neuron outputNeuron) {
 
             s.isRecurrent = recurrent;
             s.identity = identity;
-            s.distanceFunction = distanceFunction;
 
             return s;
         }

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

@@ -390,9 +390,6 @@ public State computeValueAndWeight(int round) throws RecursiveDepthExceededExcep
             if (iAct == this) continue;
 
             double x = Math.min(s.getLimit(), is.s.value) * s.getWeight();
-            if(s.getDistanceFunction() != null) {
-                x *= s.getDistanceFunction().f(iAct, this);
-            }
             net += x;
             if(!s.isNegative(CURRENT)) {
                 posNet += x;
@@ -464,9 +461,6 @@ public boolean isActiveable() {
             }
 
             double x = iv * s.getWeight();
-            if(s.getDistanceFunction() != null) {
-                x *= s.getDistanceFunction().f(iAct, this);
-            }
             net += x;
         }
 
@@ -518,9 +512,6 @@ public void computeBounds() throws RecursiveDepthExceededException {
             if (iAct == this) continue;
 
             double x = s.getWeight();
-            if(s.getDistanceFunction() != null) {
-                x *= s.getDistanceFunction().f(iAct, this);
-            }
 
             if (s.isNegative(CURRENT)) {
                 if (!s.isRecurrent() && !iAct.checkSelfReferencing(false, 0, v)) {