From 034c71328460d460deef74bf591c8d6cd28d5f93 Mon Sep 17 00:00:00 2001 From: Ben Green Date: Wed, 8 Jul 2015 00:41:29 -0400 Subject: updated temporal model for different time scales, ran some tests --- experiments/ml2.pyx | 2 -- 1 file changed, 2 deletions(-) (limited to 'experiments/ml2.pyx') 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, -- cgit v1.2.3-70-g09d2