Merge branch 'dev' of https://github.com/vnpy/vnpy into dev

This commit is contained in:
vn.py 2018-01-05 15:16:28 +08:00
commit 61608dd20d

View File

@ -47,9 +47,9 @@ def calculatePrice(f, k, r, t, v, cp):
if v <= 0: if v <= 0:
return max(0, cp * (f - k)) return max(0, cp * (f - k))
d1 = (log(f / k) + (0.5 * pow(v, 2) + r) * t) / (v * sqrt(t)) d1 = (log(f / k) + (0.5 * pow(v, 2)) * t) / (v * sqrt(t))
d2 = d1 - v * sqrt(t) d2 = d1 - v * sqrt(t)
price = cp * (f * cdf(cp * d1) - k * cdf(cp * d2) * exp(-r * t)) price = cp * (f * cdf(cp * d1) - k * cdf(cp * d2)) * exp(-r * t)
return price return price
#---------------------------------------------------------------------- #----------------------------------------------------------------------