Moved some files around

This commit is contained in:
Jan Christian Grünhage 2015-02-18 12:30:24 +01:00
parent 2bb7d12a0f
commit bec95321ac
10 changed files with 26 additions and 22 deletions

View file

@ -1,9 +1,11 @@
import PythagorasTree.PythagorasTree; package Fractals;
import Fractals.PythagorasTree.PythagorasTree;
import ch.aplu.turtle.Options; import ch.aplu.turtle.Options;
import ch.aplu.turtle.Playground; import ch.aplu.turtle.Playground;
import ch.aplu.turtle.Turtle; import ch.aplu.turtle.Turtle;
import PythagorasTree.*; import Fractals.PythagorasTree.*;
import java.awt.*; import java.awt.*;
import java.util.Scanner; import java.util.Scanner;
@ -158,7 +160,7 @@ public class Main {
public static void playgroundSettings() { public static void playgroundSettings() {
Scanner scanner = new Scanner(System.in); Scanner scanner = new Scanner(System.in);
Options.setFrameTitle("PythagorasTree"); Options.setFrameTitle("Fractals/PythagorasTree");
System.out.println("How wide should the window be?"); System.out.println("How wide should the window be?");
int width = Integer.parseInt(scanner.nextLine()); int width = Integer.parseInt(scanner.nextLine());
@ -231,11 +233,11 @@ public class Main {
System.out.println("PisanoPythagorasTreeOne:"); System.out.println("PisanoPythagorasTreeOne:");
System.out.println(""); System.out.println("");
System.out.println("This creates an asymetric Pythagoras Tree."); System.out.println("This creates an asymetric Pythagoras Tree.");
System.out.println("The angles used in this tree are generated from the NumberCalculation.Fibonacci Numbers."); System.out.println("The angles used in this tree are generated from the Fractals.NumberCalculation.Fibonacci Numbers.");
System.out.println("This (and the following variants) are similar to the regular random trees, "); System.out.println("This (and the following variants) are similar to the regular random trees, ");
System.out.println("just with angles generated from the NumberCalculation.Fibonacci Numbers."); System.out.println("just with angles generated from the Fractals.NumberCalculation.Fibonacci Numbers.");
System.out.println("The angles of this variant calculated like this: "); System.out.println("The angles of this variant calculated like this: ");
System.out.println("NumberCalculation.Fibonacci number of the Level modulo 4 multiplied by 10 plus 30"); System.out.println("Fractals.NumberCalculation.Fibonacci number of the Level modulo 4 multiplied by 10 plus 30");
System.out.println(""); System.out.println("");
System.out.println(""); System.out.println("");
System.out.println(""); System.out.println("");
@ -243,7 +245,7 @@ public class Main {
System.out.println("PisanoPythagorasTreeTwo:"); System.out.println("PisanoPythagorasTreeTwo:");
System.out.println(""); System.out.println("");
System.out.println("The angles of this variant calculated like this: "); System.out.println("The angles of this variant calculated like this: ");
System.out.println("NumberCalculation.Fibonacci number of the Level modulo 2 multiplied by 30 plus 30"); System.out.println("Fractals.NumberCalculation.Fibonacci number of the Level modulo 2 multiplied by 30 plus 30");
System.out.println(""); System.out.println("");
System.out.println(""); System.out.println("");
System.out.println(""); System.out.println("");
@ -251,7 +253,7 @@ public class Main {
System.out.println("PisanoPythagorasTreeThree:"); System.out.println("PisanoPythagorasTreeThree:");
System.out.println(""); System.out.println("");
System.out.println("The angles of this variant calculated like this: "); System.out.println("The angles of this variant calculated like this: ");
System.out.println("NumberCalculation.Fibonacci number of the Level modulo 7 multiplied by 5 plus 30"); System.out.println("Fractals.NumberCalculation.Fibonacci number of the Level modulo 7 multiplied by 5 plus 30");
System.out.println(""); System.out.println("");
System.out.println(""); System.out.println("");
System.out.println(""); System.out.println("");
@ -259,7 +261,7 @@ public class Main {
System.out.println("PisanoPythagorasTreeFour:"); System.out.println("PisanoPythagorasTreeFour:");
System.out.println(""); System.out.println("");
System.out.println("The angles of this variant calculated like this: "); System.out.println("The angles of this variant calculated like this: ");
System.out.println("NumberCalculation.Fibonacci number of the Level modulo 31 plus 30"); System.out.println("Fractals.NumberCalculation.Fibonacci number of the Level modulo 31 plus 30");
System.out.println(""); System.out.println("");
System.out.println(""); System.out.println("");
System.out.println(""); System.out.println("");
@ -267,7 +269,7 @@ public class Main {
System.out.println("PisanoPythagorasTreeFive:"); System.out.println("PisanoPythagorasTreeFive:");
System.out.println(""); System.out.println("");
System.out.println("The angles of this variant calculated like this: "); System.out.println("The angles of this variant calculated like this: ");
System.out.println("NumberCalculation.Fibonacci number of the Level modulo 9 multiplied by 4 plus 29"); System.out.println("Fractals.NumberCalculation.Fibonacci number of the Level modulo 9 multiplied by 4 plus 29");
System.out.println(""); System.out.println("");
System.out.println(""); System.out.println("");
System.out.println(""); System.out.println("");

View file

@ -1,4 +1,4 @@
package NumberCalculation; package Fractals.NumberCalculation;
import java.util.LinkedList; import java.util.LinkedList;

View file

@ -1,11 +1,11 @@
package PythagorasTree; package Fractals.PythagorasTree;
import ch.aplu.turtle.Turtle; import ch.aplu.turtle.Turtle;
import TurtleTools.TurtleState; import Fractals.TurtleTools.TurtleState;
import java.awt.*; import java.awt.*;
import static TurtleTools.DrawingTools.drawSquare; import static Fractals.TurtleTools.DrawingTools.drawSquare;
/** /**
* Created by Christian on 10.02.2015. * Created by Christian on 10.02.2015.

View file

@ -1,4 +1,4 @@
package PythagorasTree; package Fractals.PythagorasTree;
import ch.aplu.turtle.Turtle; import ch.aplu.turtle.Turtle;

View file

@ -1,4 +1,4 @@
package PythagorasTree; package Fractals.PythagorasTree;
/** /**
* Created by Christian on 11.02.2015. * Created by Christian on 11.02.2015.

View file

@ -1,9 +1,9 @@
package PythagorasTree; package Fractals.PythagorasTree;
import NumberCalculation.Fibonacci; import Fractals.NumberCalculation.Fibonacci;
/** /**
* Class PythagorasTree.PythagorasTriangle * Class Fractals.PythagorasTree.PythagorasTriangle
* @author Jan Christian Grünhage * @author Jan Christian Grünhage
*/ */
public class PythagorasTriangle { public class PythagorasTriangle {

View file

@ -1,7 +1,9 @@
package PythagorasTree; package Fractals.PythagorasTree;
import java.util.LinkedList; import java.util.LinkedList;
import Fractals.NumberCalculation.Fibonacci;
/** /**
* Created by Christian on 10.02.2015. * Created by Christian on 10.02.2015.
*/ */

View file

@ -1,4 +1,4 @@
package TurtleTools; package Fractals.TurtleTools;
import ch.aplu.turtle.Turtle; import ch.aplu.turtle.Turtle;

View file

@ -1,4 +1,4 @@
package TurtleTools; package Fractals.TurtleTools;
import ch.aplu.turtle.Turtle; import ch.aplu.turtle.Turtle;