aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xapp/src/main/java/org/rssin/neurons/FeedSorter.java2
-rwxr-xr-xapp/src/main/java/org/rssin/neurons/MultiNeuralNetwork.java2
-rwxr-xr-xapp/src/main/java/org/rssin/neurons/NeuralNetwork.java2
-rwxr-xr-xapp/src/main/java/org/rssin/neurons/Neuron.java2
-rwxr-xr-xapp/src/main/java/org/rssin/serialization/SerializationTools.java2
-rwxr-xr-xapp/src/main/res/layout/item_navigation_drawer.xml21
6 files changed, 11 insertions, 20 deletions
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<String, Integer> wordInputs = new Hashtable<>();
private Hashtable<String, Integer> 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<Double> 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 <T> void writeList(List<T> list, ObjectOutputStream stream) throws IOException {
+ public synchronized static <T> void writeList(List<T> list, ObjectOutputStream stream) throws IOException {
stream.write(list.size());
for(T i : list)
{
diff --git a/app/src/main/res/layout/item_navigation_drawer.xml b/app/src/main/res/layout/item_navigation_drawer.xml
index 6555bb3..7adc547 100755
--- a/app/src/main/res/layout/item_navigation_drawer.xml
+++ b/app/src/main/res/layout/item_navigation_drawer.xml
@@ -8,23 +8,14 @@
android:orientation="vertical"
android:layout_marginTop="0dp"
- android:background="#121212"
- >
+ android:background="#121212">
- <LinearLayout
+ <TextView
+ android:id="@+id/item_navigation_drawer_text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:minHeight="55dp"
- >
-
- <TextView
- android:id="@+id/item_navigation_drawer_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="10dp"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="#FFFFFF"
- />
- </LinearLayout>
+ android:layout_margin="10dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="#FFFFFF"/>
</LinearLayout> \ No newline at end of file