From 26f8dd6d718405af847ed5171ce13310754b99aa Mon Sep 17 00:00:00 2001 From: Armin Wolf Date: Tue, 19 Sep 2017 17:38:10 +0200 Subject: [PATCH] kleine Anpassung.. --- .../naiv/NaivLeastMedianOfSquaresEstimator.java | 1 + .../presenter/evaluation/EvaluateAlgorithms.java | 12 +----------- .../src/main/java/view/MainFrame.java | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/LinearRegressionTool/src/main/java/presenter/algorithms/naiv/NaivLeastMedianOfSquaresEstimator.java b/LinearRegressionTool/src/main/java/presenter/algorithms/naiv/NaivLeastMedianOfSquaresEstimator.java index 7bb3b49..2562cff 100644 --- a/LinearRegressionTool/src/main/java/presenter/algorithms/naiv/NaivLeastMedianOfSquaresEstimator.java +++ b/LinearRegressionTool/src/main/java/presenter/algorithms/naiv/NaivLeastMedianOfSquaresEstimator.java @@ -38,6 +38,7 @@ public class NaivLeastMedianOfSquaresEstimator implements Algorithm { Double alpha; Double dijk; for (Point i : set) { + System.out.println(i); for (Point j : set) { for (Point k : set) { triple.add(i); diff --git a/LinearRegressionTool/src/main/java/presenter/evaluation/EvaluateAlgorithms.java b/LinearRegressionTool/src/main/java/presenter/evaluation/EvaluateAlgorithms.java index 2e0d2d7..d131ad9 100644 --- a/LinearRegressionTool/src/main/java/presenter/evaluation/EvaluateAlgorithms.java +++ b/LinearRegressionTool/src/main/java/presenter/evaluation/EvaluateAlgorithms.java @@ -129,20 +129,10 @@ public class EvaluateAlgorithms extends Observable { ArrayList result; ArrayList> multipleResults = new ArrayList<>(); - /* DEBUG - NaivLeastMedianOfSquaresEstimator l = new NaivLeastMedianOfSquaresEstimator(arrangement.getLines()); - NaivRepeatedMedianEstimator r = new NaivRepeatedMedianEstimator(arrangement.getLines()); - NaivTheilSenEstimator t = new NaivTheilSenEstimator(arrangement.getLines()); - - l.run(); - r.run(); - t.run(); - System.out.println(); - DEBUG */ - startLMS(); startRM(); startTS(); + System.out.println("alle advanced algorithmen sind berechnet!"); switch (type) { case 0: //der alg der gewählt wurde diff --git a/LinearRegressionTool/src/main/java/view/MainFrame.java b/LinearRegressionTool/src/main/java/view/MainFrame.java index df0fdb7..8a6b4e7 100644 --- a/LinearRegressionTool/src/main/java/view/MainFrame.java +++ b/LinearRegressionTool/src/main/java/view/MainFrame.java @@ -284,7 +284,7 @@ public class MainFrame extends JFrame { } private void setDimensions() { - this.setExtendedState(JFrame.MAXIMIZED_BOTH); + this.setSize(1600,1050); this.setMinimumSize(new Dimension(1024, 768)); this.setResizable(true); GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();