Added hard memo. Default memo to soft

mperry · mperry · commit bef50e689299 · 2015-06-20T08:03:39.000+10:00
diff --git a/core/src/main/java/fj/P1.java b/core/src/main/java/fj/P1.java
@@ -209,12 +209,16 @@ public <X> P1<X> map(final F<A, X> f) {
         return P.lazy(() -> f.f(self._1()));
       }
 
+    public P1<A> memo() {
+        return softMemo();
+    }
+
     /**
      * Returns a P1 that remembers its value.
      *
      * @return A P1 that calls this P1 once and remembers the value for subsequent calls.
      */
-    public P1<A> memo() { return new Memo<>(this); }
+    public P1<A> hardMemo() { return new Memo<>(this); }
 
     /**
      * Like <code>memo</code>, but the memoized value is wrapped into a <code>WeakReference</code>
diff --git a/core/src/main/java/fj/data/Stream.java b/core/src/main/java/fj/data/Stream.java
@@ -1495,7 +1495,7 @@ private static final class Cons<A> extends Stream<A> {
 
     Cons(final A head, final P1<Stream<A>> tail) {
       this.head = head;
-      this.tail = tail.weakMemo();
+      this.tail = tail.memo();
     }
 
     public A head() {

Original file line number	Diff line number	Diff line change
`@@ -1495,7 +1495,7 @@ private static final class Cons<A> extends Stream<A> {`
`1495`	`1495`
`1496`	`1496`	`Cons(final A head, final P1<Stream<A>> tail) {`
`1497`	`1497`	`this.head = head;`
`1498`		`- this.tail = tail.weakMemo();`
	`1498`	`+ this.tail = tail.memo();`
`1499`	`1499`	`}`
`1500`	`1500`
`1501`	`1501`	`public A head() {`