Merge remote-tracking branch 'origin/stable-1.4.0' into stable-1.4.0

Lukas Molzberger · Lukas Molzberger · commit 8e032476db02 · 2020-10-07T11:20:14.000+02:00
diff --git a/src/main/java/network/aika/AbstractNode.java b/src/main/java/network/aika/AbstractNode.java
@@ -22,6 +22,7 @@
 import network.aika.neuron.Neuron;
 
 import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Set;
 import java.util.TreeSet;
@@ -67,6 +68,24 @@ public String getLabel() {
         return null;
     }
 
+    @Override
+    public void write(DataOutput out) throws IOException {
+        if(modelLabels != null) {
+            for (String modelLabel: modelLabels) {
+                out.writeBoolean(true);
+                out.writeUTF(modelLabel);
+            }
+        }
+        out.writeBoolean(false);
+    }
+
+    @Override
+    public void readFields(DataInput in, Model m) throws IOException {
+        while(in.readBoolean()) {
+            getModelLabels().add(in.readUTF());
+        }
+    }
+
     public static <P extends Provider> AbstractNode read(DataInput in, P p) throws IOException {
         AbstractNode n;
         if(in.readBoolean()) {
diff --git a/src/main/java/network/aika/lattice/Node.java b/src/main/java/network/aika/lattice/Node.java
@@ -401,6 +401,8 @@ public int compareTo(Node n) {
 
     @Override
     public void write(DataOutput out) throws IOException {
+        super.write(out);
+
         out.writeInt(level);
 
         out.writeInt(numberOfNeuronRefs.get());
@@ -428,6 +430,8 @@ public void write(DataOutput out) throws IOException {
 
     @Override
     public void readFields(DataInput in, Model m) throws IOException {
+        super.readFields(in, m);
+
         level = in.readInt();
 
         numberOfNeuronRefs.set(in.readInt());
diff --git a/src/main/java/network/aika/neuron/INeuron.java b/src/main/java/network/aika/neuron/INeuron.java
@@ -567,6 +567,8 @@ public int compareTo(INeuron n) {
     public void write(DataOutput out) throws IOException {
         out.writeBoolean(true);
 
+        super.write(out);
+
         out.writeBoolean(label != null);
         if(label != null) {
             out.writeUTF(label);
@@ -631,6 +633,8 @@ public void write(DataOutput out) throws IOException {
 
     @Override
     public void readFields(DataInput in, Model m) throws IOException {
+        super.readFields(in, m);
+
         if(in.readBoolean()) {
             label = in.readUTF();
         }
