some bug fixes
This commit is contained in:
@@ -77,11 +77,14 @@ def geo_distance(lat1,lon1,lat2,lon2):
|
||||
|
||||
|
||||
def isbreakthrough(delta,cpvalues,p0,p1,p2,p3,ratio):
|
||||
pwr = p0/(1+delta/p2)
|
||||
pwr += p1/(1+delta/p3)
|
||||
pwr = abs(p0)/(1+(delta/abs(p2)))
|
||||
pwr += abs(p1)/(1+(delta/abs(p3)))
|
||||
|
||||
pwr *= ratio
|
||||
|
||||
delta = delta.values
|
||||
cpvalues = cpvalues.values
|
||||
|
||||
res = np.sum(cpvalues>pwr)
|
||||
|
||||
btdf = pd.DataFrame(
|
||||
@@ -92,6 +95,7 @@ def isbreakthrough(delta,cpvalues,p0,p1,p2,p3,ratio):
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
btdf.sort_values('delta',axis=0,inplace=True)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user