diff --git a/Bachelor_application.iml b/Bachelor_application.iml
index 06a8fa9ccd7558c365b321eced705ef4f63de40c..e44eb08e2ddc937de337a2975eda2ef53dc4f301 100644
--- a/Bachelor_application.iml
+++ b/Bachelor_application.iml
@@ -54,5 +54,37 @@
<orderEntry type="library" name="Maven: com.google.auto.value:auto-value-annotations:1.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.10.14" level="project" />
+ <orderEntry type="library" name="Maven: org.python:jython-slim:2.7.2" level="project" />
+ <orderEntry type="library" name="Maven: org.antlr:antlr:3.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.antlr:ST4:4.0.8" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.antlr:antlr-runtime:3.5.2" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.62" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:7.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm-commons:7.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm-tree:7.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm-analysis:7.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm-util:7.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: com.ibm.icu:icu4j:59.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: com.carrotsearch:java-sizeof:0.0.5" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jnr:jffi:1.2.20" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jnr:jnr-netdb:1.1.6" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jnr:jnr-ffi:2.1.10" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jnr:jffi:native:1.2.19" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jnr:jnr-a64asm:1.0.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jnr:jnr-x86asm:1.0.2" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jnr:jnr-posix:3.0.50" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jnr:jnr-constants:0.9.12" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: jline:jline:2.14.5" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-buffer:4.1.45.Final" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-codec:4.1.45.Final" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-common:4.1.45.Final" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-handler:4.1.45.Final" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-resolver:4.1.45.Final" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport:4.1.45.Final" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.ant:ant:1.9.7" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.ant:ant-launcher:1.9.7" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 51648b17b7224b51ee9052b3b136ff9a1d2b888a..6c3d1d181a6b761cddbf8b2bdfa0624b573f07ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,11 @@
<artifactId>joda-time</artifactId>
<version>2.10.14</version>
</dependency>
+ <dependency>
+ <groupId>org.python</groupId>
+ <artifactId>jython-slim</artifactId>
+ <version>2.7.2</version>
+ </dependency>
</dependencies>
<properties>
diff --git a/src/main/java/com/application/GUI/InputPopUpWindow.java b/src/main/java/com/application/GUI/InputPopUpWindow.java
index 44815ba8313f784caeb533c8c4800e9ee82bd71c..22c1947cbbd5bc239cae9ec21140111470c78e67 100644
--- a/src/main/java/com/application/GUI/InputPopUpWindow.java
+++ b/src/main/java/com/application/GUI/InputPopUpWindow.java
@@ -26,8 +26,6 @@ import static com.application.GUI.LineChartFunctionality.loadSingleSeries;
*/
public class InputPopUpWindow {
- public static AtomicBoolean shuttingDown = new AtomicBoolean(false);
-
private static Thread dataThread;
public static Thread getDataThread(){
@@ -39,7 +37,6 @@ public class InputPopUpWindow {
}
public static void exitDataThread(){
- shuttingDown.set(true);
InputPopUpWindow.dataThread.interrupt();
Platform.exit();
System.exit(0);
@@ -233,7 +230,6 @@ public class InputPopUpWindow {
try{
setDataThread(new Thread(() -> {
- while (!shuttingDown.get() && !Thread.interrupted()) {
try {
// Henter her data fra databasen
Map<Integer, Map<String, Number>> data = setInputParameters();
@@ -248,12 +244,11 @@ public class InputPopUpWindow {
ex.printStackTrace();
}
}
- }));
- //thread.interrupt();
+ ));
+ InputPopUpWindow.dataThread.interrupt();
getDataThread().setDaemon(true);
getDataThread().start();
-
} catch (Exception ex) {
ex.printStackTrace();
}
diff --git a/src/main/java/com/application/GUI/LineChartFunctionality.java b/src/main/java/com/application/GUI/LineChartFunctionality.java
index 692d2b6fcfaf58977398a1da3320eec34e245d27..0bc011d3ceabfde64ec794211be23dc89270df61 100644
--- a/src/main/java/com/application/GUI/LineChartFunctionality.java
+++ b/src/main/java/com/application/GUI/LineChartFunctionality.java
@@ -9,6 +9,7 @@ import org.apache.commons.math3.distribution.TDistribution;
import org.apache.commons.math3.exception.MathIllegalArgumentException;
import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
import org.apache.commons.math3.stat.regression.SimpleRegression;
+import org.python.util.PythonInterpreter;
import java.util.*;
@@ -185,6 +186,9 @@ public class LineChartFunctionality {
}
}
+ PythonInterpreter pythonInterpreter = new PythonInterpreter();
+ //pythonInterpreter
+
XYChart.Series<String, Number> regressionSeries = new XYChart.Series<String, Number>();
diff --git a/target/classes/com/application/GUI/InputPopUpWindow.class b/target/classes/com/application/GUI/InputPopUpWindow.class
index 826b51a15cf3611662c803ff5fe52a57b342ac88..6f8be194dd66499c7a4cda284470d56527148834 100644
Binary files a/target/classes/com/application/GUI/InputPopUpWindow.class and b/target/classes/com/application/GUI/InputPopUpWindow.class differ
diff --git a/target/classes/com/application/GUI/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class
index 7454b8a8a70e558f7e0d753dd3ecce5a040db855..5a32389b113ac7d683fcb180754a030be228f01d 100644
Binary files a/target/classes/com/application/GUI/LineChartFunctionality.class and b/target/classes/com/application/GUI/LineChartFunctionality.class differ