cleanup

Author: LukasMolzberger

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

@@ -169,11 +169,6 @@ public Stream<Activation> getActivations(INeuron n, Activation linkedAct) {
             return results.stream();
         }
 
-        @Override
-        public Relation newInstance() {
-            return new CommonAncestor(optional, follow);
-        }
-
         public String toString() {
             return "COMMON-ANCESTOR";
         }
@@ -223,12 +218,6 @@ public Stream<Activation> getActivations(INeuron n, Activation linkedAct) {
             return results.stream();
         }
 
-        @Override
-        public Relation newInstance() {
-            return new IsDescendantOf(optional, follow);
-        }
-
-
         public String toString() {
             return "DESCENDANT-OF";
         }
@@ -278,11 +267,6 @@ public Stream<Activation> getActivations(INeuron n, Activation linkedAct) {
             return results.stream();
         }
 
-        @Override
-        public Relation newInstance() {
-            return new IsAncestorOf(optional, follow);
-        }
-
         public String toString() {
             return "ANCESTOR-OF";
         }
@@ -334,11 +318,6 @@ public Stream<Activation> getActivations(INeuron n, Activation linkedAct) {
                     .filter(act -> act.markedAncDesc != v);
         }
 
-        @Override
-        public Relation newInstance() {
-            return new NotDescendantOf(optional, follow);
-        }
-
         public String toString() {
             return "NOT-DESCENDANT-OF";
         }
@@ -390,11 +369,6 @@ public Stream<Activation> getActivations(INeuron n, Activation linkedAct) {
                     .filter(act -> act.markedAncDesc != v);
         }
 
-        @Override
-        public Relation newInstance() {
-            return new NotAncestorOf(optional, follow);
-        }
-
         public String toString() {
             return "NOT-ANCESTOR-OF";
         }

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

@@ -159,15 +159,6 @@ public boolean isConvertible() {
         return false;
     }
 
-    @Override
-    public Relation newInstance() {
-        MultiRelation mr = new MultiRelation();
-        for(Relation r: relations) {
-            mr.addRelation(r.newInstance());
-        }
-        return mr;
-    }
-
 
     @Override
     public int compareTo(Relation rel) {

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

@@ -156,11 +156,6 @@ public boolean isExact() {
             return true;
         }
 
-        @Override
-        public Relation newInstance() {
-            return new Equals(fromSlot, toSlot, optional, follow);
-        }
-
         @Override
         public Stream<Activation> getActivations(INeuron n, Position pos) {
             if(!follow) return Stream.empty();
@@ -222,10 +217,6 @@ public boolean isExact() {
             return false;
         }
 
-        @Override
-        public Relation newInstance() {
-            return new LessThan(fromSlot, toSlot, orEquals, optional, follow, maxLength);
-        }
 
         @Override
         public boolean test(Position a, Position b) {
@@ -315,11 +306,6 @@ public boolean isExact() {
             return false;
         }
 
-        @Override
-        public Relation newInstance() {
-            return new GreaterThan(fromSlot, toSlot, orEquals, optional, follow, maxLength);
-        }
-
         @Override
         public boolean test(Position a, Position b) {
             if(a == b) {

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

@@ -134,8 +134,6 @@ public boolean isConvertible() {
         return !optional && follow;
     }
 
-    public abstract Relation newInstance();
-
     public void link(Neuron n, int from, int to) {
         addRelation(to, from, n, this);
         addRelation(from, to, n, invert());
@@ -203,10 +201,10 @@ public static Map<Integer, Relation> getRelationsMap(int synapseId, Neuron n) {
 
 
     public static class Builder implements Neuron.Builder {
-        private int from;
-        private int to;
+        protected int from;
+        protected int to;
 
-        private Relation relation;
+        protected Relation relation;
 
 
         /**
@@ -307,11 +305,6 @@ public boolean isConvertible() {
             return true;
         }
 
-        @Override
-        public Relation newInstance() {
-            return new Any(optional, follow);
-        }
-
         @Override
         public Relation setOptionalAndFollow(boolean optional, boolean follow) {
             return new Any(optional, follow);