Merge pull request #179 from WilhelmusLab/feat-seg-d-e-cleanup

fix: correct input files and update tests

Author: tdivoll

src/segmentation_d_e.jl

@@ -19,24 +19,24 @@ function watershed_ice_floes(intermediate_segmentation_image::BitMatrix)::BitMat
     return borders
 end
 
-## function alias segmentation_D is watershed on the `not_ice_mask` from segmentation_B
+## function alias segmentation_D is watershed on the `segmented_c` from segmentation_C 
 const segmentation_D = watershed_ice_floes
-## function alias segmentation_E is watershed on the `segmented_c` from segmentation_C
+## function alias segmentation_E is watershed on the `not_ice_mask` from segmentation_B
 const segmentation_E = watershed_ice_floes
 
 """
-    segmentation_D_E(watershed_B, watershed_C;)
+    segmentation_D_E(watershed_D, watershed_E;)
 
 Intersects the outputs of watershed segmentation on intermediate files from segmentation B and C, indicating potential sparse boundaries of ice floes.
 
 # Arguments
-- `watershed_B`: binary segmentation mask from `segmentation_D`
-- `watershed_C`: binary segmentation mask from `segmentation_E`
+- `watershed_D`: binary segmentation mask from `segmentation_D`
+- `watershed_E`: binary segmentation mask from `segmentation_E`
 
 """
-function segmentation_D_E(watershed_B::BitMatrix, watershed_C::BitMatrix;)::BitMatrix
+function segmentation_D_E(watershed_D::BitMatrix, watershed_E::BitMatrix;)::BitMatrix
 
     ## Intersect the two watershed files
-    watershed_intersect = watershed_B .* watershed_C
+    watershed_intersect = watershed_D .* watershed_E
     return watershed_intersect
 end

test/test-segmentation-d-e.jl

@@ -2,45 +2,32 @@
     println("------------------------------------------------")
     println("------------ Create Segmentation-D,E Test --------------")
 
-    matlab_segmented_D = load("$(test_data_dir)/matlab_not_ice_mask.png") .> 0.5
-
-    matlab_segmented_E = convert(BitMatrix, load("$(test_data_dir)/matlab_segmented_c.png"))
-    matlab_watershed_D = convert(BitMatrix, load("$(test_data_dir)/matlab_watershed_B.png"))
-    matlab_watershed_E = convert(BitMatrix, load("$(test_data_dir)/matlab_watershed_C.png"))
+    matlab_segmented_B = load("$(test_data_dir)/matlab_not_ice_mask.png") .<= 1
+    matlab_segmented_C = convert(BitMatrix, load("$(test_data_dir)/matlab_segmented_c.png"))
+    matlab_watershed_D = convert(BitMatrix, load("$(test_data_dir)/matlab_watershed_D.png"))
+    matlab_watershed_E = convert(BitMatrix, load("$(test_data_dir)/matlab_watershed_E.png"))
     matlab_watershed_intersect = convert(
         BitMatrix, load("$(test_data_dir)/matlab_watershed_intersect.png")
     )
 
     ## Run function with Matlab inputs
-    @time watershed_D_borders = IceFloeTracker.segmentation_D(matlab_segmented_D) #Matlab_not_ice_mask
-    @time watershed_E_borders = IceFloeTracker.segmentation_E(matlab_segmented_E) #matlab_segmented_c
+    @time watershed_D_borders = IceFloeTracker.segmentation_D(matlab_segmented_C) #Matlab_segmented_c
+    @time watershed_E_borders = IceFloeTracker.segmentation_E(matlab_segmented_B) #Matlab_not_ice_mask
     @time watershed_intersect = IceFloeTracker.segmentation_D_E(
         watershed_D_borders, watershed_E_borders
     )
 
-    watershed_D_filename =
-        "$(test_output_dir)/watershed_d_" *
-        Dates.format(Dates.now(), "yyyy-mm-dd-HHMMSS") *
-        ".png"
-    IceFloeTracker.@persist watershed_D_borders watershed_D_filename
-
-    watershed_E_filename =
-        "$(test_output_dir)/watershed_e_" *
-        Dates.format(Dates.now(), "yyyy-mm-dd-HHMMSS") *
-        ".png"
-    IceFloeTracker.@persist watershed_E_borders watershed_E_filename
+    IceFloeTracker.@persist watershed_D_borders "./test_outputs/watershed_d.png" true
+    
+    IceFloeTracker.@persist watershed_D_borders "./test_outputs/watershed_e.png" true
 
-    watershed_intersect_filename =
-        "$(test_output_dir)/watershed_intersect_" *
-        Dates.format(Dates.now(), "yyyy-mm-dd-HHMMSS") *
-        ".png"
-    IceFloeTracker.@persist watershed_intersect watershed_intersect_filename
+    IceFloeTracker.@persist watershed_D_borders "./test_outputs/watershed_intersect.png" true
 
     ## Tests with Matlab inputs
-    @test typeof(watershed_E_borders) == typeof(matlab_watershed_D)
-    @test typeof(watershed_D_borders) == typeof(matlab_watershed_E)
+    @test typeof(watershed_E_borders) == typeof(matlab_watershed_E)
+    @test typeof(watershed_D_borders) == typeof(matlab_watershed_D)
     @test typeof(watershed_intersect) == typeof(matlab_watershed_intersect)
-    @test test_similarity(matlab_watershed_D, watershed_D_borders, 0.064)
-    @test test_similarity(matlab_watershed_E, watershed_E_borders, 0.08)
-    @test test_similarity(matlab_watershed_intersect, watershed_intersect, 0.017)
+    @test test_similarity(matlab_watershed_D, watershed_D_borders, 0.078)
+    @test test_similarity(matlab_watershed_E, watershed_E_borders, 0.024)
+    @test test_similarity(matlab_watershed_intersect, watershed_intersect, 0.0028)
 end