From 9fa93935c4aa962d3327087fe6a00e01ab0af84b Mon Sep 17 00:00:00 2001 From: Rik Boss Date: Fri, 17 Feb 2017 10:42:06 +0000 Subject: [PATCH 1/3] de beste prime toegevoegd --- src/main/java/oet/wouter/primes/Primes.java | 3 +++ 1 file changed, 3 insertions(+) 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}; } + } From 2186b84c028d1e46ad29addb5c859316ac6ab166 Mon Sep 17 00:00:00 2001 From: Rik Boss Date: Fri, 17 Feb 2017 11:01:30 +0000 Subject: [PATCH 2/3] fixed absolute file path and minor budfixes, oh, and a bit of boyscout rule --- src/main/java/oet/wouter/primes/Main.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/oet/wouter/primes/Main.java b/src/main/java/oet/wouter/primes/Main.java index 8a6f0fb..e2ff3e1 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) { @@ -69,11 +73,11 @@ private static void print(double x, double y, String comment, int prime, StringB } private static void appendHeader(StringBuilder builder) { + String s = " "; builder.append(""); + .append(DIMENSION).append(s).append("\"xmlns=\"http://www.w3.org/2000/svg\" style=\"background-color: black\">"); } private static void appenFooter(StringBuilder builder) { From 8e9973ac8626f81a8136937d3eebf85c322aacb9 Mon Sep 17 00:00:00 2001 From: Rik Boss Date: Fri, 17 Feb 2017 11:16:25 +0000 Subject: [PATCH 3/3] oooooppppsss, een spatie verkeerd! --- src/main/java/oet/wouter/primes/Main.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/oet/wouter/primes/Main.java b/src/main/java/oet/wouter/primes/Main.java index e2ff3e1..6ac8993 100644 --- a/src/main/java/oet/wouter/primes/Main.java +++ b/src/main/java/oet/wouter/primes/Main.java @@ -73,11 +73,10 @@ private static void print(double x, double y, String comment, int prime, StringB } private static void appendHeader(StringBuilder builder) { - String s = " "; builder.append(""); + .append(DIMENSION).append("\" xmlns=\"http://www.w3.org/2000/svg\" style=\"background-color: black\">"); } private static void appenFooter(StringBuilder builder) {