fixes

Lukas Molzberger · Lukas Molzberger · commit d141d15ea91f · 2020-10-12T14:29:18.000+02:00
diff --git a/src/main/java/network/aika/AbstractNode.java b/src/main/java/network/aika/AbstractNode.java
@@ -49,7 +49,9 @@ public Set<String> getModelLabels() {
     }
 
     public void addModelLabel(String modelLabel) {
-        getModelLabels().add(modelLabel);
+        if(modelLabel != null) {
+            getModelLabels().add(modelLabel);
+        }
     }
 
     public P getProvider() {
diff --git a/src/main/java/network/aika/Provider.java b/src/main/java/network/aika/Provider.java
@@ -1,6 +1,8 @@
 package network.aika;
 
 
+import network.aika.neuron.INeuron;
+import network.aika.neuron.Neuron;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -131,7 +133,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 instanceof INeuron, 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/test/java/network/aika/network/SuspensionTest.java b/src/test/java/network/aika/network/SuspensionTest.java
@@ -138,7 +138,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
`@@ -49,7 +49,9 @@ public Set<String> getModelLabels() {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public void addModelLabel(String modelLabel) {`
`52`		`- getModelLabels().add(modelLabel);`
	`52`	`+ if(modelLabel != null) {`
	`53`	`+ getModelLabels().add(modelLabel);`
	`54`	`+ }`
`53`	`55`	`}`
`54`	`56`
`55`	`57`	`public P getProvider() {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`package network.aika;`
`2`	`2`
`3`	`3`
	`4`	`+import network.aika.neuron.INeuron;`
	`5`	`+import network.aika.neuron.Neuron;`
`4`	`6`	`import org.slf4j.Logger;`
`5`	`7`	`import org.slf4j.LoggerFactory;`
`6`	`8`
`@@ -131,7 +133,7 @@ public void save() {`
`131`	`133`	`throw new RuntimeException(e);`
`132`	`134`	`}`
`133`	`135`
`134`		`- model.suspensionHook.store(id, n.getLabel(), n.getModelLabels(), baos.toByteArray());`
	`136`	`+ model.suspensionHook.store(id, n.getLabel(), n.getModelLabels(), n instanceof INeuron, baos.toByteArray());`
`135`	`137`	`}`
`136`	`138`	`n.modified = false;`
`137`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public int getNewId() {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`@Override`
`141`		`- public void store(int id, String label, Set<String> modelLabels, byte[] data) {`
	`141`	`+ public void store(int id, String label, Set<String> modelLabels, boolean isNeuron, byte[] data) {`
`142`	`142`	`storage.put(id, data);`
`143`	`143`	`}`
`144`	`144`