From f23e9e5da58d1d19913703e11f7ff96a7adff96b Mon Sep 17 00:00:00 2001 From: Ben Green Date: Sun, 13 Sep 2015 23:52:40 -0400 Subject: updated prediction code for new model and data format --- R Scripts/temporal.R | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'R Scripts/temporal.R') diff --git a/R Scripts/temporal.R b/R Scripts/temporal.R index 13194a4..3502b45 100755 --- a/R Scripts/temporal.R +++ b/R Scripts/temporal.R @@ -1,9 +1,8 @@ -temporal = function(tu,tv,alpha){ - dt = tv - tu - 1 +temporal = function(tu,tv,beta){ + dt = tv - tu if (sum(dt<0)==0) { - return (alpha*exp(-alpha*dt)) -# return ((0.01/alpha)*(1+dt/alpha)^(-1.01)) + return (beta*exp(-beta*dt)) } else { return (NA) } -- cgit v1.2.3-70-g09d2