work on neuron deletion

Lukas Molzberger · Lukas Molzberger · commit 895c5d7df084 · 2020-10-14T11:57:22.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.aika-software</groupId>
     <artifactId>aika</artifactId>
     <packaging>jar</packaging>
-    <version>1.4.5</version>
+    <version>1.4.6-SNAPSHOT</version>
     <name>aika</name>
     <url>http://aika.network</url>
     <description>An artificial intelligence for knowledge acquisition</description>
diff --git a/src/main/java/network/aika/Provider.java b/src/main/java/network/aika/Provider.java
@@ -25,6 +25,8 @@ public class Provider<T extends AbstractNode> implements Comparable<Provider<?>>
 
     private volatile T n;
 
+    private boolean markedDeleted;
+
 
     public enum SuspensionMode {
         SAVE,
@@ -168,7 +170,13 @@ public void delete(Set<String> modelLabels) {
 
         n.delete(modelLabels);
 
-        model.suspensionHook.delete(id);
+//        model.removeProvider(this);
+        model.suspensionHook.delete(n.getLabel(), id);
+        markedDeleted = true;
+    }
+
+    public boolean isMarkedDeleted() {
+        return markedDeleted;
     }
 
     @Override
diff --git a/src/main/java/network/aika/SuspensionHook.java b/src/main/java/network/aika/SuspensionHook.java
@@ -37,7 +37,7 @@ public interface SuspensionHook {
 
     byte[] retrieve(int id);
 
-    void delete(int id);
+    void delete(String label, int id);
 
     Iterable<Integer> getAllNodeIds();
 }
diff --git a/src/main/java/network/aika/lattice/Node.java b/src/main/java/network/aika/lattice/Node.java
@@ -298,7 +298,9 @@ public void addActivation(A act) {
 
 
     public void remove() {
-        assert !isRemoved;
+        if(isRemoved) {
+            return;
+        }
 
         lock.acquireWriteLock();
         setModified();
diff --git a/src/main/java/network/aika/lattice/OrNode.java b/src/main/java/network/aika/lattice/OrNode.java
@@ -235,7 +235,7 @@ void removeParents(Set<String> modelLabels) {
             pn.removeOrChild(oe);
             pn.setModified();
 
-            pp.delete(modelLabels);
+//            pp.delete(modelLabels);
         }
         andParents.clear();
     }
diff --git a/src/main/java/network/aika/neuron/INeuron.java b/src/main/java/network/aika/neuron/INeuron.java
@@ -740,6 +740,8 @@ public void reactivate() {
     @Override
     public void delete(Set<String> modelLabels) {
         new ArrayList<>(getInputSynapses())
+                .stream()
+                .filter(s -> !s.getInput().isMarkedDeleted())
                 .forEach(s -> {
                     s.unlink();
                     s.getInput().delete(modelLabels);
diff --git a/src/test/java/network/aika/network/SuspensionTest.java b/src/test/java/network/aika/network/SuspensionTest.java
@@ -148,7 +148,7 @@ public byte[] retrieve(int id) {
         }
 
         @Override
-        public void delete(int id) {
+        public void delete(String label, int id) {
             storage.remove(id);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public interface SuspensionHook {`
`37`	`37`
`38`	`38`	`byte[] retrieve(int id);`
`39`	`39`
`40`		`- void delete(int id);`
	`40`	`+ void delete(String label, int id);`
`41`	`41`
`42`	`42`	`Iterable<Integer> getAllNodeIds();`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ void removeParents(Set<String> modelLabels) {`
`235`	`235`	`pn.removeOrChild(oe);`
`236`	`236`	`pn.setModified();`
`237`	`237`
`238`		`- pp.delete(modelLabels);`
	`238`	`+// pp.delete(modelLabels);`
`239`	`239`	`}`
`240`	`240`	`andParents.clear();`
`241`	`241`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public byte[] retrieve(int id) {`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`@Override`
`151`		`- public void delete(int id) {`
	`151`	`+ public void delete(String label, int id) {`
`152`	`152`	`storage.remove(id);`
`153`	`153`	`}`
`154`	`154`