diff options
| author | Ben Green <ben@SEASITs-MacBook-Pro.local> | 2015-07-08 00:41:29 -0400 |
|---|---|---|
| committer | Ben Green <ben@SEASITs-MacBook-Pro.local> | 2015-07-08 00:41:32 -0400 |
| commit | 034c71328460d460deef74bf591c8d6cd28d5f93 (patch) | |
| tree | 242235bdbee29d84f8249b19f40a6f4efdc526e7 /experiments/ml2.pyx | |
| parent | b91ab29e267fb58b8ba161c1f77da5919b0e62d9 (diff) | |
| download | criminal_cascades-034c71328460d460deef74bf591c8d6cd28d5f93.tar.gz | |
updated temporal model for different time scales, ran some tests
Diffstat (limited to 'experiments/ml2.pyx')
| -rw-r--r-- | experiments/ml2.pyx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/experiments/ml2.pyx b/experiments/ml2.pyx index dd0e7a8..1458683 100644 --- a/experiments/ml2.pyx +++ b/experiments/ml2.pyx @@ -15,7 +15,6 @@ cdef DTYPE_t weight_success(int dist, int dt, DTYPE_t alpha, DTYPE_t delta, DTYP temporal = log(exp(alpha)-1.) - alpha*dt # temporal = 1. / (1. + (dt - 1.)/alpha)**0.01 - 1. / (1. + dt/alpha)**0.01 result = log(structural) + temporal - # print 'st', structural, temporal return result cdef DTYPE_t weight_failure(int dist, int dt, DTYPE_t alpha, DTYPE_t delta, DTYPE_t lmbda, @@ -27,7 +26,6 @@ cdef DTYPE_t weight_failure(int dist, int dt, DTYPE_t alpha, DTYPE_t delta, DTYP temporal = exp(-alpha * dt) # temporal = 1. - 1. / (1. + dt/alpha)**0.01 result = log(1. - structural + structural * temporal) - # print 'stnv', structural, temporal return result def ml2(dict root_victims, dict victims, dict non_victims, |