Merge pull request #128 from 7h3kk1d/foldright-semigroup-fix

FoldRight fixes for Monoid/Semigroup
palatable · May 1, 2023 · d360ae8 · d360ae8
2 parents 725d626 + c1d2193
commit d360ae8
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/src/main/java/com/jnape/palatable/lambda/monoid/Monoid.java b/src/main/java/com/jnape/palatable/lambda/monoid/Monoid.java
@@ -82,7 +82,7 @@ default A foldLeft(A a, Iterable<A> as) {
      */
     @Override
     default Lazy<A> foldRight(A a, Iterable<A> as) {
-        return lazy(() -> flip().foldMap(id(), reverse(cons(a, as))));
+        return lazy(() -> flip().foldMap(id(), cons(a, reverse(as))));
     }
 
     /**

diff --git a/src/main/java/com/jnape/palatable/lambda/semigroup/Semigroup.java b/src/main/java/com/jnape/palatable/lambda/semigroup/Semigroup.java
@@ -39,7 +39,7 @@ default A foldLeft(A a, Iterable<A> as) {
      * @see FoldRight
      */
     default Lazy<A> foldRight(A a, Iterable<A> as) {
-        return FoldRight.foldRight((y, lazyX) -> lazyX.fmap(x -> apply(x, y)), lazy(a), as);
+        return FoldRight.foldRight((y, lazyX) -> lazyX.fmap(x -> apply(y, x)), lazy(a), as);
     }
 
     /**

diff --git a/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn3/FoldRightTest.java b/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn3/FoldRightTest.java
@@ -29,7 +29,7 @@ public Fn1<Iterable<Object>, Iterable<Object>> createTestSubject() {
 
     @Test
     public void foldRightAccumulatesRightToLeft() {
-        assertThat(foldRight((a, lazyB) -> lazyB.fmap(b -> explainFold().apply(a, b)),
+        assertThat(foldRight((a, lazyAcc) -> lazyAcc.fmap(acc -> explainFold().apply(a, acc)),
                              lazy("5"),
                              asList("1", "2", "3", "4"))
                            .value(),

diff --git a/src/test/java/com/jnape/palatable/lambda/monoid/MonoidTest.java b/src/test/java/com/jnape/palatable/lambda/monoid/MonoidTest.java
@@ -1,6 +1,7 @@
 package com.jnape.palatable.lambda.monoid;
 
 import com.jnape.palatable.lambda.adt.Maybe;
+import com.jnape.palatable.lambda.functor.builtin.Lazy;
 import org.junit.Test;
 
 import java.util.List;
@@ -10,6 +11,7 @@
 import static com.jnape.palatable.lambda.monoid.Monoid.monoid;
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
+import static testsupport.functions.ExplainFold.explainFold;
 
 public class MonoidTest {
 
@@ -25,6 +27,13 @@ public void reduceRight() {
         assertEquals((Integer) 6, sum.reduceRight(asList(1, 2, 3)));
     }
 
+    @Test
+    public void foldRight() {
+        Lazy<String> lazyString = monoid(explainFold()::apply, "0")
+                .foldRight("4", asList("1", "2", "3"));
+        assertEquals("(1 + (2 + (3 + (4 + 0))))", lazyString.value());
+    }
+
     @Test
     public void foldMap() {
         Monoid<Integer>      sum       = monoid(Integer::sum, 0);

diff --git a/src/test/java/com/jnape/palatable/lambda/semigroup/SemigroupTest.java b/src/test/java/com/jnape/palatable/lambda/semigroup/SemigroupTest.java
@@ -4,18 +4,19 @@
 
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
+import static testsupport.functions.ExplainFold.explainFold;
 
 public class SemigroupTest {
 
     @Test
     public void foldLeft() {
-        Semigroup<Integer> sum = (x, y) -> x + y;
-        assertEquals((Integer) 6, sum.foldLeft(0, asList(1, 2, 3)));
+        Semigroup<String> foldFn = explainFold()::apply;
+        assertEquals("(((0 + 1) + 2) + 3)", foldFn.foldLeft("0", asList("1", "2", "3")));
     }
 
     @Test
     public void foldRight() {
-        Semigroup<Integer> sum = (x, y) -> x + y;
-        assertEquals((Integer) 6, sum.foldRight(0, asList(1, 2, 3)).value());
+        Semigroup<String> foldFn = explainFold()::apply;
+        assertEquals("(1 + (2 + (3 + 0)))", foldFn.foldRight("0", asList("1", "2", "3")).value());
     }
 }
diff --git a/src/test/java/testsupport/functions/ExplainFold.java b/src/test/java/testsupport/functions/ExplainFold.java
@@ -7,6 +7,6 @@
 public class ExplainFold {
 
     public static Fn2<String, String, String> explainFold() {
-        return (acc, x) -> format("(%s + %s)", acc, x);
+        return (x, y) -> format("(%s + %s)", x, y);
     }
 }