1
0
Fork 0

Reformatted code

This commit is contained in:
Jan Christian Grünhage 2016-05-05 22:44:50 +02:00
parent bec95321ac
commit 0177d8a9ae
No known key found for this signature in database
GPG Key ID: 62BEE5EB8F370DC6
2 changed files with 6 additions and 9 deletions

View File

@ -10,10 +10,6 @@ public class PythagorasTreeSeed {
public double angle; public double angle;
public PythagorasTree.PythagorasTreeVariant variant; public PythagorasTree.PythagorasTreeVariant variant;
public PythagorasTreeSeed() {
}
public PythagorasTreeSeed(double size, int loopSize, int depth, double angle, PythagorasTree.PythagorasTreeVariant variant) { public PythagorasTreeSeed(double size, int loopSize, int depth, double angle, PythagorasTree.PythagorasTreeVariant variant) {
this.size = size; this.size = size;
this.loopSize = loopSize; this.loopSize = loopSize;

View File

@ -4,6 +4,7 @@ import Fractals.NumberCalculation.Fibonacci;
/** /**
* Class Fractals.PythagorasTree.PythagorasTriangle * Class Fractals.PythagorasTree.PythagorasTriangle
*
* @author Jan Christian Grünhage * @author Jan Christian Grünhage
*/ */
public class PythagorasTriangle { public class PythagorasTriangle {
@ -69,16 +70,16 @@ public class PythagorasTriangle {
rightSizeFactor = Math.sin(Math.toRadians(rightAngle)); rightSizeFactor = Math.sin(Math.toRadians(rightAngle));
} }
private double kilianEhrmannAngle(int index) { private double kilianEhrmannAngle(int index) {
if (index == 0 || index == 1) index = 2; if (index == 0 || index == 1) index = 2;
double result_1; double result_1;
double result_2; double result_2;
result_1 = 100000000*Math.pow(index,(1/13)); result_1 = 100000000 * Math.pow(index, (1 / 13));
result_2 = 70000%index; result_2 = 70000 % index;
result_2 = Math.cos(Math.tan(result_2)); result_2 = Math.cos(Math.tan(result_2));
result_2 = index - Math.pow(result_2, 3); result_2 = index - Math.pow(result_2, 3);
result_2 *= index + (1 / ( Math.pow(index, (1/17.3)))); result_2 *= index + (1 / (Math.pow(index, (1 / 17.3))));
result_2 = Math.pow(result_2, (1/index)); result_2 = Math.pow(result_2, (1 / index));
result_1 /= result_2; result_1 /= result_2;
result_1 = result_1 % 30; result_1 = result_1 % 30;
result_1 += 30; result_1 += 30;