diff --git a/src/main/java/com/application/DB/Settings.java b/src/main/java/com/application/DB/Settings.java index 2ffbc38fe480b2ce6e3a5cef9990ea93c821ae42..2ccbbb07fd26b6b5cd34e1618bf743368e6fad6f 100644 --- a/src/main/java/com/application/DB/Settings.java +++ b/src/main/java/com/application/DB/Settings.java @@ -28,7 +28,7 @@ public final class Settings { public static int NUMBER_OF_SECONDS_LIVE_DATA = 60; // Confidence interval - public static final double CONFIDENCE_INTERVAL = 0.95; + public static final double CONFIDENCE_INTERVAL = 0.80; // Current sawmill settings; public static final String PROJECT_ID = "sf-drying-optimization"; diff --git a/src/main/java/com/application/GUI/LineChartFunctionality.java b/src/main/java/com/application/GUI/LineChartFunctionality.java index 9cbb9980c1448473b501b3b3c05ab62d10a72cb2..645d7a552736bbbe3c65eb05196b6295590466c7 100644 --- a/src/main/java/com/application/GUI/LineChartFunctionality.java +++ b/src/main/java/com/application/GUI/LineChartFunctionality.java @@ -439,7 +439,7 @@ public class LineChartFunctionality { */ public static double getNonLinearRegression(Map<Integer, ArrayList<Double>> confidenceIntervalData, double y0, double alpha, double j, double n) { double beta = getDataPointsYAxis()+y0; - return (((beta * y0))/(y0 +((beta- y0)*Math.exp(-alpha*j/n/((alpha/10))))))-y0; + return (((beta * y0))/(y0 +((beta- y0)*Math.exp(-alpha*j/n/((alpha/10)))))); } // Getters and setters diff --git a/src/main/java/com/application/GUI/Panes/CreateSideBar.java b/src/main/java/com/application/GUI/Panes/CreateSideBar.java index 88b4770c33165259af15ec1fa891997d9b1ab2f8..55d53cf38cd520b6a792fe03f4b1242d008b5308 100644 --- a/src/main/java/com/application/GUI/Panes/CreateSideBar.java +++ b/src/main/java/com/application/GUI/Panes/CreateSideBar.java @@ -121,7 +121,7 @@ public class CreateSideBar { try { ringProgressIndicator.makeIndeterminate(); - Thread.sleep(500L * NUMBER_OF_SECONDS_LIVE_DATA); + Thread.sleep(500L); } catch (InterruptedException e) { e.printStackTrace(); } diff --git a/target/classes/com/application/DB/Settings.class b/target/classes/com/application/DB/Settings.class index 8f101ba0feab083e0f1ec8ecd35a63097fbd45cb..eae364855f8599c77b3afa2a3261961460e48363 100644 Binary files a/target/classes/com/application/DB/Settings.class and b/target/classes/com/application/DB/Settings.class differ diff --git a/target/classes/com/application/GUI/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class index 1f3b0194298587fa67b0527fe214a6213476a565..237fda0aa544a323bc886bfe89bd4584197b17e1 100644 Binary files a/target/classes/com/application/GUI/LineChartFunctionality.class and b/target/classes/com/application/GUI/LineChartFunctionality.class differ