extended the suspension hook interface

Lukas Molzberger · Lukas Molzberger · commit d30e7e2b35c3 · 2020-09-30T13:56:10.000+02:00
diff --git a/src/main/java/network/aika/Provider.java b/src/main/java/network/aika/Provider.java
@@ -118,14 +118,14 @@ public void save() {
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             try (
                     GZIPOutputStream gzipos = new GZIPOutputStream(baos);
-                    DataOutputStream dos = new DataOutputStream(gzipos);) {
+                    DataOutputStream dos = new DataOutputStream(gzipos)) {
 
                 n.write(dos);
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
 
-            model.suspensionHook.store(id, n.getLabel(), baos.toByteArray());
+            model.suspensionHook.store(id, n.getLabel(), n.getModelLabels(), baos.toByteArray());
         }
         n.modified = false;
     }
@@ -138,7 +138,7 @@ private void reactivate() {
         ByteArrayInputStream bais = new ByteArrayInputStream(data);
         try (
                 GZIPInputStream gzipis = new GZIPInputStream(bais);
-                DataInputStream dis = new DataInputStream(gzipis);) {
+                DataInputStream dis = new DataInputStream(gzipis)) {
             n = (T) AbstractNode.read(dis, this);
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -152,7 +152,12 @@ private void reactivate() {
 
     @Override
     public boolean equals(Object o) {
-        return id == ((Provider<?>) o).id;
+        if(o == this) return true;
+
+        if(o instanceof Provider<?>) {
+            return ((Provider<?>) o).id.equals(id);
+        }
+        return false;
     }
 
 
@@ -166,10 +171,7 @@ public String toString() {
         return "p(" + id + ":" + (n != null ? n.toString() : "SUSPENDED") + ")";
     }
 
-
     public int compareTo(Provider<?> n) {
-        if (id < n.id) return -1;
-        else if (id > n.id) return 1;
-        else return 0;
+        return id.compareTo(n.id);
     }
 }
diff --git a/src/main/java/network/aika/SuspensionHook.java b/src/main/java/network/aika/SuspensionHook.java
@@ -17,6 +17,8 @@
 package network.aika;
 
 
+import java.util.Set;
+
 /**
  *
  * The suspension hook is used to suspend neurons and logic nodes to an external storage in order to reduce the memory footprint.
@@ -31,7 +33,7 @@ public interface SuspensionHook {
 
     int getNewId();
 
-    void store(int id, String label, byte[] data);
+    void store(int id, String label, Set<String> modelLabels, 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
@@ -29,6 +29,7 @@
 import org.junit.Test;
 
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -149,7 +150,7 @@ public int getNewId() {
         }
 
         @Override
-        public void store(int id, String label, byte[] data) {
+        public void store(int id, String label, Set<String> modelLabels, byte[] data) {
             storage.put(id, data);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`import org.junit.Test;`
`30`	`30`
`31`	`31`	`import java.util.Map;`
	`32`	`+import java.util.Set;`
`32`	`33`	`import java.util.TreeMap;`
`33`	`34`	`import java.util.concurrent.atomic.AtomicInteger;`
`34`	`35`	`import java.util.stream.Collectors;`
`@@ -149,7 +150,7 @@ public int getNewId() {`
`149`	`150`	`}`
`150`	`151`
`151`	`152`	`@Override`
`152`		`- public void store(int id, String label, byte[] data) {`
	`153`	`+ public void store(int id, String label, Set<String> modelLabels, byte[] data) {`
`153`	`154`	`storage.put(id, data);`
`154`	`155`	`}`
`155`	`156`