From 36384cd7bcb2eed3d5c822a82a67c1e0777cd5a4 Mon Sep 17 00:00:00 2001
From: Nilstrieb <nils.heydecker@gmx.ch>
Date: Tue, 17 Nov 2020 20:04:02 +0100
Subject: [PATCH] optimizations etc

---
 .../GUITestJavaFX/sample/Controller.class      | Bin 1438 -> 0 bytes
 out/production/GUITestJavaFX/sample/Main.class | Bin 1199 -> 0 bytes
 out/production/GUITestJavaFX/sample/sample.css |   7 -------
 .../GUITestJavaFX/sample/sample.fxml           |  17 -----------------
 .../CalculationThread.java                     |  12 +++++++-----
 src/mandelbrotCalculator/MandelbrotSet.java    |   2 +-
 src/ui/Controller.java                         |   2 +-
 7 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 out/production/GUITestJavaFX/sample/Controller.class
 delete mode 100644 out/production/GUITestJavaFX/sample/Main.class
 delete mode 100644 out/production/GUITestJavaFX/sample/sample.css
 delete mode 100644 out/production/GUITestJavaFX/sample/sample.fxml

diff --git a/out/production/GUITestJavaFX/sample/Controller.class b/out/production/GUITestJavaFX/sample/Controller.class
deleted file mode 100644
index fc4004677b0f9f8322cd52cc1b242ac5c07d0a45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1438
zcmX^0Z`VEs1_mnzH!cPy24;2!79Ivx1~x_pfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk-
z5<5l)W)00Sb_Nbc263>W%zS;f%$!uuyn@n_;F6-$#9U4WE(UIP1|A*;UIso!2EpRQ
z+=84`edqkVlA`>aoYW#l2A<^7qN3Ei61Sqn+*C#eMo%FI1_l8h20;cPMh5ZR#Oze(
z{JiAElJLxu4Cnm3;*!L?l43>%Q4LQ`AF!=prv;Z3W#*+@b1|?ph=3d}3Q~b74|1+J
zBZCA;V_JoNadK*2s(xl}VtT5+Cy3-?5Mz)8>6c<;kkEkW&&=0H@{zS>7|2sHJPfi7
za*PaI#i=C$MX6<(spX6ea$pVE%ni#-Ew|=kP+(AGXHeo{P-akJWRSt-2#{h%29Dy?
z60n;X8Dt?Y!Dg_vW*8#_i*tTTDkB5GPi9`KUukYqYEejHQcfx(gOE>ta$-(cVo@fD
z4;5r7$;d2bWDxejhzx5+2F~J){BjIyQ_E8GO7tC*OEUBGTtRHGwcLpa0Y(NXnCCGS
zGcvFhgOdXzgD6;)K3bSEGO&Up0m&4MsIg{b;Bu`<PAvdAqL`h*gpolO6oMeLK&j3z
zzr-!SG%p3NhLM3QIKQ+gITa+!$iR<Cbb26tj0^%!`S~TqB}It^zNsY{`6<QxYz&rM
z3|0)*><l)b1Zd01paN0~N&T65W%=2u`jC_cNt14g$tC$km5dBCATflZ5MroDVqQv4
zYO#t>etvdofi=YY$VnDS1Zo3BV@PE|Di-C@Na`W^(Hc1)K#g!t%*hGPEJ?NIV6bOo
zuyMAE2`x@7Dvrs^%qh-@@k~ig3@FM6W#;0TlGNgo;F8j`w3y=5!qU{d<W&7&D1%Y2
zATOPffyXm1FSW=yC$YFVwV0j3iIG7SBUB)6M)fQ^g9{^r9Db#Y3~Z2)VNhfM6+8?K
zObm>mti=EVybOE{5D``eHU>rpRR#tIeFjDbMg|53R;}#}j2pqyY77iuX$A&v26YAo
z1|En41`P&H1_lO31}z3{1}3oPRt9DU76t|e-Q5iAky=|AICnAdGcast5cb{8AQq{!
zok7A+YYT(4?luN_t;j75oGb}j88{J^h%vA-Ffa%+2r`H;NHK^qC^3jJ=rD+bE!Bb;
z47HSjL6<>?L6?D%L6AX)L61S7fr&wiL72gS!H|KO!H9u@frWvQ!I*)W!4&KTGX`@8
f1_llWMg|K8Mg}_u2L=WPE(S&hM+RpGR|ZJ{LmGK6

diff --git a/out/production/GUITestJavaFX/sample/Main.class b/out/production/GUITestJavaFX/sample/Main.class
deleted file mode 100644
index afea2ec89d00f26893de0c7baeb3796d15cd26d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1199
zcmX^0Z`VEs1_mnzKQ0C)24;2!79Ivx1~x_pxva#p#Iy?i#DapH%;dz9%=|okM+BRZ
zfz2i}FSEpsk%3u5GmMLYgMpKsfs2QMn}LUsK>(y#KPNFSUEe<`D>b=<k%1#UwZu6m
zvACF#L0Ci62cZBgXwAXE$H>54oS0jXld6|ik(<NCAiyBV&LG6YAj}}b$iR=Lfsuhb
zJ+&k#wK%`DC^?mpK}iG2$l#Kq%)E4Ks4aP^CHkR3KGs|eVhrN!3=%vHk_=Le3}PS?
z(<<~qmg&1i`1<(dC#IwpF*2~^<R_*eOoVBNnug>lYjy@1Mh0Q1ImOATd8zsViAAY-
zB^(TLj0{}9iFqlhIY~wNC0q;&42tXwN<0k83@VHaLNF~QiRr2O!61^6fulIJBqXyW
zCzX*w6q{$l*csH2w1RC529azIa}*drfX$%?!r)?1WzYe|qb?(Z6vV8w3Vmb;TD!P_
zB29ropNGMK!4P6Q*fd54aWoxZVQYwTV;%+*Q0ibQ&d4w4VlZPcXJ@eBVX$Pdg2$e|
zZ(?R1BLiDbVrgD-1|x%*Ml_bF31ehnan4UkWn|#@$;?ajE6q(xEec6Y0(oD^CqFqc
zCoHij6U2uKvXo?G7Be#N`aseM*cNL>2G-(|#G(=uM}vYB5~$XiVT=qs1x1;;iA9yr
zU={&81{54f>KGYVit_VI7#T$2vY?QK#-=qR1D9(>a%ur66BM&Ect9f^lEC3Ij0`Nf
zV6U?z7NvudITn92GH?ZhQ><Gi$fum3u+jsi1_nh2GX^G5EHW@NFoLom10#bq0|SFT
z10w??0|NuA)^-NQjSLJ7Obj**3=C{wK~4r+1_lNmFq@UZj=`RRfq{|1fx(f139PxA
zfrEjWfq_9+Ya0W*5brhy{v8aW2N<M%wS{E2G01E0W>AgP5n)glVbI*ppuLSjPkS4K
z5yBEN237_J20jJ>27U%H1_1^Q20;cL24S$J3J`;#mNGEtGB`0fGcYm;Fvv2vFt{=>
zF}N`>Ft9K%GPpBvGI%mrLH%P4_s<RnQ-oEZ(uaXToPmWw0&G0YPhJe(U_beQeeMeY
DR;CX_

diff --git a/out/production/GUITestJavaFX/sample/sample.css b/out/production/GUITestJavaFX/sample/sample.css
deleted file mode 100644
index a85d89c..0000000
--- a/out/production/GUITestJavaFX/sample/sample.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.root {
-    -fx-background-color: #AAAABA;
-}
-
-.label {
-    -fx-font-size: 25;
-}
\ No newline at end of file
diff --git a/out/production/GUITestJavaFX/sample/sample.fxml b/out/production/GUITestJavaFX/sample/sample.fxml
deleted file mode 100644
index 9d4caee..0000000
--- a/out/production/GUITestJavaFX/sample/sample.fxml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-
-<GridPane alignment="center" hgap="10.0" prefHeight="143.0" prefWidth="107.0" stylesheets="/sample/sample.css" vgap="10" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sample.Controller">
-    <Button onAction="#showImage" prefHeight="25.0" prefWidth="110.0" text="Start" GridPane.rowIndex="1" />
-   <ImageView fx:id="setPreview" fitWidth="1000" preserveRatio="true" />
-   <columnConstraints>
-      <ColumnConstraints />
-   </columnConstraints>
-   <rowConstraints>
-      <RowConstraints />
-      <RowConstraints />
-   </rowConstraints>
-</GridPane>
diff --git a/src/mandelbrotCalculator/CalculationThread.java b/src/mandelbrotCalculator/CalculationThread.java
index 0ce1332..ea9163d 100644
--- a/src/mandelbrotCalculator/CalculationThread.java
+++ b/src/mandelbrotCalculator/CalculationThread.java
@@ -29,7 +29,6 @@ public class CalculationThread extends Thread {
             long startTime = System.currentTimeMillis();
 
             BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-            File f = null;
 
             for (int i = 0; i < width; i++) {
                 for (int j = 0; j < height; j++) {
@@ -109,14 +108,18 @@ public class CalculationThread extends Thread {
         }
     }
 
+    /**
+     * Checks wheter the number is in the Mandelbrot set
+     * @param number The Complex Number to be checked
+     * @param iterations The amount of iterations the program should do
+     * @param threshold The threshold for a number not being in the set
+     * @return -1 if the number is in the set, else it returns the amount of interations before it reached the threshold
+     */
     int checkMandelbrot(CNumber number, int iterations, double threshold) {
-        //returns -1 if the number is in the set, returns the number of iterations before it reached the threshold if it is not in the set
 
-        // start
         CNumber n = new CNumber();
         int reached = -1;
 
-        // first
         n = CNumber.add(n, number);
 
         for (int i = 0; i < iterations; i++) {
@@ -131,7 +134,6 @@ public class CalculationThread extends Thread {
     }
 
     public int getColorAsInt(int a, int r, int g, int b) {
-
         return (a << 24) | (r << 16) | (g << 8) | b;
     }
 
diff --git a/src/mandelbrotCalculator/MandelbrotSet.java b/src/mandelbrotCalculator/MandelbrotSet.java
index 6514004..fb0886d 100644
--- a/src/mandelbrotCalculator/MandelbrotSet.java
+++ b/src/mandelbrotCalculator/MandelbrotSet.java
@@ -20,7 +20,7 @@ public class MandelbrotSet {
     private double pointY = 0;
     private double zoom = 1;
     private int width = 1920;
-    private int threshold = 100;
+    private int threshold = 1000;
     private float ratio = 2 / 3f;
     private int threadAmount = 10;
 
diff --git a/src/ui/Controller.java b/src/ui/Controller.java
index 66951b0..393b9c9 100644
--- a/src/ui/Controller.java
+++ b/src/ui/Controller.java
@@ -24,7 +24,7 @@ public class Controller {
     }
 
     public void startCalculation(ActionEvent actionEvent) {
-        MandelbrotSet m = new MandelbrotSet(2, 1, 3, 1);
+        MandelbrotSet m = new MandelbrotSet(2, 3, 3, 10);
         m.startMandelbrot();
     }
 }