From a0f7be35ae8631f8adf317f1141f802e78966c27 Mon Sep 17 00:00:00 2001
From: emtunhei <emtunhei@stud.ntnu.no>
Date: Wed, 1 Jun 2022 13:42:34 +0200
Subject: [PATCH] Minor tweaks for demo-run
---
.../java/com/application/DB/Settings.java | 2 +-
.../GUI/LineChartFunctionality.java | 2 +-
.../application/GUI/Panes/CreateSideBar.java | 2 +-
.../classes/com/application/DB/Settings.class | Bin 6082 -> 6082 bytes
.../GUI/LineChartFunctionality.class | Bin 16234 -> 16232 bytes
5 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/application/DB/Settings.java b/src/main/java/com/application/DB/Settings.java
index 2ffbc38..2ccbbb0 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 9cbb998..645d7a5 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 88b4770..55d53cf 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
GIT binary patch
delta 20
ZcmX@4e@K5r8YBD5nIJH0b1q}37yx8K2@L=M
delta 20
YcmX@4e@K5r8YBC=G%(nl%NQyK09sE6-v9sr
diff --git a/target/classes/com/application/GUI/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class
index 1f3b0194298587fa67b0527fe214a6213476a565..237fda0aa544a323bc886bfe89bd4584197b17e1 100644
GIT binary patch
delta 113
zcmaD=_o8k?6C?YZGaztwb0=ehIp+)p9tLg(1_rgspDa`-OIj+psxk6290rO2#TZQ)
u?l3TdS!O^MGl<1-706-*i<tvi><k<Xa*P&07AM0CpePSS{pLE$H>?15Od8<;
delta 116
zcmaD+_o{9~6C?Y3V=&m<$(UfyIg5dZft!JWL1XeK3sold^vU9u3a%QA{0xVIf<R$L
wQ-(VXj9``-ki`sQF<b?*SixfEKo&a#2ZI8m1(3zb@B%2x15v-Z#_|m-09&0G>i_@%
--
GitLab