summaryrefslogtreecommitdiffstats
path: root/R Scripts/temporal.R
diff options
context:
space:
mode:
authorBen Green <bgreen@g.harvard.edu>2015-09-13 23:52:40 -0400
committerBen Green <bgreen@g.harvard.edu>2015-09-13 23:52:42 -0400
commitf23e9e5da58d1d19913703e11f7ff96a7adff96b (patch)
treeb9459b3670cdf125f8bdf0888288be3a0a1357a8 /R Scripts/temporal.R
parentfffb68b515a5cae198d8b756b562ddea6f2c814c (diff)
downloadcriminal_cascades-f23e9e5da58d1d19913703e11f7ff96a7adff96b.tar.gz
updated prediction code for new model and data format
Diffstat (limited to 'R Scripts/temporal.R')
-rwxr-xr-xR Scripts/temporal.R7
1 files changed, 3 insertions, 4 deletions
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)
}