update to last MWG, add NDArray structure

Author: assaad

org.mwg.experiments.smartgridprofiling/pom.xml

@@ -51,7 +51,7 @@
 
     <properties>
         <gs.core.version>1.2</gs.core.version>
-        <mwg.version>3-SNAPSHOT</mwg.version>
+        <mwg.version>4-SNAPSHOT</mwg.version>
     </properties>
 
     <dependencies>
@@ -108,6 +108,11 @@
             <artifactId>ml</artifactId>
             <version>3-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.kevoree.mwg.plugins</groupId>
+            <artifactId>ml</artifactId>
+            <version>4-SNAPSHOT</version>
+        </dependency>
 
     </dependencies>
 </project>

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

@@ -13,6 +13,8 @@
 import org.mwg.ml.ProgressReporter;
 import org.mwg.ml.algorithm.profiling.GaussianMixtureNode;
 import org.mwg.ml.algorithm.profiling.ProbaDistribution;
+import org.mwg.ml.algorithm.profiling.ProbaDistribution2;
+import org.mwg.ml.common.NDimentionalArray;
 import org.mwg.ml.common.matrix.Matrix;
 import org.mwg.ml.common.matrix.operation.MultivariateNormalDistribution;
 
@@ -53,9 +55,11 @@ public class Graph3D extends JFrame implements PropertyChangeListener {
     private JLabel processinginfo;
     private JTextField textX;
     private JTextField textY;
+    private JCheckBox fastCalc;
     private double[] err;
     private int[] xConfig = {0, 24, 48};
     private int[] yConfig = {0, 1000, 100};
+    private double[] range;
     private boolean automaticMax = false;
     private boolean displayGraph = false;
 
@@ -147,19 +151,18 @@ private Plot3DPanel generatePlot() {
                 }
             }
 
-            double yrange;
-            yrange = (yConfig[1] - yConfig[0]);
-            yrange = yrange / yConfig[2];
+            range= new double[2];
+            range[1] = (yConfig[1] - yConfig[0]);
+            range[1] = range[1] / yConfig[2];
 
-            double xrange;
-            xrange = (xConfig[1] - xConfig[0]);
-            xrange = xrange / xConfig[2];
+            range[0] = (xConfig[1] - xConfig[0]);
+            range[0] = range[0] / xConfig[2];
 
             for (int i = 0; i < yArray.length; i++) {
-                yArray[i] = i * yrange + yConfig[0];
+                yArray[i] = i * range[1] + yConfig[0];
             }
             for (int i = 0; i < xArray.length; i++) {
-                xArray[i] = i * xrange + xConfig[0];
+                xArray[i] = i * range[0] + xConfig[0];
             }
 
             double[][] featArray = new double[(xArray.length * yArray.length)][2];
@@ -243,7 +246,18 @@ private double[] calculateArray(double[][] features, double[] min, double[] max)
             CountDownLatch countDownLatch = new CountDownLatch(1);
             profiler.query(selectedCalcLevel, min, max, probabilities -> {
                 if (probabilities != null) {
-                    res[0] = probabilities.calculateArray(features, this);
+
+                    if(!fastCalc.isSelected()) {
+                        res[0] = probabilities.calculateArray(features, this);
+                    }
+                    else {
+                        ProbaDistribution2 newCalc = new ProbaDistribution2(probabilities.total, probabilities.distributions, probabilities.global);
+                        NDimentionalArray temp = newCalc.calculate(min, max, range, err, null);
+                        res[0]=new double[features.length];
+                        for(int i=0;i<features.length;i++){
+                            res[0][i]=temp.get(features[i]);
+                        }
+                    }
                     updateProgress(100);
                     countDownLatch.countDown();
                 }
@@ -369,7 +383,7 @@ private void initUI() {
         spUp.setContinuousLayout(true);
         spUp.setDividerLocation(this.getWidth() - 300);
 
-        GridLayout experimentLayout = new GridLayout(8, 1, 0, 0);
+        GridLayout experimentLayout = new GridLayout(9, 1, 0, 0);
         board.setLayout(experimentLayout);
 
         Integer[] items = new Integer[MAXLEVEL + 2];
@@ -412,10 +426,20 @@ public void actionPerformed(ActionEvent e) {
         processinginfo = new JLabel("");
         board.add(processinginfo);
 
+        fastCalc = new JCheckBox("fast calculation");
+        fastCalc.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                feed(0, null);
+            }
+        });
+        board.add(fastCalc);
 
         getContentPane().add(spUp, BorderLayout.CENTER);
 
 
+
+
         setSize(1600, 1000);
         setLocationRelativeTo(null);
 
@@ -696,8 +720,6 @@ public void actionPerformed(ActionEvent e) {
         });
 
         menu.add(menuItem);
-
-
         setJMenuBar(menuBar);