trunk preprocessor:
* fixed bug with normcdf() when converting to static model * fixed description of derivative computation git-svn-id: https://www.dynare.org/svn/dynare/trunk@2655 ac1d8469-bf42-47a9-8791-bf33cf982152time-shift
parent
44c864f9f7
commit
077e61e2c2
|
@ -1583,8 +1583,8 @@ TrinaryOpNode::computeDerivative(int deriv_id)
|
||||||
//intermediary sum
|
//intermediary sum
|
||||||
t11 = datatree.AddMinus(t14,t12);
|
t11 = datatree.AddMinus(t14,t12);
|
||||||
// total derivative:
|
// total derivative:
|
||||||
// (darg1/sigma - darg2/sigma - darg3*(x-mu)/sigma)* t13
|
// (darg1/sigma - darg2/sigma - darg3*(x-mu)/sigma^2) * t15
|
||||||
// where t13 is the derivative of a standardized normal
|
// where t15 is the derivative of a standardized normal
|
||||||
return datatree.AddTimes(t11, t15);
|
return datatree.AddTimes(t11, t15);
|
||||||
}
|
}
|
||||||
// Suppress GCC warning
|
// Suppress GCC warning
|
||||||
|
@ -1801,7 +1801,7 @@ TrinaryOpNode::toStatic(DataTree &static_datatree) const
|
||||||
{
|
{
|
||||||
NodeID sarg1 = arg1->toStatic(static_datatree);
|
NodeID sarg1 = arg1->toStatic(static_datatree);
|
||||||
NodeID sarg2 = arg2->toStatic(static_datatree);
|
NodeID sarg2 = arg2->toStatic(static_datatree);
|
||||||
NodeID sarg3 = arg2->toStatic(static_datatree);
|
NodeID sarg3 = arg3->toStatic(static_datatree);
|
||||||
switch(op_code)
|
switch(op_code)
|
||||||
{
|
{
|
||||||
case oNormcdf:
|
case oNormcdf:
|
||||||
|
|
Loading…
Reference in New Issue