X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FrTrait.c;h=2e7371f850f808ec54abcfef8479f2d0629b3778;hb=2419de65ffb4f7c45eb8c2448bcba3d0df64744f;hp=6441e161b9c07413bb97e2cb4cdba48edce20788;hpb=24fc6c03893f85a3f9ab3d088201b3731f3035b4;p=ape.git diff --git a/src/rTrait.c b/src/rTrait.c index 6441e16..2e7371f 100644 --- a/src/rTrait.c +++ b/src/rTrait.c @@ -1,4 +1,4 @@ -/* rTrait.c 2010-01-11 */ +/* rTrait.c 2010-05-26 */ /* Copyright 2010 Emmanuel Paradis */ @@ -16,13 +16,13 @@ void rTraitCont(int *model, int *Nedge, int *edge1, int *edge2, double *el, switch(*model) { case 1 : for (i = *Nedge - 1; i >= 0; i--) { GetRNGstate(); - x[edge2[i]] = x[edge1[i]] + el[i] * sigma[i] * norm_rand(); + x[edge2[i]] = x[edge1[i]] + sqrt(el[i]) * sigma[i] * norm_rand(); PutRNGstate(); } break; case 2 : for (i = *Nedge - 1; i >= 0; i--) { GetRNGstate(); - x[edge2[i]] = x[edge1[i]] + (sigma[i]*norm_rand() - alpha[i]*(x[edge1[i]] - theta[i])) * el[i]; + x[edge2[i]] = x[edge1[i]] + (sigma[i]*norm_rand() - alpha[i]*(x[edge1[i]] - theta[i])) * el[i]; /* need sqrt(el[i]) ? */ PutRNGstate(); } break;