From 84b32a046c7a85a0f094fcf366e1a131e2bbb732 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Wed, 10 Jun 2015 11:02:10 +0200 Subject: Fix ConcurrentModificationException; cleaner drawer layout --- app/src/main/java/org/rssin/neurons/FeedSorter.java | 2 +- app/src/main/java/org/rssin/neurons/MultiNeuralNetwork.java | 2 +- app/src/main/java/org/rssin/neurons/NeuralNetwork.java | 2 +- app/src/main/java/org/rssin/neurons/Neuron.java | 2 +- app/src/main/java/org/rssin/serialization/SerializationTools.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/src/main/java/org') diff --git a/app/src/main/java/org/rssin/neurons/FeedSorter.java b/app/src/main/java/org/rssin/neurons/FeedSorter.java index 4a8fe7e..0af57ae 100755 --- a/app/src/main/java/org/rssin/neurons/FeedSorter.java +++ b/app/src/main/java/org/rssin/neurons/FeedSorter.java @@ -34,7 +34,7 @@ public class FeedSorter implements Storable { private Hashtable wordInputs = new Hashtable<>(); private Hashtable authorInputs = new Hashtable<>(); - private void writeObject(java.io.ObjectOutputStream stream) throws IOException { + private synchronized void writeObject(java.io.ObjectOutputStream stream) throws IOException { stream.writeObject(nn); SerializationTools.writeList(trainingCases, stream); SerializationTools.writeArray(isNthMonthInput, stream); diff --git a/app/src/main/java/org/rssin/neurons/MultiNeuralNetwork.java b/app/src/main/java/org/rssin/neurons/MultiNeuralNetwork.java index ece53a8..9ba40e0 100755 --- a/app/src/main/java/org/rssin/neurons/MultiNeuralNetwork.java +++ b/app/src/main/java/org/rssin/neurons/MultiNeuralNetwork.java @@ -13,7 +13,7 @@ class MultiNeuralNetwork implements Serializable { private static final long serialVersionUID = 0; private NeuralNetwork[] networks; - private void writeObject(java.io.ObjectOutputStream stream) throws IOException { + private synchronized void writeObject(java.io.ObjectOutputStream stream) throws IOException { SerializationTools.writeArray(networks, stream); } diff --git a/app/src/main/java/org/rssin/neurons/NeuralNetwork.java b/app/src/main/java/org/rssin/neurons/NeuralNetwork.java index c990be9..972f9de 100755 --- a/app/src/main/java/org/rssin/neurons/NeuralNetwork.java +++ b/app/src/main/java/org/rssin/neurons/NeuralNetwork.java @@ -15,7 +15,7 @@ class NeuralNetwork implements Serializable { private Neuron[] hiddenNodes; private Neuron outputNode; - private void writeObject(java.io.ObjectOutputStream stream) throws IOException { + private synchronized void writeObject(java.io.ObjectOutputStream stream) throws IOException { SerializationTools.writeArray(hiddenNodes, stream); stream.writeObject(outputNode); } diff --git a/app/src/main/java/org/rssin/neurons/Neuron.java b/app/src/main/java/org/rssin/neurons/Neuron.java index 203a450..da0e4ca 100755 --- a/app/src/main/java/org/rssin/neurons/Neuron.java +++ b/app/src/main/java/org/rssin/neurons/Neuron.java @@ -17,7 +17,7 @@ class Neuron implements Serializable { private List weights = new ArrayList<>(); - private void writeObject(java.io.ObjectOutputStream stream) throws IOException { + private synchronized void writeObject(java.io.ObjectOutputStream stream) throws IOException { SerializationTools.writeList(weights, stream); } diff --git a/app/src/main/java/org/rssin/serialization/SerializationTools.java b/app/src/main/java/org/rssin/serialization/SerializationTools.java index 7b06f55..1c2d4db 100755 --- a/app/src/main/java/org/rssin/serialization/SerializationTools.java +++ b/app/src/main/java/org/rssin/serialization/SerializationTools.java @@ -47,7 +47,7 @@ public class SerializationTools { return array; } - public static void writeList(List list, ObjectOutputStream stream) throws IOException { + public synchronized static void writeList(List list, ObjectOutputStream stream) throws IOException { stream.write(list.size()); for(T i : list) { -- cgit v1.2.3