From f6ace090ff989d82a0e87aad840386ed078610e9 Mon Sep 17 00:00:00 2001 From: raul Date: Mon, 27 Nov 2017 11:10:11 -0500 Subject: [PATCH 1/4] raul --- src/main/java/io/zipcoder/Problem2.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/io/zipcoder/Problem2.java b/src/main/java/io/zipcoder/Problem2.java index e0af6a0..eb1cfdc 100644 --- a/src/main/java/io/zipcoder/Problem2.java +++ b/src/main/java/io/zipcoder/Problem2.java @@ -1,4 +1,23 @@ package io.zipcoder; public class Problem2 { + + public static void main(String args[]) { + fibonacciLoop(10); + } + + private static void fibonacciLoop(int number) { + + for (int i = 1; i <= number; i++) { + + System.out.print(fibonacci(i) + " "); + } + } + + private static int fibonacci(int number) { + if (number == 1 || number == 2) { + return 1; + } + return fibonacci(number - 1) + fibonacci(number - 2); + } } From 0e594e69ea0fd8d2adeaacbd855d2b3d5c84f522 Mon Sep 17 00:00:00 2001 From: raul Date: Mon, 27 Nov 2017 11:33:48 -0500 Subject: [PATCH 2/4] raul --- src/main/java/io/zipcoder/Problem2.java | 10 ++++--- src/test/java/io/zipcoder/Problem2Test.java | 29 +++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/zipcoder/Problem2.java b/src/main/java/io/zipcoder/Problem2.java index eb1cfdc..543a82a 100644 --- a/src/main/java/io/zipcoder/Problem2.java +++ b/src/main/java/io/zipcoder/Problem2.java @@ -3,10 +3,13 @@ public class Problem2 { public static void main(String args[]) { - fibonacciLoop(10); + + Problem2 problem2 = new Problem2(); + + problem2.fibonacciLoop(10); } - private static void fibonacciLoop(int number) { + public void fibonacciLoop(int number) { for (int i = 1; i <= number; i++) { @@ -14,10 +17,11 @@ private static void fibonacciLoop(int number) { } } - private static int fibonacci(int number) { + public int fibonacci(int number) { if (number == 1 || number == 2) { return 1; } return fibonacci(number - 1) + fibonacci(number - 2); + } } diff --git a/src/test/java/io/zipcoder/Problem2Test.java b/src/test/java/io/zipcoder/Problem2Test.java index fa9ffa5..2e4ba58 100644 --- a/src/test/java/io/zipcoder/Problem2Test.java +++ b/src/test/java/io/zipcoder/Problem2Test.java @@ -1,4 +1,33 @@ package io.zipcoder; +import org.junit.Assert; +import org.junit.Test; + public class Problem2Test { + + Problem2 problem2 = new Problem2(); + @Test + public void fiboonacciTest(){ + + problem2.fibonacci(3); + + + int expected = 2; + Assert.assertEquals(expected, problem2.fibonacci(3)); + + } + + @Test + public void fiboonacciLoopTest(){ + + problem2.fibonacciLoop(3); + int expected = 2; + Assert.assertEquals(expected, problem2.fibonacci(3)); + + } + + + + + } From e21f11ce34996dea148d29602a5a86269871c40a Mon Sep 17 00:00:00 2001 From: raul Date: Mon, 27 Nov 2017 14:01:43 -0500 Subject: [PATCH 3/4] raul --- src/main/java/io/zipcoder/Problem2.java | 12 +++++++++--- src/test/java/io/zipcoder/Problem2Test.java | 6 ------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/io/zipcoder/Problem2.java b/src/main/java/io/zipcoder/Problem2.java index 543a82a..853e8a0 100644 --- a/src/main/java/io/zipcoder/Problem2.java +++ b/src/main/java/io/zipcoder/Problem2.java @@ -6,10 +6,12 @@ public static void main(String args[]) { Problem2 problem2 = new Problem2(); - problem2.fibonacciLoop(10); + problem2.fibonacciLoop(10); + + } - public void fibonacciLoop(int number) { + public void fibonacciLoop(int number) { for (int i = 1; i <= number; i++) { @@ -17,11 +19,15 @@ public void fibonacciLoop(int number) { } } - public int fibonacci(int number) { + public int fibonacci(int number) { if (number == 1 || number == 2) { return 1; } return fibonacci(number - 1) + fibonacci(number - 2); } + } + + + diff --git a/src/test/java/io/zipcoder/Problem2Test.java b/src/test/java/io/zipcoder/Problem2Test.java index 2e4ba58..df1a893 100644 --- a/src/test/java/io/zipcoder/Problem2Test.java +++ b/src/test/java/io/zipcoder/Problem2Test.java @@ -8,18 +8,12 @@ public class Problem2Test { Problem2 problem2 = new Problem2(); @Test public void fiboonacciTest(){ - problem2.fibonacci(3); - - int expected = 2; Assert.assertEquals(expected, problem2.fibonacci(3)); - } - @Test public void fiboonacciLoopTest(){ - problem2.fibonacciLoop(3); int expected = 2; Assert.assertEquals(expected, problem2.fibonacci(3)); From 7294dca3e519e996fa8a1457ac4afb71c62da390 Mon Sep 17 00:00:00 2001 From: raul Date: Tue, 28 Nov 2017 17:20:33 -0500 Subject: [PATCH 4/4] raul --- src/main/java/io/zipcoder/Problem2.java | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/zipcoder/Problem2.java b/src/main/java/io/zipcoder/Problem2.java index 853e8a0..6b4b7e3 100644 --- a/src/main/java/io/zipcoder/Problem2.java +++ b/src/main/java/io/zipcoder/Problem2.java @@ -6,14 +6,15 @@ public static void main(String args[]) { Problem2 problem2 = new Problem2(); - problem2.fibonacciLoop(10); - + problem2.fibonacciLoop(10); // recursion + System.out.println(); + problem2.fiboWithLoops(10); // for loop } public void fibonacciLoop(int number) { - for (int i = 1; i <= number; i++) { + for (int i = 2; i <= number; i++) { System.out.print(fibonacci(i) + " "); } @@ -27,6 +28,20 @@ public int fibonacci(int number) { } + public void fiboWithLoops(int a){ + int result = 0 ; + int previousNum = 0; + int nextNum = 1; + + for (int i = 0;i