Fix #31: correct graph cut

JuliaEarth · Apr 28, 2022 · f0aa756 · f0aa756
1 parent df0d798
commit f0aa756
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 3 deletions.
diff --git a/src/graphcuts.jl b/src/graphcuts.jl
@@ -52,15 +52,15 @@ function boykov_kolmogorov_cut(A::AbstractArray{T,N}, B::AbstractArray{T,N}, dim
   end
 
   # fill edges from source terminal to left slice
-  linds = CartesianIndices(ntuple(i -> i == dim ? 1 : (1:sz[i]), N))
+  linds = CartesianIndices(ntuple(i -> i == dim ? (1:1) : (1:sz[i]), N))
   for ind in linds
     u = cart2lin(sz, ind)
     add_edge!(G, s, u)
     C[s,u] = Inf
   end
 
   # fill edges from right slice to sink terminal
-  rinds = CartesianIndices(ntuple(i -> i == dim ? sz[dim] : (1:sz[i]), N))
+  rinds = CartesianIndices(ntuple(i -> i == dim ? (sz[dim]:sz[dim]) : (1:sz[i]), N))
   for ind in rinds
     v = cart2lin(sz, ind)
     add_edge!(G, v, t)

diff --git a/test/data/GeoStatsAPI.png b/test/data/GeoStatsAPI.png
diff --git a/test/data/RealsStoneWall.png b/test/data/RealsStoneWall.png
diff --git a/test/data/RealsStrebelle.png b/test/data/RealsStrebelle.png
diff --git a/test/data/VoxelStoneWall.png b/test/data/VoxelStoneWall.png
diff --git a/test/data/VoxelWalkerLake.png b/test/data/VoxelWalkerLake.png
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -122,7 +122,7 @@ datadir = joinpath(@__DIR__,"data")
     @test all(C[:,2:end] .== 0)
 
     # TI = geostatsimage("StoneWall")
-    # img = reshape(TI[:Z], 200, 200)
+    # img = asarray(TI, :Z)
     # A = img[1:50,1:30]
     # B = img[1:50,11:40]
     # C = ImageQuilting.boykov_kolmogorov_cut(A, B, 1)