diff options
| author | Ben Green <bgreen@g.harvard.edu> | 2015-08-01 12:01:19 -0400 |
|---|---|---|
| committer | Ben Green <bgreen@g.harvard.edu> | 2015-08-01 12:01:19 -0400 |
| commit | 9350ee2c6359562a23cf8efdefdd7de80b2a682e (patch) | |
| tree | b1217fcc2098bebaa6fed641bb759ac71eae139f /experiments/ml.pyx | |
| parent | 37c23e0d1fcbdee116856d59c0dab98686e265ae (diff) | |
| download | criminal_cascades-9350ee2c6359562a23cf8efdefdd7de80b2a682e.tar.gz | |
minor updates
Diffstat (limited to 'experiments/ml.pyx')
| -rw-r--r-- | experiments/ml.pyx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/experiments/ml.pyx b/experiments/ml.pyx index 91536b5..e1bf26b 100644 --- a/experiments/ml.pyx +++ b/experiments/ml.pyx @@ -10,8 +10,8 @@ cdef DTYPE_t weight_success(int dist, int dt, DTYPE_t alpha, DTYPE_t delta, DTYP DTYPE_t t_scale, DTYPE_t w1, DTYPE_t w2, DTYPE_t w3): """weight for successful infection, exponential time model""" cdef DTYPE_t structural, temporal, result - structural = delta ** (dist**1) - # structural = delta/(1. + 1./(w1*lmbda) + 1./(w2*lmbda) + 1./(w3*lmbda)) + # structural = delta ** (dist**1) + structural = delta * lmbda**(dist-1) temporal = log(exp(alpha/t_scale)-1.) - alpha*dt/t_scale # temporal = 1. / (1. + (dt - 1.)/alpha)**0.01 - 1. / (1. + dt/alpha)**0.01 result = log(structural) + temporal @@ -21,12 +21,11 @@ cdef DTYPE_t weight_failure(int dist, int dt, DTYPE_t alpha, DTYPE_t delta, DTYP DTYPE_t t_scale, DTYPE_t w1, DTYPE_t w2, DTYPE_t w3): """weight for failed infection, exponential time model""" cdef DTYPE_t structural, temporal, result - structural = delta ** (dist**1) - # structural = delta/(1. + 1./(w1*lmbda) + 1./(w2*lmbda) + 1./(w3*lmbda)) + # structural = delta ** (dist**1) + structural = delta * lmbda**(dist-1) temporal = exp(-alpha * dt/t_scale) # temporal = 1. - 1. / (1. + dt/alpha)**0.01 result = log(1. - structural + structural * temporal) - # if dt>100: result=0 return result def ml(dict root_victims, dict victims, dict non_victims, |