fix (filter info matrix)

Kwasniok · Kwasniok · commit 7f8e2ab4201a · 2021-09-21T11:56:59.000+02:00
#33
diff --git a/src/nerte/render/image_filter_renderer.py b/src/nerte/render/image_filter_renderer.py
@@ -3,7 +3,7 @@
 The data is rendered first and filters may be applied afterwards.
 """
 
-from typing import Optional, NewType, Iterable
+from typing import Optional, Iterable
 
 from abc import ABC, abstractmethod
 
@@ -18,11 +18,7 @@
 from nerte.geometry.geometry import Geometry
 from nerte.render.image_renderer import ImageRenderer
 from nerte.render.projection import ProjectionMode
-
-# TODO: provide proper container type
-IntersectionInfoMatrix = NewType(
-    "IntersectionInfoMatrix", list[list[IntersectionInfo]]
-)
+from nerte.util.generic_matrix import GenericMatrix
 
 
 def color_for_normalized_value(value: float) -> Color:
@@ -78,7 +74,7 @@ class Filter(ABC):
     @abstractmethod
     def apply(
         self,
-        info_matrix: IntersectionInfoMatrix,
+        info_matrix: GenericMatrix[IntersectionInfo],
     ) -> Image:
         """
         Returns color for pixel based.
@@ -112,13 +108,12 @@ def color_for_info(
             return self.color_hit()
         return color_for_miss_reason(info)
 
-    def apply(self, info_matrix: IntersectionInfoMatrix) -> Image:
-        if len(info_matrix) == 0 or len(info_matrix[0]) == 0:
+    def apply(self, info_matrix: GenericMatrix[IntersectionInfo]) -> Image:
+        width, height = info_matrix.dimensions()
+        if width == 0 or height == 0:
             raise ValueError(
                 "Cannot apply hit filter. Intersection info matrix is empty."
             )
-        width = len(info_matrix)
-        height = len(info_matrix[0])
 
         # initialize image with pink background
         image = Image.new(
@@ -129,7 +124,7 @@ def apply(self, info_matrix: IntersectionInfoMatrix) -> Image:
         for pixel_x in range(width):
             for pixel_y in range(height):
                 pixel_location = (pixel_x, pixel_y)
-                info = info_matrix[pixel_x][pixel_y]
+                info = info_matrix[pixel_x, pixel_y]
                 pixel_color = self.color_for_info(info)
                 image.putpixel(pixel_location, pixel_color.rgb)
 
@@ -158,7 +153,7 @@ def __init__(
 
         self._filter = filtr
         self.auto_apply_filter = auto_apply_filter
-        self._last_info_matrix: Optional[IntersectionInfoMatrix] = None
+        self._last_info_matrix: Optional[GenericMatrix[IntersectionInfo]] = None
 
     def has_render_data(self) -> bool:
         """Returns True, iff render was called previously."""
@@ -222,14 +217,14 @@ def render_pixel_intersection_info(
 
     def render_intersection_info(
         self, scene: Scene, geometry: Geometry
-    ) -> IntersectionInfoMatrix:
+    ) -> GenericMatrix[IntersectionInfo]:
         """
         Returns matrix with intersection infos per pixel.
         """
 
         width, height = scene.camera.canvas_dimensions
         # initialize background with nan
-        info_matrix: IntersectionInfoMatrix = IntersectionInfoMatrix(
+        info_matrix = GenericMatrix[IntersectionInfo](
             [
                 [IntersectionInfos.UNINIALIZED for _ in range(height)]
                 for _ in range(width)
@@ -245,7 +240,7 @@ def render_intersection_info(
                     scene.objects(),
                     pixel_location,
                 )
-                info_matrix[pixel_x][pixel_y] = pixel_info
+                info_matrix[pixel_x, pixel_y] = pixel_info
         return info_matrix
 
     def render(self, scene: Scene, geometry: Geometry) -> None:
diff --git a/src/nerte/render/image_filter_renderer_unittest.py b/src/nerte/render/image_filter_renderer_unittest.py
@@ -26,13 +26,13 @@
 from nerte.geometry.cylindircal_geometry import CylindricRungeKuttaGeometry
 from nerte.render.projection import ProjectionMode
 from nerte.render.image_filter_renderer import (
-    IntersectionInfoMatrix,
     Filter,
     HitFilter,
     ImageFilterRenderer,
     color_for_miss_reason,
     color_for_normalized_value,
 )
+from nerte.util.generic_matrix import GenericMatrix
 
 
 class ColorForMissReasonTest(BaseTestCase):
@@ -102,7 +102,7 @@ class DummyFilter(Filter):
             # pylint: disable=R0903
             def apply(
                 self,
-                info_matrix: IntersectionInfoMatrix,
+                info_matrix: GenericMatrix[IntersectionInfo],
             ) -> Image:
                 return Image.new(
                     mode="RGB", size=(5, 5), color=Colors.BLACK.rgb
@@ -177,7 +177,7 @@ def setUp(self) -> None:
             IntersectionInfos.RAY_INITIALIZED_OUTSIDE_MANIFOLD,
         )
         self.info_matrices = tuple(
-            IntersectionInfoMatrix([[info]]) for info in self.infos
+            GenericMatrix[IntersectionInfo]([[info]]) for info in self.infos
         )
         self.filter = HitFilter()
 
diff --git a/src/nerte/render/meta_info_filter.py b/src/nerte/render/meta_info_filter.py
@@ -11,10 +11,10 @@
 from nerte.values.intersection_info import IntersectionInfo
 from nerte.values.extended_intersection_info import ExtendedIntersectionInfo
 from nerte.render.image_filter_renderer import (
-    IntersectionInfoMatrix,
     Filter,
     color_for_normalized_value,
 )
+from nerte.util.generic_matrix import GenericMatrix
 
 
 def _clip(value: float) -> float:
@@ -79,14 +79,12 @@ def color_for_info(self, info: IntersectionInfo) -> Color:
                 return color_for_normalized_value(value)
         return self.color_no_meta_data
 
-    def apply(self, info_matrix: IntersectionInfoMatrix) -> Image:
-        if len(info_matrix) == 0 or len(info_matrix[0]) == 0:
+    def apply(self, info_matrix: GenericMatrix[IntersectionInfo]) -> Image:
+        width, height = info_matrix.dimensions()
+        if width == 0 or height == 0:
             raise ValueError(
-                "Cannot apply meta data filter. Intersection info matrix is"
-                " empty."
+                "Cannot apply hit filter. Intersection info matrix is empty."
             )
-        width = len(info_matrix)
-        height = len(info_matrix[0])
 
         # initialize image with pink background
         image = Image.new(
@@ -97,7 +95,7 @@ def apply(self, info_matrix: IntersectionInfoMatrix) -> Image:
         for pixel_x in range(width):
             for pixel_y in range(height):
                 pixel_location = (pixel_x, pixel_y)
-                info = info_matrix[pixel_x][pixel_y]
+                info = info_matrix[pixel_x, pixel_y]
                 pixel_color = self.color_for_info(info)
                 image.putpixel(pixel_location, pixel_color.rgb)
 
diff --git a/src/nerte/render/meta_info_filter_unittest.py b/src/nerte/render/meta_info_filter_unittest.py
@@ -13,8 +13,8 @@
 from nerte.values.color import Color
 from nerte.values.intersection_info import IntersectionInfo
 from nerte.values.extended_intersection_info import ExtendedIntersectionInfo
-from nerte.render.image_filter_renderer import IntersectionInfoMatrix
 from nerte.render.meta_info_filter import MetaInfoFilter
+from nerte.util.generic_matrix import GenericMatrix
 
 
 class MetaInfoFilterConstructorTest(BaseTestCase):
@@ -124,7 +124,7 @@ def setUp(self) -> None:
             ExtendedIntersectionInfo(ray_depth=0.3, meta_data={"key": 0.5}),
             ExtendedIntersectionInfo(ray_depth=0.3, meta_data={"key": 1.0}),
         )
-        self.info_matrix = IntersectionInfoMatrix([list(self.infos)])
+        self.info_matrix = GenericMatrix[IntersectionInfo]([list(self.infos)])
         self.filter = MetaInfoFilter(
             meta_data_key="key", min_value=0.0, max_value=1.0
         )
diff --git a/src/nerte/render/ray_depth_filter.py b/src/nerte/render/ray_depth_filter.py
@@ -12,11 +12,11 @@
 from nerte.values.color import Color, Colors
 from nerte.values.intersection_info import IntersectionInfo
 from nerte.render.image_filter_renderer import (
-    IntersectionInfoMatrix,
     Filter,
     color_for_normalized_value,
     color_for_miss_reason,
 )
+from nerte.util.generic_matrix import GenericMatrix
 
 
 def _is_finite(mat: np.ndarray) -> np.ndarray:
@@ -146,13 +146,12 @@ def _color_for_pixel(
             return self.color_for_normalized_ray_depth_value(pixel_value)
         return color_for_miss_reason(info)
 
-    def apply(self, info_matrix: IntersectionInfoMatrix) -> Image:
-        if len(info_matrix) == 0 or len(info_matrix[0]) == 0:
+    def apply(self, info_matrix: GenericMatrix[IntersectionInfo]) -> Image:
+        width, height = info_matrix.dimensions()
+        if width == 0 or height == 0:
             raise ValueError(
-                "Cannot apply ray depth filter. Intersection info matrix is empty."
+                "Cannot apply hit filter. Intersection info matrix is empty."
             )
-        width = len(info_matrix)
-        height = len(info_matrix[0])
 
         # initialize image with pink background
         image = Image.new(
@@ -162,7 +161,7 @@ def apply(self, info_matrix: IntersectionInfoMatrix) -> Image:
         ray_depths_raw = np.full((width, height), math.nan)
         for pixel_x in range(width):
             for pixel_y in range(height):
-                info = info_matrix[pixel_x][pixel_y]
+                info = info_matrix[pixel_x, pixel_y]
                 if info.hits():
                     ray_depths_raw[pixel_x, pixel_y] = info.ray_depth()
 
@@ -172,7 +171,7 @@ def apply(self, info_matrix: IntersectionInfoMatrix) -> Image:
         for pixel_x in range(width):
             for pixel_y in range(height):
                 pixel_location = (pixel_x, pixel_y)
-                info = info_matrix[pixel_x][pixel_y]
+                info = info_matrix[pixel_x, pixel_y]
                 pixel_value = ray_depth_normalized[pixel_x, pixel_y]
                 pixel_color = self._color_for_pixel(info, pixel_value)
                 image.putpixel(pixel_location, pixel_color.rgb)
diff --git a/src/nerte/render/ray_depth_filter_unittest.py b/src/nerte/render/ray_depth_filter_unittest.py
@@ -12,11 +12,9 @@
 
 from nerte.values.color import Color
 from nerte.values.intersection_info import IntersectionInfo
-from nerte.render.image_filter_renderer import (
-    IntersectionInfoMatrix,
-    color_for_miss_reason,
-)
+from nerte.render.image_filter_renderer import color_for_miss_reason
 from nerte.render.ray_depth_filter import RayDepthFilter
+from nerte.util.generic_matrix import GenericMatrix
 
 
 class RayDepthFilterConstructorTest(BaseTestCase):
@@ -138,7 +136,7 @@ def test_color_for_ray_depth(self) -> None:
 
 class RayDepthFilterApplyTest(BaseTestCase):
     def setUp(self) -> None:
-        self.info_matrix = IntersectionInfoMatrix(
+        self.info_matrix = GenericMatrix[IntersectionInfo](
             [
                 [
                     IntersectionInfo(ray_depth=math.e ** 0),
