From 958326a273dab3646c98b168297a041299cb98e8 Mon Sep 17 00:00:00 2001
From: gpatelos <greg.patselas@gmail.com>
Date: Mon, 27 Nov 2017 11:22:33 -0500
Subject: [PATCH] hi

---
 src/main/java/io/zipcoder/Problem2.java     | 29 +++++++++++++++++++++
 src/test/java/io/zipcoder/Problem2Test.java | 28 ++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/src/main/java/io/zipcoder/Problem2.java b/src/main/java/io/zipcoder/Problem2.java
index e0af6a0..5a83f50 100644
--- a/src/main/java/io/zipcoder/Problem2.java
+++ b/src/main/java/io/zipcoder/Problem2.java
@@ -1,4 +1,33 @@
 package io.zipcoder;
 
 public class Problem2 {
+
+    public String fibonnaciToN(Integer n) {
+
+        String output = "0, 1, ";
+        int x = 0, y = 1, z = 1;
+        for (int i = 0; z < n-1; i++) {
+            x = y;
+            y = z;
+            output += z +", ";
+            z = x + y;
+
+
+        }
+        return output.substring(0, output.length()-2);
+        }
+
+
+    public String fibonnaciToNRecursive(Integer n) {
+
+        Integer i = 1;
+
+        while(i<n) {
+            fibonnaciToNRecursive(i + 1);
+
+        }
+
+        return i;
+    }
 }
+
diff --git a/src/test/java/io/zipcoder/Problem2Test.java b/src/test/java/io/zipcoder/Problem2Test.java
index fa9ffa5..9578820 100644
--- a/src/test/java/io/zipcoder/Problem2Test.java
+++ b/src/test/java/io/zipcoder/Problem2Test.java
@@ -1,4 +1,32 @@
 package io.zipcoder;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 public class Problem2Test {
+
+    @Test
+    public void testFibonacciIterative(){
+
+        Problem2 problem2 = new Problem2();
+
+        Integer n = 150;
+        String expected = "0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144";
+        String actual = problem2.fibonnaciToN(150);
+
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void testFibonacciRecursive(){
+
+        Problem2 problem2 = new Problem2();
+
+        Integer n = 150;
+        String expected = "0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144";
+        String actual = problem2.fibonnaciToNRecursive(150);
+
+        Assert.assertEquals(expected,actual);
+    }
 }