set to state placement! when unfitted

Author: guoyongzhi

Project.toml

@@ -1,7 +1,7 @@
 name = "WordCloud"
 uuid = "6385f0a0-cb03-45b6-9089-4e0acc74b26b"
 authors = ["guoyongzhi <momoshanghan@163.com>"]
-version = "0.6.9"
+version = "0.6.10"
 
 [deps]
 ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4"

src/rendering.jl

@@ -36,9 +36,9 @@ function load(fn)
 end
 
 function svg2bitmap(svg::Drawing)
-    d = Drawing(svg.width, svg.height, :image)
+    Drawing(svg.width, svg.height, :image)
     placeimage(svg)
-    m=image_as_matrix()
+    m = image_as_matrix()
     finish()
     m
 end
@@ -195,8 +195,6 @@ function overlay(color1::T, color2::T) where {T}
 end
 "put img2 on img1 at (x, y)"
 function overlay!(img1::AbstractMatrix, img2::AbstractMatrix, x=1, y=1)#左上角重合时(x=1,y=1)
-    h1, w1 = size(img1)
-    h2, w2 = size(img2)
     img1v, img2v = overlappingarea(img1, img2, x, y)
 #     @show (h1, w1),(h2, w2),(x,y)
     img1v .= overlay.(img1v, img2v)

src/wc-method.jl

@@ -21,7 +21,6 @@ end
 initimages!(wc, i; kargs...) = initimage!.(wc, index(wc, i); kargs...)
 function initimages!(wc::WC; maxiter=5, error=0.02)
     params = wc.params
-    mask = wc.mask
 
     si = sortperm(wc.weights, rev=true)
     words = wc.words[si]
@@ -151,7 +150,14 @@ function recolor!(wc, args...; style=:average, kargs...)
     end
     nothing
 end
-
+"""
+# Positional Args
+* wc: the wordcloud to fit
+* nepoch: training epoch nums
+# Keyword Args
+* patient: number of epochs before teleporting, set to `-1` to disable teleporting
+* trainer: appoint a training engine
+"""
 function fit!(wc, args...; krags...)
     if STATEIDS[getstate(wc)] < STATEIDS[:placement!]
         placement!(wc)
@@ -161,6 +167,8 @@ function fit!(wc, args...; krags...)
     wc.params[:epoch] += ep
     if nc == 0
         setstate!(wc, nameof(fit!))
+    else
+        setstate!(wc, nameof(placement!))
     end
     wc
 end
@@ -177,7 +185,7 @@ function printcollisions(wc)
 end
 """
 # Positional Args
-* wc: the wordcloud to train
+* wc: the wordcloud to fit
 * nepoch: training epoch nums
 # Keyword Args
 * retry: shrink & retrain times, defaults to 3, set to `1` to disable shrinking
@@ -188,11 +196,9 @@ function generate!(wc::WC, args...; retry=3, krags...)
     if STATEIDS[getstate(wc)] < STATEIDS[:placement!]
         placement!(wc)
     end
-    ep, nc = -1, -1
     for r in 1:retry
         if r != 1
             rescale!(wc, 0.97)
-            qtrees = [wc.maskqtree, wc.qtrees...]
             dens = textoccupied(getwords(wc), getfontsizes(wc), getfonts(wc))/wc.params[:groundoccupied]
             println("#$r. try scale = $(wc.params[:scale]). The density is reduced to $dens")
         else