add "isNeuron" method

dominic.abruzzo · dominic.abruzzo · commit c9324a1ae032 · 2020-10-19T10:15:27.000+02:00
diff --git a/src/main/java/network/aika/AbstractNode.java b/src/main/java/network/aika/AbstractNode.java
@@ -17,8 +17,6 @@
 package network.aika;
 
 import network.aika.lattice.Node;
-import network.aika.lattice.NodeActivation;
-import network.aika.neuron.INeuron;
 import network.aika.neuron.Neuron;
 
 import java.io.DataInput;
@@ -98,4 +96,5 @@ public static <P extends Provider> AbstractNode read(DataInput in, P p) throws I
 
     public abstract void delete(Set<String> modelLabels);
 
+    public abstract boolean isNeuron();
 }
diff --git a/src/main/java/network/aika/Provider.java b/src/main/java/network/aika/Provider.java
@@ -131,7 +131,7 @@ public void save() {
                 throw new RuntimeException(e);
             }
 
-            model.suspensionHook.store(id, n.getLabel(), n.getModelLabels(), baos.toByteArray());
+            model.suspensionHook.store(id, n.getLabel(), n.getModelLabels(), n.isNeuron(), baos.toByteArray());
         }
         n.modified = false;
     }
diff --git a/src/main/java/network/aika/SuspensionHook.java b/src/main/java/network/aika/SuspensionHook.java
@@ -33,7 +33,7 @@ public interface SuspensionHook {
 
     int getNewId();
 
-    void store(int id, String label, Set<String> modelLabels, byte[] data);
+    void store(int id, String label, Set<String> modelLabels, boolean isNeuron, byte[] data);
 
     byte[] retrieve(int id);
 
diff --git a/src/main/java/network/aika/lattice/Node.java b/src/main/java/network/aika/lattice/Node.java
@@ -18,12 +18,13 @@
 
 
 import network.aika.*;
-import network.aika.Document;
 import network.aika.lattice.refinement.OrEntry;
 import network.aika.lattice.refinement.RefValue;
 import network.aika.lattice.refinement.Refinement;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -472,4 +473,9 @@ public static Node readNode(DataInput in, Provider p) throws IOException {
         n.readFields(in, p.getModel());
         return n;
     }
+
+    @Override
+    public boolean isNeuron() {
+        return false;
+    }
 }
diff --git a/src/main/java/network/aika/neuron/INeuron.java b/src/main/java/network/aika/neuron/INeuron.java
@@ -18,15 +18,17 @@
 
 
 import network.aika.*;
+import network.aika.lattice.InputNode;
 import network.aika.lattice.OrNode;
 import network.aika.neuron.activation.Activation;
 import network.aika.neuron.activation.Position;
-import network.aika.lattice.InputNode;
 import network.aika.neuron.relation.Relation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -748,13 +750,18 @@ public void delete(Set<String> modelLabels) {
         inputNode.delete(modelLabels);
 
         Provider on = getOutputNode();
-        if(on != null && !on.get().getModelLabels().isEmpty()) {
+        if (on != null && !on.get().getModelLabels().isEmpty()) {
             on.get().getModelLabels().forEach(ml ->
-                log.warn("Dependend model: " + ml)
+                    log.warn("Dependend model: " + ml)
             );
         }
     }
 
+    @Override
+    public boolean isNeuron() {
+        return true;
+    }
+
     public void setBias(double b) {
         biasDelta = b - bias;
     }
diff --git a/src/test/java/network/aika/network/SuspensionTest.java b/src/test/java/network/aika/network/SuspensionTest.java
@@ -23,12 +23,14 @@
 import network.aika.SuspensionHook;
 import network.aika.neuron.Neuron;
 import network.aika.neuron.Synapse;
-import network.aika.neuron.INeuron;
 import network.aika.neuron.relation.Relation;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -138,7 +140,7 @@ public int getNewId() {
         }
 
         @Override
-        public void store(int id, String label, Set<String> modelLabels, byte[] data) {
+        public void store(int id, String label, Set<String> modelLabels, boolean isNeuron, byte[] data) {
             storage.put(id, data);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public void save() {`
`131`	`131`	`throw new RuntimeException(e);`
`132`	`132`	`}`
`133`	`133`
`134`		`- model.suspensionHook.store(id, n.getLabel(), n.getModelLabels(), baos.toByteArray());`
	`134`	`+ model.suspensionHook.store(id, n.getLabel(), n.getModelLabels(), n.isNeuron(), baos.toByteArray());`
`135`	`135`	`}`
`136`	`136`	`n.modified = false;`
`137`	`137`	`}`