From 19e9eaee83855d4daf7ed45d7beb71c7e0719813 Mon Sep 17 00:00:00 2001
From: Ozzie Gooen <ozzieagooen@gmail.com>
Date: Thu, 2 Jul 2020 14:33:41 +0100
Subject: [PATCH] Minor renaming

---
 src/distPlus/symbolic/TreeNode.re | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/distPlus/symbolic/TreeNode.re b/src/distPlus/symbolic/TreeNode.re
index ba15712e..b6f83801 100644
--- a/src/distPlus/symbolic/TreeNode.re
+++ b/src/distPlus/symbolic/TreeNode.re
@@ -123,7 +123,7 @@ module TreeNode = {
   };
 
   module VerticalScaling = {
-    let toLeaf = (operationToLeaf,scaleOp, t, scaleBy) => {
+    let toLeaf = (operationToLeaf, scaleOp, t, scaleBy) => {
       // scaleBy has to be a single float, otherwise we'll return an error.
       let fn = SymbolicTypes.Scale.toFn(scaleOp);
       let knownIntegralSumFn =
@@ -182,7 +182,7 @@ module TreeNode = {
       );
     };
 
-    let toLeaf = (operationToLeaf,pointwiseOp, t1, t2) => {
+    let toLeaf = (operationToLeaf, pointwiseOp, t1, t2) => {
       switch (pointwiseOp) {
       | `Add => pointwiseAdd(operationToLeaf, t1, t2)
       | `Multiply => pointwiseMultiply(operationToLeaf, t1, t2)
@@ -267,11 +267,11 @@ module TreeNode = {
   };
 
   module FloatFromDist = {
-    let evaluateFromSymbolic = (distToFloatOp: distToFloatOperation, s) => {
+    let symbolicToLeaf = (distToFloatOp: distToFloatOperation, s) => {
       SymbolicDist.T.operate(distToFloatOp, s)
       |> E.R.bind(_, v => Ok(`Leaf(`SymbolicDist(`Float(v)))));
     };
-    let evaluateFromRenderedDist =
+    let renderedToLeaf =
         (distToFloatOp: distToFloatOperation, rs: DistTypes.shape)
         : result(treeNode, string) => {
       Distributions.Shape.operate(distToFloatOp, rs)
@@ -285,13 +285,12 @@ module TreeNode = {
             )
             : result(treeNode, string) => {
       switch (t) {
-      | `Leaf(`SymbolicDist(s)) => evaluateFromSymbolic(distToFloatOp, s) // we want to evaluate the distToFloatOp on the symbolic dist
-      | `Leaf(`RenderedDist(rs)) =>
-        evaluateFromRenderedDist(distToFloatOp, rs)
+      | `Leaf(`SymbolicDist(s)) => symbolicToLeaf(distToFloatOp, s) // we want to evaluate the distToFloatOp on the symbolic dist
+      | `Leaf(`RenderedDist(rs)) => renderedToLeaf(distToFloatOp, rs)
       | `Operation(op) =>
         E.R.bind(
           operationToLeaf(op),
-          toLeaf(operationToLeaf,distToFloatOp),
+          toLeaf(operationToLeaf, distToFloatOp),
         )
       };
     };
@@ -310,10 +309,7 @@ module TreeNode = {
         Ok(`Leaf(`RenderedDist(SymbolicDist.T.toShape(sampleCount, d))))
       | `Leaf(`RenderedDist(_)) as t => Ok(t) // already a rendered shape, we're done here
       | `Operation(op) =>
-        E.R.bind(
-          operationToLeaf(op),
-          toLeaf(operationToLeaf, sampleCount),
-        )
+        E.R.bind(operationToLeaf(op), toLeaf(operationToLeaf, sampleCount))
       };
     };
   };
@@ -352,14 +348,10 @@ module TreeNode = {
         t,
       )
     | `FloatFromDist(distToFloatOp, t) =>
-      FloatFromDist.toLeaf(operationToLeaf(sampleCount),distToFloatOp, t)
+      FloatFromDist.toLeaf(operationToLeaf(sampleCount), distToFloatOp, t)
     | `Normalize(t) => Normalize.toLeaf(operationToLeaf(sampleCount), t)
     | `Render(t) =>
-      Render.toLeaf(
-        operationToLeaf(sampleCount),
-        sampleCount,
-        t,
-      )
+      Render.toLeaf(operationToLeaf(sampleCount), sampleCount, t)
     };
   };