Skip to content

Commit 75e5611

Browse files
dmi3coderdmi3coder
authored
Merge pull request #11 from dmi3coder/fix/serialisation
Fix/serialisation
2 parents dbd461d + 47849ae commit 75e5611

File tree

14 files changed

+551
-344
lines changed

14 files changed

+551
-344
lines changed

‎.idea/workspace.xml‎

Lines changed: 339 additions & 300 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ publishing {
2222
maven(MavenPublication) {
2323
groupId = 'de.dmi3y.behaiv'
2424
artifactId = 'behaiv'
25-
version = '0.3.0-alpha'
25+
version = '0.3.7-alpha'
2626

2727

2828
from components.java
@@ -40,13 +40,13 @@ repositories {
4040

4141
dependencies {
4242
// This dependency is exported to consumers, that is to say found on their compile classpath.
43-
implementation 'org.apache.commons:commons-math3:3.6.1'
44-
implementation 'org.apache.commons:commons-lang3:3.9'
4543

4644
// This dependency is used internally, and not exposed to consumers on their own compile classpath.
45+
implementation 'org.apache.commons:commons-lang3:3.9'
4746
implementation 'com.google.guava:guava:28.0-jre'
4847
implementation 'io.reactivex.rxjava3:rxjava:3.0.0-RC2'
49-
implementation 'com.google.code.gson:gson:2.8.5'
48+
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.9'
49+
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.9'
5050

5151

5252
//ejml (replacement of dl4j)

‎src/main/java/de/dmi3y/behaiv/Behaiv.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import de.dmi3y.behaiv.provider.ProviderCallback;
1010
import de.dmi3y.behaiv.session.CaptureSession;
1111
import de.dmi3y.behaiv.storage.BehaivStorage;
12+
import de.dmi3y.behaiv.tools.Pair;
1213
import io.reactivex.rxjava3.core.Observable;
1314
import io.reactivex.rxjava3.subjects.ReplaySubject;
14-
import org.apache.commons.math3.util.Pair;
1515

1616
import javax.annotation.Nonnull;
1717
import javax.annotation.Nullable;
@@ -100,7 +100,7 @@ protected CaptureSession getCurrentSession() {
100100
@Override
101101
public void onFeaturesCaptured(List<Pair<Double, String>> features) {
102102
if (kernel.readyToPredict() && predict) {
103-
subject.onNext(kernel.predictOne(features.stream().map(Pair::getFirst).collect(Collectors.toCollection(ArrayList::new))));
103+
subject.onNext(kernel.predictOne(features.stream().map(Pair::getKey).collect(Collectors.toCollection(ArrayList::new))));
104104
}
105105
}
106106

@@ -111,7 +111,7 @@ public void stopCapturing(boolean discard) {
111111
}
112112
String label = currentSession.getLabel();
113113
List<Pair<Double, String>> features = currentSession.getFeatures();
114-
kernel.updateSingle(features.stream().map(Pair::getFirst).collect(Collectors.toCollection(ArrayList::new)), label);
114+
kernel.updateSingle(features.stream().map(Pair::getKey).collect(Collectors.toCollection(ArrayList::new)), label);
115115
if (kernel.readyToPredict()) {
116116
kernel.fit();
117117
}

‎src/main/java/de/dmi3y/behaiv/kernel/Kernel.java‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package de.dmi3y.behaiv.kernel;
22

3-
import com.google.gson.Gson;
3+
import com.fasterxml.jackson.core.type.TypeReference;
4+
import com.fasterxml.jackson.databind.ObjectMapper;
45
import de.dmi3y.behaiv.storage.BehaivStorage;
5-
import org.apache.commons.math3.util.Pair;
6+
import de.dmi3y.behaiv.tools.Pair;
67

78
import java.io.BufferedReader;
89
import java.io.BufferedWriter;
@@ -15,9 +16,11 @@ public abstract class Kernel {
1516

1617
protected String id;
1718
protected Long treshold = 10L;
19+
protected ObjectMapper objectMapper;
1820

1921
public Kernel(String id) {
2022
this.id = id;
23+
objectMapper = new ObjectMapper();
2124
}
2225

2326

@@ -50,24 +53,28 @@ public void update(ArrayList<Pair<ArrayList<Double>, String>> data) {
5053
}
5154

5255
public void updateSingle(ArrayList<Double> features, String label) {
53-
data.add(Pair.create(features, label));
56+
data.add(new Pair<>(features, label));
5457
}
5558

5659
public abstract String predictOne(ArrayList<Double> features);
5760

5861
public void save(BehaivStorage storage) throws IOException {
59-
final Gson gson = new Gson();
6062

6163
try (final BufferedWriter writer = new BufferedWriter(new FileWriter(storage.getNetworkFile(id)))) {
62-
writer.write(gson.toJson(data));
64+
writer.write(objectMapper.writeValueAsString(data));
6365
}
6466
}
6567

6668
public void restore(BehaivStorage storage) throws IOException {
67-
final Gson gson = new Gson();
68-
69+
final TypeReference<ArrayList<Pair<ArrayList<Double>, String>>> typeReference = new TypeReference<ArrayList<Pair<ArrayList<Double>, String>>>() {
70+
};
6971
try (final BufferedReader reader = new BufferedReader(new FileReader(storage.getNetworkFile(id)))) {
70-
data = ((ArrayList<Pair<ArrayList<Double>, String>>) gson.fromJson(reader.readLine(), data.getClass()));
72+
final String content = reader.readLine();
73+
if (content == null || content.isEmpty()) {
74+
data = new ArrayList<>();
75+
} else {
76+
data = objectMapper.readValue(content, typeReference);
77+
}
7178
}
7279
}
7380
}

‎src/main/java/de/dmi3y/behaiv/kernel/LogisticRegressionKernel.java‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package de.dmi3y.behaiv.kernel;
22

3-
import com.google.gson.Gson;
3+
import com.fasterxml.jackson.core.type.TypeReference;
44
import de.dmi3y.behaiv.kernel.logistic.LogisticUtils;
55
import de.dmi3y.behaiv.storage.BehaivStorage;
6+
import de.dmi3y.behaiv.tools.Pair;
67
import org.apache.commons.lang3.ArrayUtils;
7-
import org.apache.commons.math3.util.Pair;
88
import org.ejml.simple.SimpleMatrix;
99

1010
import java.io.BufferedReader;
@@ -41,19 +41,19 @@ public boolean isEmpty() {
4141
@Override
4242
public void fit(ArrayList<Pair<ArrayList<Double>, String>> data) {
4343
this.data = data;
44-
labels = this.data.stream().map(Pair::getSecond).distinct().collect(Collectors.toList());
44+
labels = this.data.stream().map(Pair::getValue).distinct().collect(Collectors.toList());
4545
if (readyToPredict()) {
4646

4747

4848
//features
49-
double[][] inputs = this.data.stream().map(Pair::getFirst).map(l -> l.toArray(new Double[0]))
49+
double[][] inputs = this.data.stream().map(Pair::getKey).map(l -> l.toArray(new Double[0]))
5050
.map(ArrayUtils::toPrimitive)
5151
.toArray(double[][]::new);
5252

5353
//labels
5454
double[][] labelArray = new double[data.size()][labels.size()];
5555
for (int i = 0; i < data.size(); i++) {
56-
int dummyPos = labels.indexOf(data.get(i).getSecond());
56+
int dummyPos = labels.indexOf(data.get(i).getValue());
5757
labelArray[i][dummyPos] = 1.0;
5858
}
5959

@@ -107,22 +107,21 @@ public String predictOne(ArrayList<Double> features) {
107107

108108
@Override
109109
public void save(BehaivStorage storage) throws IOException {
110-
if (theta == null && data == null) {
110+
if (theta == null && (data == null || data.isEmpty())) {
111111
throw new IOException("Not enough data to save, network data is empty");
112112
}
113-
if (labels == null) {
113+
if (labels == null || labels.isEmpty()) {
114114
String message;
115115
message = "Kernel collected labels but failed to get data, couldn't save network.";
116116
throw new IOException(message);
117117
}
118118
if (theta == null) {
119119
super.save(storage);
120-
121120
} else {
122121
theta.saveToFileBinary(storage.getNetworkFile(id).toString());
123122
try (final BufferedWriter writer = new BufferedWriter(new FileWriter(storage.getNetworkMetadataFile(id)))) {
124-
final Gson gson = new Gson();
125-
writer.write(gson.toJson(labels));
123+
124+
writer.write(objectMapper.writeValueAsString(labels));
126125
} catch (Exception e) {
127126
e.printStackTrace();
128127
}
@@ -139,8 +138,14 @@ public void restore(BehaivStorage storage) throws IOException {
139138
}
140139

141140
try (final BufferedReader reader = new BufferedReader(new FileReader(storage.getNetworkMetadataFile(id)))) {
142-
final Gson gson = new Gson();
143-
labels = ((List<String>) gson.fromJson(reader.readLine(), labels.getClass()));
141+
final TypeReference<ArrayList<String>> typeReference = new TypeReference<ArrayList<String>>() {
142+
};
143+
final String labelsData = reader.readLine();
144+
if (labelsData == null) {
145+
labels = new ArrayList<>();
146+
} else {
147+
labels = objectMapper.readValue(labelsData, typeReference);
148+
}
144149
} catch (IOException e) {
145150
e.printStackTrace();
146151
}

‎src/main/java/de/dmi3y/behaiv/provider/DayTimeProvider.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import io.reactivex.rxjava3.core.Single;
55

66
import javax.annotation.Nullable;
7+
import java.util.ArrayList;
78
import java.util.Arrays;
89
import java.util.Calendar;
910
import java.util.Collections;
@@ -45,7 +46,7 @@ public List<String> availableFeatures() {
4546
if (compound) {
4647
return Collections.singletonList("day_time");
4748
}
48-
final List<String> strings = Arrays.asList("day_time_hours", "day_time_minutes");
49+
final List<String> strings = new ArrayList<>(Arrays.asList("day_time_hours", "day_time_minutes"));
4950
if (secondsEnabled) {
5051
strings.add("day_time_seconds");
5152
}
@@ -64,10 +65,10 @@ public Single<List<Double>> getFeature() {
6465
if (compound) {
6566
return Single.just(Collections.singletonList(hours * 60.0 + minutes));
6667
}
67-
final List<Double> listToSend = Arrays.asList(
68+
final List<Double> listToSend = new ArrayList<>(Arrays.asList(
6869
(double) hours,
6970
(double) minutes
70-
);
71+
));
7172
if (secondsEnabled) {
7273
final int seconds = calendar.get(Calendar.SECOND);
7374
listToSend.add((double) seconds);

‎src/main/java/de/dmi3y/behaiv/provider/ProviderCallback.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.dmi3y.behaiv.provider;
22

3-
import org.apache.commons.math3.util.Pair;
3+
import de.dmi3y.behaiv.tools.Pair;
44

55
import java.util.List;
66

‎src/main/java/de/dmi3y/behaiv/session/CaptureSession.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import de.dmi3y.behaiv.Behaiv;
44
import de.dmi3y.behaiv.provider.Provider;
5-
import org.apache.commons.math3.util.Pair;
5+
import de.dmi3y.behaiv.tools.Pair;
66

77
import java.util.ArrayList;
88
import java.util.InputMismatchException;

‎src/main/java/de/dmi3y/behaiv/tools/Pair.java‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package de.dmi3y.behaiv.tools;
2+
3+
public class Pair<K, V> {
4+
private K key;
5+
private V value;
6+
7+
public Pair(K k, V v) {
8+
this.key = k;
9+
this.value = v;
10+
}
11+
12+
13+
public Pair(de.dmi3y.behaiv.tools.Pair<? extends K, ? extends V> entry) {
14+
this(entry.getKey(), entry.getValue());
15+
}
16+
17+
public Pair() {
18+
}
19+
20+
public K getKey() {
21+
return this.key;
22+
}
23+
24+
public V getValue() {
25+
return this.value;
26+
}
27+
28+
public int hashCode() {
29+
int result = this.key == null ? 0 : this.key.hashCode();
30+
int h = this.value == null ? 0 : this.value.hashCode();
31+
result = 37 * result + h ^ h >>> 16;
32+
return result;
33+
}
34+
35+
public String toString() {
36+
return "[" + this.getKey() + ", " + this.getValue() + "]";
37+
}
38+
39+
public static <K, V> Pair<K, V> create(K k, V v) {
40+
return new Pair<K, V>(k, v);
41+
}
42+
43+
@Override
44+
public boolean equals(Object o) {
45+
if (this == o) return true;
46+
if (o == null || getClass() != o.getClass()) return false;
47+
Pair<?, ?> pair = (Pair<?, ?>) o;
48+
return key.equals(pair.key) &&
49+
value.equals(pair.value);
50+
}
51+
}

‎src/test/java/de/dmi3y/behaiv/LibraryTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
package de.dmi3y.behaiv;
55

66
import de.dmi3y.behaiv.kernel.KernelTest;
7-
import de.dmi3y.behaiv.kernel.LogisticRegressionKernel;
87
import de.dmi3y.behaiv.provider.TestProvider;
98
import io.reactivex.rxjava3.core.Observable;
10-
import org.apache.commons.math3.util.Pair;
9+
import de.dmi3y.behaiv.tools.Pair;
1110
import org.junit.Before;
1211
import org.junit.Test;
1312

@@ -37,10 +36,10 @@ public void setUp() throws Exception {
3736
@Test
3837
public void behaivTest_basicTestFlow_predictsJob() throws Exception {
3938
for (Pair<ArrayList<Double>, String> fToL : data) {
40-
ArrayList<Double> features = fToL.getFirst();
39+
ArrayList<Double> features = fToL.getKey();
4140
timeProvider.next(new Double[]{features.get(0)});
4241
positionProvider.next(new Double[]{features.get(1), features.get(2)});
43-
capture(fToL.getSecond());
42+
capture(fToL.getValue());
4443
}
4544

4645
Observable<String> register = behaiv.subscribe();

0 commit comments

Comments
 (0)