https://github.com/crowlogic/arb4j/issues/253

crowlogic · Nov 28, 2024 · 21c893f · 21c893f
1 parent a8f6272
commit 21c893f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/src/main/java/arb/expressions/nodes/binary/DivisionNode.java b/src/main/java/arb/expressions/nodes/binary/DivisionNode.java
@@ -14,7 +14,7 @@
  *      {@link TheArb4jLibrary}
  */
 public class DivisionNode<D, R, F extends Function<? extends D, ? extends R>> extends
-                     BinaryOperationNode<D, R, F>
+                         BinaryOperationNode<D, R, F>
 {
 
   public DivisionNode(Expression<D, R, F> expression, Node<D, R, F> left, Node<D, R, F> right)
@@ -41,7 +41,7 @@ public boolean isCommutative()
   @Override
   public Node<D, R, F> integrate(VariableNode<D, R, F> variable)
   {
-   // return  new 
+    // return new
     assert false : "TODO: implement integration rule for division, left=" + left + " right=" + right;
     return null;
   }
@@ -51,9 +51,7 @@ public Node<D, R, F> integrate(VariableNode<D, R, F> variable)
          Node<E, S, G>
          spliceInto(Expression<E, S, G> newExpression)
   {
-    return new DivisionNode<E, S, G>(newExpression,
-                                 left.spliceInto(newExpression),
-                                 right.spliceInto(newExpression));
+    return left.spliceInto(newExpression).div(right.spliceInto(newExpression));
   }
 
   @Override

diff --git a/src/main/java/arb/expressions/nodes/binary/ExponentiationNode.java b/src/main/java/arb/expressions/nodes/binary/ExponentiationNode.java
@@ -58,9 +58,7 @@ public Node<D, R, F> integrate(VariableNode<D, R, F> variable)
          Node<E, S, G>
          spliceInto(Expression<E, S, G> newExpression)
   {
-    return new ExponentiationNode<E, S, G>(newExpression,
-                                           left.spliceInto(newExpression),
-                                           right.spliceInto(newExpression));
+    return left.spliceInto(newExpression).pow(right.spliceInto(newExpression));
   }
 
   @Override

diff --git a/src/main/java/arb/expressions/nodes/binary/MultiplicationNode.java b/src/main/java/arb/expressions/nodes/binary/MultiplicationNode.java
@@ -81,9 +81,7 @@ public Node<D, R, F> integrate(VariableNode<D, R, F> variable)
          Node<E, S, G>
          spliceInto(Expression<E, S, G> newExpression)
   {
-    return new MultiplicationNode<E, S, G>(newExpression,
-                                           left.spliceInto(newExpression),
-                                           right.spliceInto(newExpression));
+    return left.spliceInto(newExpression).mul(right.spliceInto(newExpression));
   }
 
   @Override

diff --git a/src/main/java/arb/expressions/nodes/binary/SubtractionNode.java b/src/main/java/arb/expressions/nodes/binary/SubtractionNode.java
@@ -77,9 +77,7 @@ public Node<D, R, F> integrate(VariableNode<D, R, F> variable)
          Node<E, S, G>
          spliceInto(Expression<E, S, G> newExpression)
   {
-    return new SubtractionNode<E, S, G>(newExpression,
-                                        left.spliceInto(newExpression),
-                                        right.spliceInto(newExpression));
+    return left.spliceInto(newExpression).sub(right.spliceInto(newExpression));
   }
 
   @Override