support ternary collision detection

README.md

@@ -1,7 +1,7 @@
 # Stuffing
 [![CI](https://github.com/guo-yong-zhi/Stuffing.jl/actions/workflows/ci.yml/badge.svg)](https://github.com/guo-yong-zhi/Stuffing.jl/actions/workflows/ci.yml) [![CI-nightly](https://github.com/guo-yong-zhi/Stuffing.jl/actions/workflows/ci-nightly.yml/badge.svg)](https://github.com/guo-yong-zhi/Stuffing.jl/actions/workflows/ci-nightly.yml) [![codecov](https://codecov.io/gh/guo-yong-zhi/Stuffing.jl/branch/main/graph/badge.svg?token=43TOrL25V7)](https://codecov.io/gh/guo-yong-zhi/Stuffing.jl) [![DOI](https://zenodo.org/badge/349631351.svg)](https://zenodo.org/badge/latestdoi/349631351) 
 This's an algorithm for solving **2D irregular nesting problems** (also known as cutting problems or packing problems). 
-The algorithm accepts arbitrary **binary raster masks** as inputs and is good at handling the nesting problems of many gadgets. The implementation is based on quadtree & gradient optimization. Also, it can be parallelized if you start `julia` with `julia --threads k`. This package is used by [WordCloud.jl](https://github.com/guo-yong-zhi/WordCloud.jl). 
+The algorithm accepts arbitrary **binary or ternary raster masks** as inputs and is good at handling the nesting problems of many gadgets. The implementation is based on quadtree & gradient optimization. Also, it can be parallelized if you start `julia` with `julia --threads k`. This package is used by [WordCloud.jl](https://github.com/guo-yong-zhi/WordCloud.jl). 
 Examples: [collision detection](./examples/collision.jl), [dynamic collision detection](./examples/dynamiccollisions.jl), [packing](./examples/packing.jl) 
 Benchmark: [collision benchmark](./examples/collision_benchmark.jl), [fit benchmark](https://github.com/guo-yong-zhi/WordCloud/blob/master/examples/benchmark.jl) 
 ***

src/Stuffing.jl

@@ -13,18 +13,20 @@ include("utils.jl")
 
 @info "Threads.nthreads() = $(Threads.nthreads())"
 
+function qtree(pic::AbstractMatrix{UInt8}, args...)
+ qt = ShiftedQTree(pic, args..., default=QTrees.EMPTY) |> buildqtree!
+ return qt
+end
 function qtree(pic::AbstractArray{Bool,2}, args...)
  pic = map(x -> ifelse(x, QTrees.FULL, QTrees.EMPTY), pic)
- qt = ShiftedQTree(pic, args..., default=QTrees.EMPTY) |> buildqtree!
 # @show size(pic),m,s
- return qt
+ return qtree(pic, args...)
 end
 function qtree(pic::AbstractMatrix, args...; background=pic[1])
  qtree(pic .!= background, args...)
 end
 
-function maskqtree(pic::AbstractArray{Bool,2})
- pic = map(x -> ifelse(x, QTrees.EMPTY, QTrees.FULL), pic)
+function maskqtree(pic::AbstractMatrix{UInt8})
  ms = max(size(pic)...)
  b = max(ms * 0.024, 20)
  s = 2^ceil(Int, log2(ms + b))
@@ -35,6 +37,10 @@ function maskqtree(pic::AbstractArray{Bool,2})
  setcshift!(qt[1], (s - b) ÷ 2)
  return qt |> buildqtree!
 end
+function maskqtree(pic::AbstractArray{Bool,2})
+ pic = map(x -> ifelse(x, QTrees.EMPTY, QTrees.FULL), pic)
+ return maskqtree(pic)
+end
 function maskqtree(pic::AbstractMatrix; background=pic[1])
  maskqtree(pic .!= background)
 end

src/qtree_functions.jl

@@ -10,10 +10,12 @@ function collision_dfs(Q1::AbstractStackedQTree, Q2::AbstractStackedQTree, i=(le
  return i
  end
  r = -i[1], i[2], i[3]
- for cn in 1:4 # MIX
- ci = child(i, cn)
- r = collision_dfs(Q1, Q2, ci)
- if r[1] > 0 return r end 
+ if i[1] > 1
+ for cn in 1:4 # MIX
+ ci = child(i, cn)
+ r = collision_dfs(Q1, Q2, ci)
+ if r[1] > 0 return r end 
+ end
  end
  return r # no collision
 end
@@ -36,7 +38,9 @@ function _collision_randbfs(Q1::AbstractStackedQTree, Q2::AbstractStackedQTree,
  if q1 == EMPTY
  continue
  elseif q1 == MIX
- push!(q, ci)
+ if ci[1] > 1
+ push!(q, ci)
+ end
  continue
  else
  return ci
@@ -430,7 +434,7 @@ function overlap(p1::UInt8, p2::UInt8)
  elseif p1 == EMPTY && p2 == EMPTY
  return EMPTY
  else
- error("roung code")
+ return MIX
  end
 end
 

test/test_qtrees.jl

@@ -155,4 +155,16 @@ testqtree = Stuffing.testqtree
  @test QTrees.totalcollisions_native([qt1, qt2]) |> isempty
  @test QTrees.totalcollisions_spacial([qt1, qt2]) |> isempty
  @test QTrees.partialcollisions([qt1, qt2]) |> isempty
+ # ternary tree
+ qt1 = qtree(fill(0x03, 5, 6))
+ qt2 = qtree(fill(0x03, 5, 6))
+ qt3 = qtree(fill(0x02, 5, 6))
+ qt4 = qtree(fill(0x01, 5, 6))
+ @test QTrees.collision(qt1, qt2)[1] < 0
+ @test QTrees.collision(qt1, qt3)[1] > 0
+ @test QTrees.collision(qt1, qt4)[1] < 0
+ @test QTrees.collision_dfs(qt1, qt2)[1] < 0
+ @test QTrees.collision_dfs(qt1, qt3)[1] > 0
+ @test QTrees.collision_dfs(qt1, qt4)[1] < 0
+ @test QTrees.totalcollisions_spacial([qt1, qt2]) |> isempty
 end