diff --git a/src/main/java/oet/wouter/primes/Main.java b/src/main/java/oet/wouter/primes/Main.java index 8a6f0fb..6ac8993 100644 --- a/src/main/java/oet/wouter/primes/Main.java +++ b/src/main/java/oet/wouter/primes/Main.java @@ -41,7 +41,7 @@ public static void main(String[] args) throws IOException { int value = prime - previousSquared; double angle = (0.0 + value)/range; - double radius = a * (current-1) + (angle * a); + double radius = getRadius(a, current, angle); double x = radius * Math.cos(angle * 2 * Math.PI); double y = radius * Math.sin(angle * 2 * Math.PI); @@ -50,7 +50,11 @@ public static void main(String[] args) throws IOException { appenFooter(buffer); String data = buffer.toString(); - Files.write(Paths.get("/home/wouter/primes.svg"), Collections.singleton(data)); + Files.write(Paths.get("src/main/resources/primes.svg"), Collections.singleton(data)); + } + + private static double getRadius(double a, int current, double angle) { + return a * (current-1) + (angle * a); } private static void print(double x, double y, String comment, int prime, StringBuilder buffer) { @@ -72,8 +76,7 @@ private static void appendHeader(StringBuilder builder) { builder.append(""); + .append(DIMENSION).append("\" xmlns=\"http://www.w3.org/2000/svg\" style=\"background-color: black\">"); } private static void appenFooter(StringBuilder builder) { diff --git a/src/main/java/oet/wouter/primes/Primes.java b/src/main/java/oet/wouter/primes/Primes.java index d4a91a0..eb54fc6 100644 --- a/src/main/java/oet/wouter/primes/Primes.java +++ b/src/main/java/oet/wouter/primes/Primes.java @@ -8,6 +8,8 @@ public class Primes { + private int theBestPrime = 2; + public static int[] get() { try { String primes = new String(Files.readAllBytes(Paths.get("src/main/resources/primes.txt"))); @@ -20,4 +22,5 @@ public static int[] get() { // return new int[]{2,3,5,6,7,8,10,11,12,13,14}; } + }