jcgruenhage/pythagoreantree
1
0
Fork 0
Code Releases Activity

Renamed Numbers to Fibonacci

Browse source 
Numbers is only containing Fibonacci stuff now,
so I renamed it to Fibonacci
This commit is contained in:
Jan Christian Grünhage 2015-02-11 10:57:44 +01:00
parent d0e8874387
commit d8ed505128
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Numbers.java → src/Fibonacci.java
View file

@ -3,10 +3,10 @@ import java.util.LinkedList;
/** /**
* Created by Christian on 10.02.2015. * Created by Christian on 10.02.2015.
*/ */
public class Numbers { public class Fibonacci {
LinkedList<Long> fibonacci = new LinkedList<Long>(); LinkedList<Long> fibonacci = new LinkedList<Long>();
public Numbers() { public Fibonacci() {
fibonacci.add((long) 1); fibonacci.add((long) 1);
fibonacci.add((long) 1); fibonacci.add((long) 1);
} }

12
src/PythagorasTriangle.java
View file

@ -8,7 +8,7 @@ public class PythagorasTriangle {
private double rightSizeFactor; private double rightSizeFactor;
private double rightAngle; 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) { switch (variant) {
@ -30,27 +30,27 @@ public class PythagorasTriangle {
case PisanoPythagorasTreeOne: case PisanoPythagorasTreeOne:
leftAngle = (numbers.calcFibonacci(momentaryDepth) % 4) * 10 + 30; leftAngle = (fibonacci.calcFibonacci(momentaryDepth) % 4) * 10 + 30;
break; break;
case PisanoPythagorasTreeTwo: case PisanoPythagorasTreeTwo:
leftAngle = (numbers.calcFibonacci(momentaryDepth) % 2) * 30 + 30; leftAngle = (fibonacci.calcFibonacci(momentaryDepth) % 2) * 30 + 30;
break; break;
case PisanoPythagorasTreeThree: case PisanoPythagorasTreeThree:
leftAngle = (numbers.calcFibonacci(momentaryDepth) % 7) * 5 + 30; leftAngle = (fibonacci.calcFibonacci(momentaryDepth) % 7) * 5 + 30;
break; break;
case PisanoPythagorasTreeFour: case PisanoPythagorasTreeFour:
leftAngle = (numbers.calcFibonacci(momentaryDepth) % 31) + 30; leftAngle = (fibonacci.calcFibonacci(momentaryDepth) % 31) + 30;
break; break;
case PisanoPythagorasTreeFive: case PisanoPythagorasTreeFive:
leftAngle = (numbers.calcFibonacci(momentaryDepth) % 9) * 4 + 29; leftAngle = (fibonacci.calcFibonacci(momentaryDepth) % 9) * 4 + 29;
break; break;
default: default:

4
src/PythagorasTriangleList.java
View file

@ -5,11 +5,11 @@ import java.util.LinkedList;
*/ */
public class PythagorasTriangleList { public class PythagorasTriangleList {
private LinkedList<PythagorasTriangle> triangles = new LinkedList<PythagorasTriangle>(); 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) { public PythagorasTriangleList(PythagorasTree.PythagorasTreeVariant variant, double maximalDepth, double angle) {
for (int i = 0; i < maximalDepth; i++) { for (int i = 0; i < maximalDepth; i++) {
triangles.add(new PythagorasTriangle(variant, i, numbers, angle)); triangles.add(new PythagorasTriangle(variant, i, fibonacci, angle));
} }
} }