Skip to content

Commit c716d74

Browse files
committed
update to plugin interface
1 parent 5d8146d commit c716d74

File tree

18 files changed

+233
-20
lines changed

18 files changed

+233
-20
lines changed

org.mwg.experiments.smartgridprofiling/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@
103103
<artifactId>httpclient</artifactId>
104104
<version>4.4.1</version>
105105
</dependency>
106+
<dependency>
107+
<groupId>org.kevoree.mwg.plugins</groupId>
108+
<artifactId>ml</artifactId>
109+
<version>3-SNAPSHOT</version>
110+
</dependency>
106111

107112
</dependencies>
108113
</project>

org.mwg.experiments.smartgridprofiling/src/main/java/org/mwg/experiments/SmartGridSimulationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.mwg.*;
44
import org.mwg.core.scheduler.NoopScheduler;
55
import org.mwg.experiments.smartgridprofiling.utility.GaussianProfile;
6+
import org.mwg.ml.MLPlugin;
67
import org.mwg.ml.algorithm.profiling.GaussianSlotNode;
78

89
import java.io.BufferedReader;
@@ -22,7 +23,7 @@ public class SmartGridSimulationTest {
2223

2324
public static void main(String[] arg) {
2425
final Graph graph = new GraphBuilder()
25-
.addNodeType(new GaussianSlotNode.Factory())
26+
.withPlugin(new MLPlugin())
2627
.withScheduler(new NoopScheduler())
2728
.withOffHeapMemory()
2829
.withMemorySize(10_000_000)

org.mwg.experiments.smartgridprofiling/src/main/java/org/mwg/experiments/eurusd/TestDbNormalThenPoly.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.mwg.experiments.eurusd;
22

33
import org.mwg.*;
4+
import org.mwg.ml.MLPlugin;
45
import org.mwg.ml.algorithm.regression.PolynomialNode;
56
import org.mwg.ml.common.matrix.Matrix;
67
import org.mwg.ml.common.matrix.blassolver.BlasMatrixEngine;
@@ -69,7 +70,7 @@ public static void main(String[] arg) {
6970
.withMemorySize(100_000)
7071
.saveEvery(10000)
7172
.withStorage(new LevelDBStorage("data"))
72-
.addNodeType(new PolynomialNode.Factory())
73+
.withPlugin(new MLPlugin())
7374
.withScheduler(new NoopScheduler()).
7475
build();
7576
graph.connect(new Callback<Boolean>() {

org.mwg.experiments.smartgridprofiling/src/main/java/org/mwg/experiments/eurusd/TestDbPoly.java

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

33
import org.mwg.*;
44
import org.mwg.core.scheduler.NoopScheduler;
5+
import org.mwg.ml.MLPlugin;
56
import org.mwg.ml.algorithm.regression.PolynomialNode;
67
import org.mwg.ml.common.matrix.Matrix;
78
import org.mwg.ml.common.matrix.blassolver.BlasMatrixEngine;
@@ -75,7 +76,7 @@ public static void main(String[] arg) {
7576
.withMemorySize(100_000)
7677
.saveEvery(10000)
7778
.withStorage(new LevelDBStorage("data"))
78-
.addNodeType(new PolynomialNode.Factory())
79+
.withPlugin(new MLPlugin())
7980
.withScheduler(new NoopScheduler()).
8081
build();
8182

org.mwg.experiments.smartgridprofiling/src/main/java/org/mwg/experiments/eurusd/TestDbPolyThenNormal.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.mwg.experiments.eurusd;
22

33
import org.mwg.*;
4+
import org.mwg.ml.MLPlugin;
45
import org.mwg.ml.algorithm.regression.PolynomialNode;
56
import org.mwg.ml.common.matrix.Matrix;
67
import org.mwg.ml.common.matrix.blassolver.BlasMatrixEngine;
@@ -75,7 +76,7 @@ public static void main(String[] arg) {
7576
.withMemorySize(100_000)
7677
.saveEvery(10000)
7778
.withStorage(new LevelDBStorage("data"))
78-
.addNodeType(new PolynomialNode.Factory())
79+
.withPlugin(new MLPlugin())
7980
.withScheduler(new NoopScheduler()).
8081
build();
8182

org.mwg.experiments.smartgridprofiling/src/main/java/org/mwg/experiments/mlNodeExperiments/TestLookup.java

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

33
import org.mwg.*;
44
import org.mwg.core.scheduler.NoopScheduler;
5+
import org.mwg.ml.MLPlugin;
56
import org.mwg.ml.algorithm.profiling.GaussianMixtureNode;
67

78
import java.util.ArrayList;
@@ -18,7 +19,7 @@ public static void main(String[] arg) {
1819
.withMemorySize(100000)
1920
.saveEvery(10000)
2021
.withStorage(new LevelDBStorage("/Users/assaad/work/github/data/consumption/londonpower/leveldb"))
21-
.addNodeType(new GaussianMixtureNode.Factory())
22+
.withPlugin(new MLPlugin())
2223
.withScheduler(new NoopScheduler())
2324
.build();
2425

org.mwg.experiments.smartgridprofiling/src/main/java/org/mwg/experiments/mwgrelated/TestCache.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.mwg.LevelDBStorage;
66
import org.mwg.Node;
77
import org.mwg.core.scheduler.NoopScheduler;
8+
import org.mwg.ml.MLPlugin;
89
import org.mwg.ml.algorithm.profiling.GaussianMixtureNode;
910

1011
import java.util.Random;
@@ -18,7 +19,7 @@ public static void main(String[] arg) {
1819

1920
final Random random=new Random();
2021
final Graph graph = new org.mwg.GraphBuilder()
21-
.addNodeType(new GaussianMixtureNode.Factory())
22+
.withPlugin(new MLPlugin())
2223
.withScheduler(new NoopScheduler())
2324
.withOffHeapMemory()
2425
.withMemorySize(1_000_000)

org.mwg.experiments.smartgridprofiling/src/main/java/org/mwg/experiments/mwgrelated/TestWorld.java

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

33
import org.mwg.*;
44
import org.mwg.core.scheduler.NoopScheduler;
5+
import org.mwg.ml.MLPlugin;
56
import org.mwg.ml.algorithm.profiling.GaussianSlotNode;
67

78
import java.util.Random;
@@ -13,7 +14,7 @@ public class TestWorld {
1314
final static String csvdir = "/Users/assaad/work/github/data/consumption/londonpower/";
1415
public static void main(String[] arg){
1516
final Graph graph = new GraphBuilder()
16-
.addNodeType(new GaussianSlotNode.Factory())
17+
.withPlugin(new MLPlugin())
1718
.withScheduler(new NoopScheduler())
1819
.withOffHeapMemory()
1920
.withMemorySize(10_000_000)

org.mwg.experiments.smartgridprofiling/src/main/java/org/mwg/experiments/mwgrelated/TestWorldForkPerf.java

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

33
import org.mwg.*;
44
import org.mwg.core.scheduler.NoopScheduler;
5+
import org.mwg.ml.MLPlugin;
56
import org.mwg.ml.algorithm.profiling.GaussianSlotNode;
67

78
import java.io.File;
@@ -17,7 +18,7 @@ public class TestWorldForkPerf {
1718
public static void main(String[] arg) {
1819

1920
final Graph graph = new GraphBuilder()
20-
.addNodeType(new GaussianSlotNode.Factory())
21+
.withPlugin(new MLPlugin())
2122
.withScheduler(new NoopScheduler())
2223
.withOffHeapMemory()
2324
.withMemorySize(10_000_000)

org.mwg.experiments.smartgridprofiling/src/main/java/org/mwg/experiments/smartgridprofiling/gmm/Graph3D.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.mwg.GraphBuilder;
1010
import org.mwg.LevelDBStorage;
1111
import org.mwg.core.scheduler.NoopScheduler;
12+
import org.mwg.ml.MLPlugin;
1213
import org.mwg.ml.ProgressReporter;
1314
import org.mwg.ml.algorithm.profiling.GaussianMixtureNode;
1415
import org.mwg.ml.algorithm.profiling.ProbaDistribution;
@@ -732,7 +733,7 @@ public static void main(String[] args) {
732733
.saveEvery(10000)
733734
// .withOffHeapMemory()
734735
.withStorage(new LevelDBStorage("./"))
735-
.addNodeType(new GaussianMixtureNode.Factory())
736+
.withPlugin(new MLPlugin())
736737
.withScheduler(new NoopScheduler())
737738
.build();
738739

0 commit comments

Comments
 (0)