Skip to content
Snippets Groups Projects
Commit a0f7be35 authored by Eilert Tunheim's avatar Eilert Tunheim
Browse files

Minor tweaks for demo-run

parent e80983d6
No related branches found
No related tags found
No related merge requests found
...@@ -28,7 +28,7 @@ public final class Settings { ...@@ -28,7 +28,7 @@ public final class Settings {
public static int NUMBER_OF_SECONDS_LIVE_DATA = 60; public static int NUMBER_OF_SECONDS_LIVE_DATA = 60;
// Confidence interval // Confidence interval
public static final double CONFIDENCE_INTERVAL = 0.95; public static final double CONFIDENCE_INTERVAL = 0.80;
// Current sawmill settings; // Current sawmill settings;
public static final String PROJECT_ID = "sf-drying-optimization"; public static final String PROJECT_ID = "sf-drying-optimization";
......
...@@ -439,7 +439,7 @@ public class LineChartFunctionality { ...@@ -439,7 +439,7 @@ public class LineChartFunctionality {
*/ */
public static double getNonLinearRegression(Map<Integer, ArrayList<Double>> confidenceIntervalData, double y0, double alpha, double j, double n) { public static double getNonLinearRegression(Map<Integer, ArrayList<Double>> confidenceIntervalData, double y0, double alpha, double j, double n) {
double beta = getDataPointsYAxis()+y0; 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 // Getters and setters
......
...@@ -121,7 +121,7 @@ public class CreateSideBar { ...@@ -121,7 +121,7 @@ public class CreateSideBar {
try { try {
ringProgressIndicator.makeIndeterminate(); ringProgressIndicator.makeIndeterminate();
Thread.sleep(500L * NUMBER_OF_SECONDS_LIVE_DATA); Thread.sleep(500L);
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }
......
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment