Merge pull request #57 from deepfield-team/grid_cleaner

grid_cleaner

Author: illarionovEA

deepfield/field/base_component.py

@@ -97,20 +97,12 @@ def empty_like(self):
         for comp, value in self.items():
             if issubclass(value.__class__, BaseComponent):
                 empty[comp] = value.empty_like()
-        empty.init_state(**self.state.as_dict())
+        empty.set_state(**self.state.as_dict())
         return empty
 
-    def init_state(self, **kwargs):
-        """Init state attributes."""
-        for k, v in kwargs.items():
-            setattr(self.state, k, v)
-        return self
-
     def set_state(self, **kwargs):
         """State setter."""
         for k, v in kwargs.items():
-            if not hasattr(self.state, k):
-                raise AttributeError('{} has no state {}'.format(self.class_name, k))
             setattr(self.state, k, v)
         return self
 
@@ -157,7 +149,7 @@ def copy(self):
             **{k: deepcopy(v) if not issubclass(v.__class__, BaseComponent) else v.copy() for k, v in self.items()},
             field = self.field,
         )
-        copy.init_state(**self.state.as_dict())
+        copy.set_state(**self.state.as_dict())
         copy.class_name = self.class_name
         return copy
 
@@ -329,7 +321,7 @@ def _load_hdf5_group(self, grp, attrs, raise_errors, logger, subset):
                 state[k] = v if not np.isnan(v) else None
             except TypeError:
                 state[k] = v
-        self.init_state(**state)
+        self.set_state(**state)
         for att in grp.keys() if attrs is None else attrs:
             try:
                 val = grp[att.upper()]

deepfield/field/base_spatial.py

@@ -27,7 +27,7 @@ class SpatialComponent(BaseComponent):
     """Base component for spatial-type attributes."""
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.init_state(spatial=None)
+        self.set_state(spatial=None)
 
     def sample_crops(self, attr, shape, size=1):
         """Sample random crops of fixed shape.

deepfield/field/faults.py

@@ -25,7 +25,6 @@ class Faults(BaseTree):
 
     def __init__(self, node=None, **kwargs):
         super().__init__(node=node, **kwargs)
-        self.init_state(has_blocks=False)
 
     def update(self, data, mode='w', **kwargs):
         """Update tree nodes with new faultsdata. If fault does not exists,
@@ -91,22 +90,19 @@ def get_blocks(self, segment, **kwargs):
         _ = kwargs
         blocks_fault = []
         xyz_fault = []
+        grid = self.field.grid
         for idx in segment.faults.index:
             cells = segment.faults.loc[idx, ['IX1', 'IX2', 'IY1', 'IY2', 'IZ1', 'IZ2', 'FACE']]
             x_range = range(cells['IX1']-1, cells['IX2'])
             y_range = range(cells['IY1']-1, cells['IY2'])
             z_range = range(cells['IZ1']-1, cells['IZ2'])
             blocks_segment = np.array(list(product(x_range, y_range, z_range)))
-            xyz_segment = self.field.grid.xyz[blocks_segment[:, 0],
-                                              blocks_segment[:, 1],
-                                              blocks_segment[:, 2]][:, FACES[cells['FACE']]]
+            xyz_segment = grid.get_xyz(blocks_segment)[:, FACES[cells['FACE']]]
             blocks_fault.extend(blocks_segment)
             xyz_fault.extend(xyz_segment)
 
         segment.blocks = np.array(blocks_fault)
         segment.faces_verts = np.array(xyz_fault)
-
-        self.set_state(has_blocks=True)
         return self
 
     def _read_buffer(self, buffer, attr, **kwargs):