added path to constructors

This commit is contained in:
Quinn Dougherty 2022-06-24 09:07:15 -04:00
parent 9dbd4f076c
commit e0e2f12e27

View File

@ -228,7 +228,7 @@ let dispatchToGenericOutput = (call: IEV.functionCall, env: DistributionOperatio
| ("klDivergence", [IEvDistribution(prediction), IEvDistribution(answer)]) => | ("klDivergence", [IEvDistribution(prediction), IEvDistribution(answer)]) =>
Some( Some(
DistributionOperation.run( DistributionOperation.run(
FromDist(ToScore(LogScore(Score_Dist(answer), None)), prediction), FromDist(ToScore(LogScore(DistributionTypes.Score_Dist(answer), None)), prediction),
~env, ~env,
), ),
) )
@ -238,7 +238,15 @@ let dispatchToGenericOutput = (call: IEV.functionCall, env: DistributionOperatio
) => ) =>
Some( Some(
DistributionOperation.run( DistributionOperation.run(
FromDist(ToScore(LogScore(Score_Dist(answer), Some(Score_Dist(prior)))), prediction), FromDist(
ToScore(
LogScore(
DistributionTypes.Score_Dist(answer),
Some(DistributionTypes.Score_Dist(prior)),
),
),
prediction,
),
~env, ~env,
), ),
) )
@ -255,7 +263,15 @@ let dispatchToGenericOutput = (call: IEV.functionCall, env: DistributionOperatio
], ],
) => ) =>
DistributionOperation.run( DistributionOperation.run(
FromDist(ToScore(LogScore(Score_Scalar(answer), Score_Dist(prior)->Some)), prediction), FromDist(
ToScore(
LogScore(
DistributionTypes.Score_Scalar(answer),
DistributionTypes.Score_Dist(prior)->Some,
),
),
prediction,
),
~env, ~env,
)->Some )->Some
| ("logScoreWithPointAnswer", [IEvDistribution(prediction), IEvNumber(answer)]) | ("logScoreWithPointAnswer", [IEvDistribution(prediction), IEvNumber(answer)])
@ -264,7 +280,7 @@ let dispatchToGenericOutput = (call: IEV.functionCall, env: DistributionOperatio
[IEvDistribution(prediction), IEvDistribution(Symbolic(#Float(answer)))], [IEvDistribution(prediction), IEvDistribution(Symbolic(#Float(answer)))],
) => ) =>
DistributionOperation.run( DistributionOperation.run(
FromDist(ToScore(LogScore(Score_Scalar(answer), None)), prediction), FromDist(ToScore(LogScore(DistributionTypes.Score_Scalar(answer), None)), prediction),
~env, ~env,
)->Some )->Some
| ("isNormalized", [IEvDistribution(dist)]) => Helpers.toBoolFn(IsNormalized, dist, ~env) | ("isNormalized", [IEvDistribution(dist)]) => Helpers.toBoolFn(IsNormalized, dist, ~env)