Renamed Numbers to Fibonacci
Numbers is only containing Fibonacci stuff now, so I renamed it to Fibonacci
This commit is contained in:
parent
d0e8874387
commit
d8ed505128
|
@ -3,10 +3,10 @@ import java.util.LinkedList;
|
|||
/**
|
||||
* Created by Christian on 10.02.2015.
|
||||
*/
|
||||
public class Numbers {
|
||||
public class Fibonacci {
|
||||
LinkedList<Long> fibonacci = new LinkedList<Long>();
|
||||
|
||||
public Numbers() {
|
||||
public Fibonacci() {
|
||||
fibonacci.add((long) 1);
|
||||
fibonacci.add((long) 1);
|
||||
}
|
|
@ -8,7 +8,7 @@ public class PythagorasTriangle {
|
|||
private double rightSizeFactor;
|
||||
private double rightAngle;
|
||||
|
||||
public PythagorasTriangle(PythagorasTree.PythagorasTreeVariant variant, int momentaryDepth, Numbers numbers, Double angle) {
|
||||
public PythagorasTriangle(PythagorasTree.PythagorasTreeVariant variant, int momentaryDepth, Fibonacci fibonacci, Double angle) {
|
||||
|
||||
switch (variant) {
|
||||
|
||||
|
@ -30,27 +30,27 @@ public class PythagorasTriangle {
|
|||
|
||||
|
||||
case PisanoPythagorasTreeOne:
|
||||
leftAngle = (numbers.calcFibonacci(momentaryDepth) % 4) * 10 + 30;
|
||||
leftAngle = (fibonacci.calcFibonacci(momentaryDepth) % 4) * 10 + 30;
|
||||
break;
|
||||
|
||||
|
||||
case PisanoPythagorasTreeTwo:
|
||||
leftAngle = (numbers.calcFibonacci(momentaryDepth) % 2) * 30 + 30;
|
||||
leftAngle = (fibonacci.calcFibonacci(momentaryDepth) % 2) * 30 + 30;
|
||||
break;
|
||||
|
||||
|
||||
case PisanoPythagorasTreeThree:
|
||||
leftAngle = (numbers.calcFibonacci(momentaryDepth) % 7) * 5 + 30;
|
||||
leftAngle = (fibonacci.calcFibonacci(momentaryDepth) % 7) * 5 + 30;
|
||||
break;
|
||||
|
||||
|
||||
case PisanoPythagorasTreeFour:
|
||||
leftAngle = (numbers.calcFibonacci(momentaryDepth) % 31) + 30;
|
||||
leftAngle = (fibonacci.calcFibonacci(momentaryDepth) % 31) + 30;
|
||||
break;
|
||||
|
||||
|
||||
case PisanoPythagorasTreeFive:
|
||||
leftAngle = (numbers.calcFibonacci(momentaryDepth) % 9) * 4 + 29;
|
||||
leftAngle = (fibonacci.calcFibonacci(momentaryDepth) % 9) * 4 + 29;
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
@ -5,11 +5,11 @@ import java.util.LinkedList;
|
|||
*/
|
||||
public class PythagorasTriangleList {
|
||||
private LinkedList<PythagorasTriangle> triangles = new LinkedList<PythagorasTriangle>();
|
||||
private Numbers numbers = new Numbers();
|
||||
private Fibonacci fibonacci = new Fibonacci();
|
||||
|
||||
public PythagorasTriangleList(PythagorasTree.PythagorasTreeVariant variant, double maximalDepth, double angle) {
|
||||
for (int i = 0; i < maximalDepth; i++) {
|
||||
triangles.add(new PythagorasTriangle(variant, i, numbers, angle));
|
||||
triangles.add(new PythagorasTriangle(variant, i, fibonacci, angle));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue