Tiny refactor to use Shape methods directly

This commit is contained in:
Ozzie Gooen 2020-07-17 11:29:18 +01:00
parent 9cdcc85d6c
commit b3ccabae73

View File

@ -27,24 +27,19 @@ let combineAlgebraically =
(op: ExpressionTypes.algebraicOperation, t1: t, t2: t): t => { (op: ExpressionTypes.algebraicOperation, t1: t, t2: t): t => {
switch (t1, t2) { switch (t1, t2) {
| (Continuous(m1), Continuous(m2)) => | (Continuous(m1), Continuous(m2)) =>
DistTypes.Continuous( Continuous.combineAlgebraically(op, m1, m2) |> Continuous.T.toShape;
Continuous.combineAlgebraically(op, m1, m2),
)
| (Continuous(m1), Discrete(m2)) | (Continuous(m1), Discrete(m2))
| (Discrete(m2), Continuous(m1)) => | (Discrete(m2), Continuous(m1)) =>
DistTypes.Continuous( Continuous.combineAlgebraicallyWithDiscrete(op, m1, m2) |> Continuous.T.toShape
Continuous.combineAlgebraicallyWithDiscrete(op, m1, m2),
)
| (Discrete(m1), Discrete(m2)) => | (Discrete(m1), Discrete(m2)) =>
DistTypes.Discrete(Discrete.combineAlgebraically(op, m1, m2)) Discrete.combineAlgebraically(op, m1, m2) |> Discrete.T.toShape
| (m1, m2) => | (m1, m2) =>
DistTypes.Mixed( Mixed.combineAlgebraically(
Mixed.combineAlgebraically( op,
op, toMixed(m1),
toMixed(m1), toMixed(m2),
toMixed(m2),
),
) )
|> Mixed.T.toShape
}; };
}; };