From d8ed505128c82429726632e78167a51a448a6bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Wed, 11 Feb 2015 10:57:44 +0100 Subject: [PATCH] Renamed Numbers to Fibonacci Numbers is only containing Fibonacci stuff now, so I renamed it to Fibonacci --- src/{Numbers.java => Fibonacci.java} | 4 ++-- src/PythagorasTriangle.java | 12 ++++++------ src/PythagorasTriangleList.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) rename src/{Numbers.java => Fibonacci.java} (88%) diff --git a/src/Numbers.java b/src/Fibonacci.java similarity index 88% rename from src/Numbers.java rename to src/Fibonacci.java index 4dc3809..9b8f8d7 100644 --- a/src/Numbers.java +++ b/src/Fibonacci.java @@ -3,10 +3,10 @@ import java.util.LinkedList; /** * Created by Christian on 10.02.2015. */ -public class Numbers { +public class Fibonacci { LinkedList fibonacci = new LinkedList(); - public Numbers() { + public Fibonacci() { fibonacci.add((long) 1); fibonacci.add((long) 1); } diff --git a/src/PythagorasTriangle.java b/src/PythagorasTriangle.java index 49a3602..0fc151f 100644 --- a/src/PythagorasTriangle.java +++ b/src/PythagorasTriangle.java @@ -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: diff --git a/src/PythagorasTriangleList.java b/src/PythagorasTriangleList.java index 839cc97..fc4aa42 100644 --- a/src/PythagorasTriangleList.java +++ b/src/PythagorasTriangleList.java @@ -5,11 +5,11 @@ import java.util.LinkedList; */ public class PythagorasTriangleList { private LinkedList triangles = new LinkedList(); - 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)); } }