Implementation for the delete call

Lukas Molzberger · Lukas Molzberger · commit 471a4d675ebc · 2020-10-07T11:20:06.000+02:00
diff --git a/src/main/java/network/aika/AbstractNode.java b/src/main/java/network/aika/AbstractNode.java
@@ -77,4 +77,6 @@ public static <P extends Provider> AbstractNode read(DataInput in, P p) throws I
         return n;
     }
 
+    public abstract void delete(Set<String> modelLabels);
+
 }
diff --git a/src/main/java/network/aika/Provider.java b/src/main/java/network/aika/Provider.java
@@ -1,8 +1,12 @@
 package network.aika;
 
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.*;
 import java.lang.ref.WeakReference;
+import java.util.Set;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
@@ -12,6 +16,8 @@
  */
 public class Provider<T extends AbstractNode> implements Comparable<Provider<?>> {
 
+    private static final Logger log = LoggerFactory.getLogger(Provider.class);
+
     protected Model model;
     protected Integer id;
 
@@ -149,6 +155,19 @@ private void reactivate() {
         model.register(this);
     }
 
+    public void delete(Set<String> modelLabels) {
+        get();
+
+        n.getModelLabels().removeAll(modelLabels);
+
+        if(!n.getModelLabels().isEmpty()) {
+            return;
+        }
+
+        n.delete(modelLabels);
+
+        model.suspensionHook.delete(id);
+    }
 
     @Override
     public boolean equals(Object o) {
diff --git a/src/main/java/network/aika/SuspensionHook.java b/src/main/java/network/aika/SuspensionHook.java
@@ -37,5 +37,7 @@ public interface SuspensionHook {
 
     byte[] retrieve(int id);
 
+    void delete(int id);
+
     Iterable<Integer> getAllNodeIds();
 }
diff --git a/src/main/java/network/aika/lattice/AndNode.java b/src/main/java/network/aika/lattice/AndNode.java
@@ -98,6 +98,24 @@ protected void propagate(AndActivation act) {
     }
 
 
+    @Override
+    public void delete(Set<String> modelLabels) {
+        for(Entry e: parents) {
+            Provider<? extends Node> pp = e.rv.parent;
+            Node pn = pp.get();
+            pn.lock.acquireWriteLock();
+            pn.removeAndChild(e.ref);
+            pn.setModified();
+            pn.lock.releaseWriteLock();
+            pp.delete(modelLabels);
+        }
+
+        for(Entry e: parents) {
+            e.rv.parent.get().cleanup();
+        }
+    }
+
+
     @Override
     public void cleanup() {
         if(!isRemoved && !isRequired()) {
diff --git a/src/main/java/network/aika/lattice/InputNode.java b/src/main/java/network/aika/lattice/InputNode.java
@@ -264,4 +264,9 @@ public void readFields(DataInput in, Model m) throws IOException {
             inputNeuron = m.lookupNeuron(in.readInt());
         }
     }
+
+    @Override
+    public void delete(Set<String> modelLabels) {
+
+    }
 }
diff --git a/src/main/java/network/aika/lattice/OrNode.java b/src/main/java/network/aika/lattice/OrNode.java
@@ -212,20 +212,34 @@ void addInput(int[] synapseIds, int threadId, Node in, boolean andMode) {
     }
 
 
-    void remove(int threadId) {
+    @Override
+    public void delete(Set<String> modelLabels) {
         outputNeuron.get().remove();
 
         super.remove();
 
         try {
             lock.acquireReadLock();
-            removeParents(threadId);
+            removeParents(modelLabels);
         } finally {
             lock.releaseReadLock();
         }
     }
 
 
+    void removeParents(Set<String> modelLabels) {
+        for (OrEntry oe : andParents) {
+            Provider<? extends Node> pp = oe.parent;
+            Node pn = pp.get();
+            pn.changeNumberOfNeuronRefs(provider.getModel().defaultThreadId, provider.getModel().visitedCounter.addAndGet(1), -1);
+            pn.removeOrChild(oe);
+            pn.setModified();
+
+            pp.delete(modelLabels);
+        }
+        andParents.clear();
+    }
+
     void removeParents(int threadId) {
         for (OrEntry oe : andParents) {
             Node pn = oe.parent.get();
diff --git a/src/main/java/network/aika/neuron/INeuron.java b/src/main/java/network/aika/neuron/INeuron.java
@@ -732,6 +732,18 @@ public void reactivate() {
         }
     }
 
+
+    @Override
+    public void delete(Set<String> modelLabels) {
+        getInputSynapses()
+                .forEach(s -> {
+                    s.unlink();
+                    s.getInput().delete(modelLabels);
+                });
+
+        inputNode.delete(modelLabels);
+    }
+
     public void setBias(double b) {
         biasDelta = b - bias;
     }

Original file line number	Diff line number	Diff line change
`@@ -77,4 +77,6 @@ public static <P extends Provider> AbstractNode read(DataInput in, P p) throws I`
`77`	`77`	`return n;`
`78`	`78`	`}`
`79`	`79`
	`80`	`+ public abstract void delete(Set<String> modelLabels);`
	`81`	`+`
`80`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,7 @@ public interface SuspensionHook {`
`37`	`37`
`38`	`38`	`byte[] retrieve(int id);`
`39`	`39`
	`40`	`+ void delete(int id);`
	`41`	`+`
`40`	`42`	`Iterable<Integer> getAllNodeIds();`
`41`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -264,4 +264,9 @@ public void readFields(DataInput in, Model m) throws IOException {`
`264`	`264`	`inputNeuron = m.lookupNeuron(in.readInt());`
`265`	`265`	`}`
`266`	`266`	`}`
	`267`	`+`
	`268`	`+ @Override`
	`269`	`+ public void delete(Set<String> modelLabels) {`
	`270`	`+`
	`271`	`+ }`
`267`	`272`	`}`
Original file line number	Diff line number	Diff line change
`@@ -732,6 +732,18 @@ public void reactivate() {`
`732`	`732`	`}`
`733`	`733`	`}`
`734`	`734`
	`735`	`+`
	`736`	`+ @Override`
	`737`	`+ public void delete(Set<String> modelLabels) {`
	`738`	`+ getInputSynapses()`
	`739`	`+ .forEach(s -> {`
	`740`	`+ s.unlink();`
	`741`	`+ s.getInput().delete(modelLabels);`
	`742`	`+ });`
	`743`	`+`
	`744`	`+ inputNode.delete(modelLabels);`
	`745`	`+ }`
	`746`	`+`
`735`	`747`	`public void setBias(double b) {`
`736`	`748`	`biasDelta = b - bias;`
`737`	`749`	`}`