fixes

Author: Lukas Molzberger

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

@@ -26,11 +26,6 @@ public void registerRequiredSlots(Neuron input) {
     }
 
 
-    private static void collectNotAncestorOf(List<Activation> results, INeuron n, Activation linkedAct) {
-
-    }
-
-
     private static void collectCommonAncestor(Collection<Activation> results, INeuron n, Activation linkedAct, long v) {
         if(linkedAct.visited == v) return;
 
@@ -111,15 +106,15 @@ private static void markAncestors(Activation act, long v) {
     }
 
 
-    private static void markDescendant(Activation act, long v) {
+    private static void markDescendants(Activation act, long v) {
         if(act.visited == v) return;
         act.visited = v;
 
         act.markedAncDesc = v;
 
-        act.getInputLinks(false, false)
+        act.getOutputLinks(false)
                 .filter(l -> l.synapse.identity)
-                .forEach(l -> markDescendant(l.input, v));
+                .forEach(l -> markDescendants(l.input, v));
     }
 
 
@@ -258,8 +253,12 @@ public boolean test(Activation act, Activation linkedAct) {
 
         @Override
         public Stream<Activation> getActivations(INeuron n, Activation linkedAct) {
-            List<Activation> results = new ArrayList<>();
-            return results.stream();
+            long v = linkedAct.doc.visitedCounter++;
+            markDescendants(linkedAct, v);
+
+            INeuron.ThreadState th = n.getThreadState(linkedAct.doc.threadId, false);
+            return th.getActivations()
+                    .filter(act -> act.markedAncDesc != v);
         }
     }
 
@@ -288,9 +287,12 @@ public boolean test(Activation act, Activation linkedAct) {
 
         @Override
         public Stream<Activation> getActivations(INeuron n, Activation linkedAct) {
-            List<Activation> results = new ArrayList<>();
-            collectNotAncestorOf(results, n, linkedAct);
-            return results.stream();
+            long v = linkedAct.doc.visitedCounter++;
+            markAncestors(linkedAct, v);
+
+            INeuron.ThreadState th = n.getThreadState(linkedAct.doc.threadId, false);
+            return th.getActivations()
+                    .filter(act -> act.markedAncDesc != v);
         }
     }
 }

src/test/java/network/aika/network/AncestorRelationTest.java

@@ -198,7 +198,7 @@ public void testAncestorRelation2() {
         Assert.assertTrue(nC.getActivations(doc, true).collect(Collectors.toList()).isEmpty());
     }
 
-    @Ignore
+
     @Test
     public void testNotAncestorOfRelation() {
         Model m = new Model();
@@ -239,8 +239,8 @@ public void testNotAncestorOfRelation() {
                         .setBias(-10.0)
                         .setRecurrent(false),
                 new Relation.Builder()
-                        .setFrom(1)
-                        .setTo(OUTPUT)
+                        .setFrom(0)
+                        .setTo(1)
                         .setRelation(NOT_ANCESTOR_OF),
                 new Relation.Builder()
                         .setFrom(0)
@@ -256,6 +256,7 @@ public void testNotAncestorOfRelation() {
         Document doc = m.createDocument("aaaaaaaaaa", 0);
 
         inA.addInput(doc, 0, 1);
+        inB.addInput(doc, 0, 1);
 
         Activation outC1 = outC.getActivation(doc, 0, 1, false);