jacob/FFT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed minor bugs

Browse Source
This commit is contained in:
Jacob Holder 2023-03-06 11:01:04 +01:00
parent 6e6b00d58d
commit 1cfdbd6dc6
Signed by: jacob
GPG Key ID: 2194FC747048A7FD
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
2d_fourie/extractors.py
View File

@ -70,7 +70,6 @@ class Evaluator:
temp_idx = [] temp_idx = []
for num in ev_points: for num in ev_points:
if np.sum(self.mask == num) == 0: if np.sum(self.mask == num) == 0:
# print("Empty: ",num)
continue continue
temp_val.append(np.mean(img.img[self.mask == num])) temp_val.append(np.mean(img.img[self.mask == num]))
temp_idx.append(num) temp_idx.append(num)
@ -94,6 +93,15 @@ class Evaluator:
def get_mask(self): def get_mask(self):
return self.mask return self.mask
def merge_mask(self):
new_eval_points = np.arange(len(self.eval_points))
new_eval = []
for nc, ev_points in zip(new_eval_points, self.eval_points):
new_eval.append([nc])
for num in ev_points:
self.mask[self.mask == num] = nc
self.eval_points = new_eval
class Voronoi_Evaluator(Evaluator): class Voronoi_Evaluator(Evaluator):
def __init__(self, list_points): def __init__(self, list_points):

2
2d_fourie/lattices.py
View File

@ -105,7 +105,7 @@ class VO2_Lattice(Lattice):
def reci_rutile(self): def reci_rutile(self):
num = 20 num = 20
num = 2 #num = 2
x = np.arange(-num, num + 1) x = np.arange(-num, num + 1)
y = np.arange(-num, num + 1) y = np.arange(-num, num + 1)
X, Y = np.meshgrid(x, y) X, Y = np.meshgrid(x, y)

8
2d_fourie/main.py
View File

@ -211,7 +211,9 @@ def random(seed):
img = Image_Wrapper(intens, fx, fy) img = Image_Wrapper(intens, fx, fy)
if not already_inited: if not already_inited:
voro.generate_mask(img) voro.generate_mask(img)
voro.merge_mask()
rect.generate_mask(img) rect.generate_mask(img)
rect.merge_mask()
already_inited = True already_inited = True
iv, vv = voro.extract(img) iv, vv = voro.extract(img)
@ -278,7 +280,9 @@ def ising(seed):
img = Image_Wrapper(intens, fx, fy) img = Image_Wrapper(intens, fx, fy)
if not already_inited: if not already_inited:
voro.generate_mask(img) voro.generate_mask(img)
voro.merge_mask()
rect.generate_mask(img) rect.generate_mask(img)
rect.merge_mask()
already_inited = True already_inited = True
iv, vv = voro.extract(img) iv, vv = voro.extract(img)
@ -302,8 +306,8 @@ def ising(seed):
if __name__ == "__main__": if __name__ == "__main__":
# test_square() # test_square()
test_mixed() #test_mixed()
plt.show() #plt.show()
# random() # random()
np.random.seed(1234) np.random.seed(1234)
for i in np.random.randint(0, 10000, 1): for i in np.random.randint(0, 10000, 1):