Use weakMemo() explicitly.

jbgi · jbgi · commit 9394d8465215 · 2016-10-23T11:48:57.000+02:00
diff --git a/core/src/main/java/fj/P1.java b/core/src/main/java/fj/P1.java
@@ -262,11 +262,11 @@ public final P1<A> memo() {
     public P1<A> softMemo() { return new SoftReferenceMemo<>(this); }
 
     public static <A> P1<A> memo(F<Unit, A> f) {
-        return P.lazy(f).memo();
+        return P.lazy(f).weakMemo();
     }
 
 	public static <A> P1<A> memo(F0<A> f) {
-		return P.lazy(f).memo();
+		return P.lazy(f).weakMemo();
 	}
 
     static final class Memo<A> extends P1<A> {
diff --git a/core/src/test/java/fj/P1Test.java b/core/src/test/java/fj/P1Test.java
@@ -11,7 +11,7 @@ public final class P1Test {
 
   @Test
   public void bug105() throws Exception {
-    final P1<String> p1 = P.p("Foo").memo();
+    final P1<String> p1 = P.p("Foo").weakMemo();
     final AtomicInteger nullCounter = new AtomicInteger();
     ExecutorService executorService = Executors.newCachedThreadPool();
 
diff --git a/props-core/src/test/java/fj/MemoisationTest.java b/props-core/src/test/java/fj/MemoisationTest.java
@@ -19,7 +19,7 @@ public class MemoisationTest {
 
     public Property test1() {
         return property(arbInteger, a -> {
-            P1<Integer> t = P.lazy(() -> a).memo();
+            P1<Integer> t = P.lazy(() -> a).weakMemo();
             return prop(t._1().equals(t._1())).and(prop(t._1().equals(a)));
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -262,11 +262,11 @@ public final P1<A> memo() {`
`262`	`262`	`public P1<A> softMemo() { return new SoftReferenceMemo<>(this); }`
`263`	`263`
`264`	`264`	`public static <A> P1<A> memo(F<Unit, A> f) {`
`265`		`- return P.lazy(f).memo();`
	`265`	`+ return P.lazy(f).weakMemo();`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`public static <A> P1<A> memo(F0<A> f) {`
`269`		`- return P.lazy(f).memo();`
	`269`	`+ return P.lazy(f).weakMemo();`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`static final class Memo<A> extends P1<A> {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class MemoisationTest {`
`19`	`19`
`20`	`20`	`public Property test1() {`
`21`	`21`	`return property(arbInteger, a -> {`
`22`		`- P1<Integer> t = P.lazy(() -> a).memo();`
	`22`	`+ P1<Integer> t = P.lazy(() -> a).weakMemo();`
`23`	`23`	`return prop(t._1().equals(t._1())).and(prop(t._1().equals(a)));`
`24`	`24`	`});`
`25`	`25`	`}`