seckcoder
diff --git a/‎.idea/.name
Lines changed: 1 addition & 1 deletion b/‎.idea/.name
Lines changed: 1 addition & 1 deletion
diff --git a/‎.idea/modules.xml
Lines changed: 1 addition & 1 deletion b/‎.idea/modules.xml
Lines changed: 1 addition & 1 deletion
diff --git a/‎demo/build.gradle
Lines changed: 2 additions & 1 deletion b/‎demo/build.gradle
Lines changed: 2 additions & 1 deletion
diff --git a/‎demo/src/main/java/fj/demo/euler/Problem1.java
Lines changed: 17 additions & 5 deletions b/‎demo/src/main/java/fj/demo/euler/Problem1.java
Lines changed: 17 additions & 5 deletions
diff --git a/‎demo/src/main/java/fj/demo/euler/Problem2.java
Lines changed: 22 additions & 8 deletions b/‎demo/src/main/java/fj/demo/euler/Problem2.java
Lines changed: 22 additions & 8 deletions
diff --git a/‎functionaljava8.iml renamed to ‎functionaljava.iml b/‎functionaljava8.iml renamed to ‎functionaljava.iml
@@ -14,7 +14,8 @@ apply plugin: 'application'
 
 defaultTasks 'build'
 
-mainClassName = "fj.demo.Array_forall"
+//mainClassName = "fj.demo.Array_forall"
+mainClassName = "fj.demo.euler.Problem2"
 //mainClassName = "fj.demo.Primes2"
 
 ext {
 
@@ -1,6 +1,8 @@
 package fj.demo.euler;
 
 import fj.F;
+import fj.data.Stream;
+
 import static fj.data.List.range;
 import static fj.function.Integers.sum;
 
@@ -10,9 +12,19 @@
  * Add all the natural numbers below one thousand that are multiples of 3 or 5.
  */
 public class Problem1 {
-  public static void main(final String[] args) {
-    out.println(sum(range(0, 1000).filter(new F<Integer, Boolean>() {
-      public Boolean f(final Integer a) { return a % 3 == 0 || a % 5 == 0;}
-    })));
-  }
+	public static void main(final String[] args) {
+		java7();
+		java8();
+	}
+
+	public static void java7() {
+		out.println(sum(range(0, 1000).filter(new F<Integer, Boolean>() {
+			public Boolean f(final Integer a) { return a % 3 == 0 || a % 5 == 0;}
+		})));
+	}
+
+	public static void java8() {
+		out.println(Stream.range(0, 1000).filter(i -> i % 3 == 0 || i % 5 == 0).foldLeft((acc, i) -> acc + i, 0));
+	}
+
 }
@@ -13,12 +13,26 @@
  * Find the sum of all the even-valued terms in the Fibonacci sequence which do not exceed four million.
  */
 public class Problem2 {
-  public static void main(final String[] args) {
-    final Stream<Integer> fibs = new F2<Integer, Integer, Stream<Integer>>() {
-      public Stream<Integer> f(final Integer a, final Integer b) {
-        return cons(a, curry().f(b).lazy().f(a + b));
-      }
-    }.f(1, 2);
-    out.println(sum(fibs.filter(even).takeWhile(intOrd.isLessThan(4000001)).toList()));
-  }
+	public static void main(final String[] args) {
+		java7();
+		java8();
+	}
+
+	static void java7() {
+		final Stream<Integer> fibs = new F2<Integer, Integer, Stream<Integer>>() {
+			public Stream<Integer> f(final Integer a, final Integer b) {
+				return cons(a, curry().f(b).lazy().f(a + b));
+			}
+		}.f(1, 2);
+		out.println(sum(fibs.filter(even).takeWhile(intOrd.isLessThan(4000001)).toList()));
+	}
+
+	static F2<Integer, Integer, Stream<Integer>> fibsJava8 = (a, b) -> {
+		return cons(a, fibsJava8.curry().f(b).lazy().f(a + b));
+	};
+
+	static void java8() {
+		out.println(sum(fibsJava8.f(1, 2).filter(even).takeWhile(intOrd.isLessThan(4000001)).toList()));
+	}
+
 }