Commit 43fff714 authored by Laurien's avatar Laurien

last changes

parent f0bc902a
......@@ -34,12 +34,23 @@ def zeromatrices(L, dim, Ntheta):
w_lfinal = np.zeros(shape=(L,1), dtype=float)
n = np.zeros(shape=(Ntheta-1), dtype=int)
probability=np.zeros(shape=(Ntheta-1), dtype=float)
e2e = np.zeros(shape=(1,dim))
e2e = np.zeros(shape=(L))
w_ave=np.zeros(shape=(L+1), dtype=float)
lowlimit=np.zeros(shape=(L+1), dtype=float)
uplimit=np.zeros(shape=(L+1), dtype=float)
W = np.zeros(shape=(L))
return theta, pos_position, position, distance, radius, E_theta, w_l, sumW_l, w_lfinal, n, probability, e2e, w_ave, lowlimit, uplimit
return theta, pos_position, position, distance, radius, E_theta, w_l, sumW_l, w_lfinal, n, probability, e2e, w_ave, lowlimit, uplimit, W
def zeromatrices_e2e(min, max, repeat):
ldata = np.zeros(shape=(max-min+1, repeat))
e2edata = np.zeros(shape=(max-min+1, repeat))
weightdata = np.zeros(shape=(max-min+1, repeat))
meane2e = np.zeros(shape=(max-min+1))
angledata = np.zeros(shape=(max-min+1, repeat))
return ldata, e2edata, weightdata, meane2e
def initialized(Ntheta, position, theta):
"""
......@@ -50,6 +61,6 @@ def initialized(Ntheta, position, theta):
position[0]=[0,0]
position[1]=[1,0]
theta=np.linspace(0, 2*np.pi, Ntheta).T
theta=np.linspace(0, 2*np.pi - 2*np.pi/Ntheta, Ntheta).T
return position[0], position[1], theta
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment