resources, more recursion

okaram · okaram · commit f1aa5d366aa7 · 2016-01-28T08:12:57.000-05:00
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ This module is actually for two calendar weeks, as there's no class on Monday Ja
     
 ## [Module 2](Spring2016/Week2.md) - Full programs and setup
 
+## Module 3 - Conditionals and Recursion
 
-
-## Other Resoources
+## Other Resources
 * [Resources](content/Resources.md)
diff --git a/Samples/src/main/java/okaram/samples/RecursionSamples.java b/Samples/src/main/java/okaram/samples/RecursionSamples.java
@@ -1,7 +1,35 @@
 package okaram.samples;
 
 public class RecursionSamples {
-
+	
+	public static String stringTimes(String base, int times) {
+		if(times<=0)
+			return "";
+		else
+			return base + stringTimes(base, times-1);
+	}
+	
+	public static String stringTimesAccum(String base, int times, String Accum) {
+		if(times<=0)
+			return Accum;
+		else
+			return stringTimesAccum(base, times-1, base+Accum);
+	}
+	
+	public int pow(int base, int exponent) {
+		if(exponent<=0)
+			return 1;
+		else
+			return base*pow(base,exponent-1);
+	}
+	
+	public int factorial(int n) {
+		if(n<=0)
+			return 1;
+		else
+			return n*factorial(n-1);
+	}
+	
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub
 
diff --git a/Samples/src/test/java/okaram/samples/TestRecursionSamples.java b/Samples/src/test/java/okaram/samples/TestRecursionSamples.java
@@ -0,0 +1,19 @@
+package okaram.samples;
+
+import org.junit.Test;
+import org.junit.Assert;
+import static org.junit.Assert.*;
+
+public class TestRecursionSamples {
+	@Test
+	public void testStringTimes(){
+		assertEquals("abababab", RecursionSamples.stringTimes("ab", 4));
+		assertEquals("aaa", RecursionSamples.stringTimes("a", 3));
+	}
+	
+	@Test
+	public void testStringTimesAccum(){
+		assertEquals("abababab", RecursionSamples.stringTimesAccum("ab", 4,""));
+		assertEquals("aaa", RecursionSamples.stringTimesAccum("a", 3,""));
+	}
+}
diff --git a/content/Resources.md b/content/Resources.md
@@ -11,3 +11,8 @@ Java Learning Resources
 ## Sites
 * [CodingBat](http://codingbat.com)
 * [Java Repl](http://www.javarepl.com/console.html)
++ [/r/learnJava](https://www.reddit.com/r/learnjava), [/r/java](https://www.reddit.com/r/java), [/r/learnprogramming](https://www.reddit.com/r/learnprogramming) - reddit (message boards) for java-related topics
+
+## Online courses and MOOCs
++ [Java tutorial for Complete Beginners](https://www.udemy.com/java-tutorial/) - seems great, uses Eclipse too, follows roughly the same order
++ [U of Helsinki's MOOCs](http://mooc.fi/english.html) - Seem good, very different order 
