From c3d9d1538a5df5e3fabfd370259f9e9252589384 Mon Sep 17 00:00:00 2001 From: Zachary Date: Mon, 27 Nov 2017 11:19:06 -0500 Subject: [PATCH 1/3] Prob2 --- src/main/java/io/zipcoder/Problem2.java | 27 +++++++++++++++++++++ src/test/java/io/zipcoder/Problem2Test.java | 16 ++++++++++++ 2 files changed, 43 insertions(+) diff --git a/src/main/java/io/zipcoder/Problem2.java b/src/main/java/io/zipcoder/Problem2.java index e0af6a0..7ca4254 100644 --- a/src/main/java/io/zipcoder/Problem2.java +++ b/src/main/java/io/zipcoder/Problem2.java @@ -1,4 +1,31 @@ package io.zipcoder; public class Problem2 { + + public String fibonacciIteration(int n) { + StringBuilder builder = new StringBuilder(); + + + if (n <= 1) { + builder.append(n); + } + int current = 1; + int prev = 1; + + + for (int i = 2; i < n; i++) { + int temp = current; + builder.append(prev); + current = prev; + prev = temp; + + builder.append(", "); + + //doesnt work, just adds a bunch of 1's + } + + return builder.toString(); + } + + } diff --git a/src/test/java/io/zipcoder/Problem2Test.java b/src/test/java/io/zipcoder/Problem2Test.java index fa9ffa5..d45c0b0 100644 --- a/src/test/java/io/zipcoder/Problem2Test.java +++ b/src/test/java/io/zipcoder/Problem2Test.java @@ -1,4 +1,20 @@ package io.zipcoder; +import org.junit.Assert; +import org.junit.Test; + public class Problem2Test { + Problem2 test = new Problem2(); + + @Test + public void fibonacciIterationTest(){ + String expected = "0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144"; + + String actual = test.fibonacciIteration(150); + //actual = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + + Assert.assertEquals(expected,actual); + } + + } From 20a2c15ae9ddf142c02d1c85f4611317192969c3 Mon Sep 17 00:00:00 2001 From: Zachary Date: Mon, 27 Nov 2017 12:02:31 -0500 Subject: [PATCH 2/3] Prob2 --- src/main/java/io/zipcoder/Problem2.java | 68 ++++++++++++++------- src/test/java/io/zipcoder/Problem2Test.java | 2 +- 2 files changed, 46 insertions(+), 24 deletions(-) diff --git a/src/main/java/io/zipcoder/Problem2.java b/src/main/java/io/zipcoder/Problem2.java index 7ca4254..8c4182a 100644 --- a/src/main/java/io/zipcoder/Problem2.java +++ b/src/main/java/io/zipcoder/Problem2.java @@ -1,31 +1,53 @@ package io.zipcoder; -public class Problem2 { - - public String fibonacciIteration(int n) { - StringBuilder builder = new StringBuilder(); - - - if (n <= 1) { - builder.append(n); - } - int current = 1; - int prev = 1; +import java.util.ArrayList; +public class Problem2 { - for (int i = 2; i < n; i++) { - int temp = current; - builder.append(prev); - current = prev; - prev = temp; - - builder.append(", "); - - //doesnt work, just adds a bunch of 1's - } +// public String fibonacciIteration(int n) { +// StringBuilder builder = new StringBuilder(); +// int current = 1; +// int prev = 1; +// +// if (n <= 1) { +// builder.append(n); +// } +// for (int i = 2; i < n; i++) { +// int temp = current; +// builder.append(prev); +// current = prev; +// prev = temp; +// +// builder.append(", "); +// +// //doesnt work, just adds a bunch of 1's +// } +// +// return builder.toString(); +// } +// + + public String fibon(int n) { + ArrayList arrayList = new ArrayList (); + arrayList.add(0); + arrayList.add(1); + + Integer lowerIndex = 0; + Integer higherIndex = 1; + Integer fib; + + do { + fib = arrayList.get(lowerIndex) + arrayList.get(higherIndex); + if (fib < n) { + break; + } + arrayList.add(fib); + lowerIndex++; + higherIndex++; + } while (true); + + return arrayList.toString(); - return builder.toString(); } - } diff --git a/src/test/java/io/zipcoder/Problem2Test.java b/src/test/java/io/zipcoder/Problem2Test.java index d45c0b0..2e8cd82 100644 --- a/src/test/java/io/zipcoder/Problem2Test.java +++ b/src/test/java/io/zipcoder/Problem2Test.java @@ -10,7 +10,7 @@ public class Problem2Test { public void fibonacciIterationTest(){ String expected = "0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144"; - String actual = test.fibonacciIteration(150); + String actual = test.fibon(150); //actual = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, Assert.assertEquals(expected,actual); From e077136c56c10f6b5a8aa5a996ccbcd4e45dca9f Mon Sep 17 00:00:00 2001 From: Zachary Date: Fri, 1 Dec 2017 07:40:12 -0500 Subject: [PATCH 3/3] prob 2 iterate --- src/main/java/io/zipcoder/Problem2.java | 31 +++------------------ src/test/java/io/zipcoder/Problem2Test.java | 1 - 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/src/main/java/io/zipcoder/Problem2.java b/src/main/java/io/zipcoder/Problem2.java index 8c4182a..5bbf306 100644 --- a/src/main/java/io/zipcoder/Problem2.java +++ b/src/main/java/io/zipcoder/Problem2.java @@ -4,29 +4,6 @@ public class Problem2 { -// public String fibonacciIteration(int n) { -// StringBuilder builder = new StringBuilder(); -// int current = 1; -// int prev = 1; -// -// if (n <= 1) { -// builder.append(n); -// } -// for (int i = 2; i < n; i++) { -// int temp = current; -// builder.append(prev); -// current = prev; -// prev = temp; -// -// builder.append(", "); -// -// //doesnt work, just adds a bunch of 1's -// } -// -// return builder.toString(); -// } -// - public String fibon(int n) { ArrayList arrayList = new ArrayList (); arrayList.add(0); @@ -34,14 +11,14 @@ public String fibon(int n) { Integer lowerIndex = 0; Integer higherIndex = 1; - Integer fib; + Integer nextInt; do { - fib = arrayList.get(lowerIndex) + arrayList.get(higherIndex); - if (fib < n) { + nextInt = arrayList.get(lowerIndex) + arrayList.get(higherIndex); + if (nextInt > n) { break; } - arrayList.add(fib); + arrayList.add(nextInt); lowerIndex++; higherIndex++; } while (true); diff --git a/src/test/java/io/zipcoder/Problem2Test.java b/src/test/java/io/zipcoder/Problem2Test.java index 2e8cd82..b5c7de6 100644 --- a/src/test/java/io/zipcoder/Problem2Test.java +++ b/src/test/java/io/zipcoder/Problem2Test.java @@ -11,7 +11,6 @@ public void fibonacciIterationTest(){ String expected = "0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144"; String actual = test.fibon(150); - //actual = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, Assert.assertEquals(expected,actual); }