fixed minor bugs

2d_fourie/extractors.py

@@ -70,7 +70,6 @@ class Evaluator:
             temp_idx = []
             for num in ev_points:
                 if np.sum(self.mask == num) == 0:
-                    # print("Empty: ",num)
                     continue
                 temp_val.append(np.mean(img.img[self.mask == num]))
                 temp_idx.append(num)
@@ -94,6 +93,15 @@ class Evaluator:
     def get_mask(self):
         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):
     def __init__(self, list_points):

2d_fourie/lattices.py

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

2d_fourie/main.py

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