Fixes after AC review for chapter 12

pysaumont · pysaumont · commit 49a8af1464ae · 2016-03-06T11:43:48.000+01:00
diff --git a/fpinjava-parent/fpinjava-state-exercises/src/main/java/com/fpinjava/state/exercise12_06/Random.java b/fpinjava-parent/fpinjava-state-exercises/src/main/java/com/fpinjava/state/exercise12_06/Random.java
@@ -38,5 +38,5 @@ static <A> Random<List<A>> sequence(List<Random<A>> rs) {
 
   Random<Tuple<Integer, Integer>> intPairRnd = map2(intRnd, intRnd, x -> y -> new Tuple<>(x, y));
 
-  Function<Integer, Random<List<Integer>>> integersRnd = length -> sequence(List.fill(length, () -> intRnd));
+  Function<Integer, Random<List<Integer>>> integersRnd = null; // to be implemented
 }
diff --git a/fpinjava-parent/fpinjava-state-exercises/src/main/java/com/fpinjava/state/exercise12_08/Random.java b/fpinjava-parent/fpinjava-state-exercises/src/main/java/com/fpinjava/state/exercise12_08/Random.java
@@ -47,7 +47,7 @@ static <A, B> Random<B> flatMap(Random<A> s, Function<A, Random<B>> f) {
   Random<Integer> notMultipleOfFiveRnd = Random.flatMap(intRnd, x -> {
       int mod = x % 5;
       return mod != 0
-          ? unit(mod)
+          ? unit(x)
           : Random.notMultipleOfFiveRnd;
   });
 }
diff --git a/fpinjava-parent/fpinjava-state-exercises/src/main/java/com/fpinjava/state/exercise12_09/Random.java b/fpinjava-parent/fpinjava-state-exercises/src/main/java/com/fpinjava/state/exercise12_09/Random.java
@@ -18,7 +18,7 @@ public Random(Function<RNG, Tuple<A, RNG>> run) {
   public static State<RNG, Integer> notMultipleOfFiveRnd = intRnd.flatMap(x -> {
     int mod = x % 5;
     return mod != 0
-        ? unit(mod)
+        ? unit(x)
         : Random.notMultipleOfFiveRnd;
   });
 
diff --git a/fpinjava-parent/fpinjava-state-solutions/src/main/java/com/fpinjava/state/exercise12_07/Random.java b/fpinjava-parent/fpinjava-state-solutions/src/main/java/com/fpinjava/state/exercise12_07/Random.java
@@ -54,7 +54,7 @@ static <A, B> Random<B> flatMap(Random<A> s, Function<A, Random<B>> f) {
   Random<Integer> notMultipleOfFiveRnd = Random.flatMap(intRnd, x -> {
       int mod = x % 5;
       return mod != 0
-          ? unit(mod)
+          ? unit(x)
           : Random.notMultipleOfFiveRnd;
   });
 }
diff --git a/fpinjava-parent/fpinjava-state-solutions/src/main/java/com/fpinjava/state/exercise12_08/Random.java b/fpinjava-parent/fpinjava-state-solutions/src/main/java/com/fpinjava/state/exercise12_08/Random.java
@@ -47,7 +47,7 @@ static <A, B> Random<B> flatMap(Random<A> s, Function<A, Random<B>> f) {
   Random<Integer> notMultipleOfFiveRnd = Random.flatMap(intRnd, x -> {
       int mod = x % 5;
       return mod != 0
-          ? unit(mod)
+          ? unit(x)
           : Random.notMultipleOfFiveRnd;
   });
 }
diff --git a/fpinjava-parent/fpinjava-state-solutions/src/main/java/com/fpinjava/state/exercise12_09/Random.java b/fpinjava-parent/fpinjava-state-solutions/src/main/java/com/fpinjava/state/exercise12_09/Random.java
@@ -18,7 +18,7 @@ public Random(Function<RNG, Tuple<A, RNG>> run) {
   public static State<RNG, Integer> notMultipleOfFiveRnd = intRnd.flatMap(x -> {
     int mod = x % 5;
     return mod != 0
-        ? unit(mod)
+        ? unit(x)
         : Random.notMultipleOfFiveRnd;
   });
 

Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,5 @@ static <A> Random<List<A>> sequence(List<Random<A>> rs) {`
`38`	`38`
`39`	`39`	`Random<Tuple<Integer, Integer>> intPairRnd = map2(intRnd, intRnd, x -> y -> new Tuple<>(x, y));`
`40`	`40`
`41`		`- Function<Integer, Random<List<Integer>>> integersRnd = length -> sequence(List.fill(length, () -> intRnd));`
	`41`	`+ Function<Integer, Random<List<Integer>>> integersRnd = null; // to be implemented`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ static <A, B> Random<B> flatMap(Random<A> s, Function<A, Random<B>> f) {`
`47`	`47`	`Random<Integer> notMultipleOfFiveRnd = Random.flatMap(intRnd, x -> {`
`48`	`48`	`int mod = x % 5;`
`49`	`49`	`return mod != 0`
`50`		`- ? unit(mod)`
	`50`	`+ ? unit(x)`
`51`	`51`	`: Random.notMultipleOfFiveRnd;`
`52`	`52`	`});`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ static <A, B> Random<B> flatMap(Random<A> s, Function<A, Random<B>> f) {`
`54`	`54`	`Random<Integer> notMultipleOfFiveRnd = Random.flatMap(intRnd, x -> {`
`55`	`55`	`int mod = x % 5;`
`56`	`56`	`return mod != 0`
`57`		`- ? unit(mod)`
	`57`	`+ ? unit(x)`
`58`	`58`	`: Random.notMultipleOfFiveRnd;`
`59`	`59`	`});`
`60`	`60`	`}`