cleanup: Move integrals to its own module
This commit is contained in:
parent
8ddd1a166a
commit
edce22050a
|
|
@ -57,14 +57,8 @@ module Combinatorics = {
|
|||
}
|
||||
}
|
||||
|
||||
module Internals = {
|
||||
// Probability functions
|
||||
|
||||
let castArrayOfFloatsToInternalArrayOfInternals = xs =>
|
||||
xs
|
||||
->Belt.Array.map(FunctionRegistry_Helpers.Wrappers.evNumber)
|
||||
->FunctionRegistry_Helpers.Wrappers.evArray
|
||||
|
||||
module Integration = {
|
||||
let Helpers = {
|
||||
let integrateFunctionBetweenWithNumIntegrationPoints = (
|
||||
aLambda,
|
||||
min: float,
|
||||
|
|
@ -158,6 +152,100 @@ module Internals = {
|
|||
}
|
||||
result
|
||||
}
|
||||
}
|
||||
module Lib = {
|
||||
// Integral in terms of function, min, max, num points
|
||||
// Note that execution time will be more predictable, because it
|
||||
// will only depend on num points and the complexity of the function
|
||||
let integrateFunctionBetweenWithNumIntegrationPoints = Function.make(
|
||||
~name="integrateFunctionBetweenWithNumIntegrationPoints",
|
||||
~nameSpace,
|
||||
~output=EvtNumber,
|
||||
~requiresNamespace=false,
|
||||
~examples=[`Danger.integrateFunctionBetweenWithNumIntegrationPoints({|x| x+1}, 1, 10, 10)`],
|
||||
// should be [x^2/2 + x]1_10 = (100/2 + 10) - (1/2 + 1) = 60 - 1.5 = 58.5
|
||||
// https://www.wolframalpha.com/input?i=integrate+x%2B1+from+1+to+10
|
||||
~definitions=[
|
||||
FnDefinition.make(
|
||||
~name="integrateFunctionBetweenWithNumIntegrationPoints",
|
||||
~inputs=[FRTypeLambda, FRTypeNumber, FRTypeNumber, FRTypeNumber],
|
||||
~run=(inputs, _, env, reducer) => {
|
||||
let result = switch inputs {
|
||||
| [_, _, _, IEvNumber(0.0)] =>
|
||||
Error("Integration error 4 in Danger.integrate: Increment can't be 0.")
|
||||
| [IEvLambda(aLambda), IEvNumber(min), IEvNumber(max), IEvNumber(numIntegrationPoints)] =>
|
||||
Helpers.integrateFunctionBetweenWithNumIntegrationPoints(
|
||||
aLambda,
|
||||
min,
|
||||
max,
|
||||
numIntegrationPoints,
|
||||
env,
|
||||
reducer,
|
||||
)
|
||||
| _ =>
|
||||
Error(
|
||||
"Integration error 5 in Danger.integrate. Remember that inputs are (function, number (min), number (max), number(increment))",
|
||||
)
|
||||
}
|
||||
result
|
||||
},
|
||||
(),
|
||||
),
|
||||
],
|
||||
(),
|
||||
)
|
||||
// Integral in terms of function, min, max, epsilon (distance between points)
|
||||
// Execution time will be less predictable, because it
|
||||
// will depend on min, max and epsilon together,
|
||||
// as well and the complexity of the function
|
||||
let integrateFunctionBetweenWithEpsilon = Function.make(
|
||||
~name="integrateFunctionBetweenWithEpsilon",
|
||||
~nameSpace,
|
||||
~output=EvtNumber,
|
||||
~requiresNamespace=false,
|
||||
~examples=[`Danger.integrateFunctionBetweenWithEpsilon({|x| x+1}, 1, 10, 0.1)`],
|
||||
~definitions=[
|
||||
FnDefinition.make(
|
||||
~name="integrateFunctionBetweenWithEpsilon",
|
||||
~inputs=[FRTypeLambda, FRTypeNumber, FRTypeNumber, FRTypeNumber],
|
||||
~run=(inputs, _, env, reducer) => {
|
||||
let result = switch inputs {
|
||||
| [_, _, _, IEvNumber(0.0)] =>
|
||||
Error("Integration error in Danger.integrate: Increment can't be 0.")
|
||||
| [IEvLambda(aLambda), IEvNumber(min), IEvNumber(max), IEvNumber(epsilon)] =>
|
||||
Helpers.integrateFunctionBetweenWithNumIntegrationPoints(
|
||||
aLambda,
|
||||
min,
|
||||
max,
|
||||
(max -. min) /. epsilon,
|
||||
env,
|
||||
reducer,
|
||||
)->E.R2.errMap(_ =>
|
||||
"Integration error 7 in Danger.integrate. Something went wrong along the way"
|
||||
)
|
||||
| _ =>
|
||||
Error(
|
||||
"Integration error 8 in Danger.integrate. Remember that inputs are (function, number (min), number (max), number(increment))",
|
||||
)
|
||||
}
|
||||
result
|
||||
},
|
||||
(),
|
||||
),
|
||||
],
|
||||
(),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
module Internals = {
|
||||
// Probability functions
|
||||
|
||||
let castArrayOfFloatsToInternalArrayOfInternals = xs =>
|
||||
xs
|
||||
->Belt.Array.map(FunctionRegistry_Helpers.Wrappers.evNumber)
|
||||
->FunctionRegistry_Helpers.Wrappers.evArray
|
||||
|
||||
|
||||
// Diminishing returns
|
||||
// Helpers
|
||||
|
|
@ -272,92 +360,13 @@ module Internals = {
|
|||
}
|
||||
|
||||
|
||||
|
||||
let library = [
|
||||
Combinatorics.Lib.laplace,
|
||||
Combinatorics.Lib.factorial,
|
||||
Combinatorics.Lib.choose,
|
||||
Combinatorics.Lib.binomial,
|
||||
// Integral in terms of function, min, max, num points
|
||||
// Note that execution time will be more predictable, because it
|
||||
// will only depend on num points and the complexity of the function
|
||||
Function.make(
|
||||
~name="integrateFunctionBetweenWithNumIntegrationPoints",
|
||||
~nameSpace,
|
||||
~output=EvtNumber,
|
||||
~requiresNamespace=false,
|
||||
~examples=[`Danger.integrateFunctionBetweenWithNumIntegrationPoints({|x| x+1}, 1, 10, 10)`],
|
||||
// should be [x^2/2 + x]1_10 = (100/2 + 10) - (1/2 + 1) = 60 - 1.5 = 58.5
|
||||
// https://www.wolframalpha.com/input?i=integrate+x%2B1+from+1+to+10
|
||||
~definitions=[
|
||||
FnDefinition.make(
|
||||
~name="integrateFunctionBetweenWithNumIntegrationPoints",
|
||||
~inputs=[FRTypeLambda, FRTypeNumber, FRTypeNumber, FRTypeNumber],
|
||||
~run=(inputs, _, env, reducer) => {
|
||||
let result = switch inputs {
|
||||
| [_, _, _, IEvNumber(0.0)] =>
|
||||
Error("Integration error 4 in Danger.integrate: Increment can't be 0.")
|
||||
| [IEvLambda(aLambda), IEvNumber(min), IEvNumber(max), IEvNumber(numIntegrationPoints)] =>
|
||||
Internals.integrateFunctionBetweenWithNumIntegrationPoints(
|
||||
aLambda,
|
||||
min,
|
||||
max,
|
||||
numIntegrationPoints,
|
||||
env,
|
||||
reducer,
|
||||
)
|
||||
| _ =>
|
||||
Error(
|
||||
"Integration error 5 in Danger.integrate. Remember that inputs are (function, number (min), number (max), number(increment))",
|
||||
)
|
||||
}
|
||||
result
|
||||
},
|
||||
(),
|
||||
),
|
||||
],
|
||||
(),
|
||||
),
|
||||
// Integral in terms of function, min, max, epsilon (distance between points)
|
||||
// Execution time will be less predictable, because it
|
||||
// will depend on min, max and epsilon together,
|
||||
// as well and the complexity of the function
|
||||
Function.make(
|
||||
~name="integrateFunctionBetweenWithEpsilon",
|
||||
~nameSpace,
|
||||
~output=EvtNumber,
|
||||
~requiresNamespace=false,
|
||||
~examples=[`Danger.integrateFunctionBetweenWithEpsilon({|x| x+1}, 1, 10, 0.1)`],
|
||||
~definitions=[
|
||||
FnDefinition.make(
|
||||
~name="integrateFunctionBetweenWithEpsilon",
|
||||
~inputs=[FRTypeLambda, FRTypeNumber, FRTypeNumber, FRTypeNumber],
|
||||
~run=(inputs, _, env, reducer) => {
|
||||
let result = switch inputs {
|
||||
| [_, _, _, IEvNumber(0.0)] =>
|
||||
Error("Integration error in Danger.integrate: Increment can't be 0.")
|
||||
| [IEvLambda(aLambda), IEvNumber(min), IEvNumber(max), IEvNumber(epsilon)] =>
|
||||
Internals.integrateFunctionBetweenWithNumIntegrationPoints(
|
||||
aLambda,
|
||||
min,
|
||||
max,
|
||||
(max -. min) /. epsilon,
|
||||
env,
|
||||
reducer,
|
||||
)->E.R2.errMap(_ =>
|
||||
"Integration error 7 in Danger.integrate. Something went wrong along the way"
|
||||
)
|
||||
| _ =>
|
||||
Error(
|
||||
"Integration error 8 in Danger.integrate. Remember that inputs are (function, number (min), number (max), number(increment))",
|
||||
)
|
||||
}
|
||||
result
|
||||
},
|
||||
(),
|
||||
),
|
||||
],
|
||||
(),
|
||||
),
|
||||
|
||||
// Diminishing marginal return functions
|
||||
// There are functions diminishingMarginalReturnsForFunctions2 through diminishingMarginalReturnsForFunctions7
|
||||
// Because of this bug: <https://github.com/quantified-uncertainty/squiggle/issues/1090>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user