Skip to content

Commit d55c1a4

Browse files
committed
feat(wc-method): update layout! function to set scheme parameters
1 parent cdead09 commit d55c1a4

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

src/wc-method.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ function layout!(wc::WC; style=:auto, rt=:auto, centralword=:auto, reorder=:auto
9191
end
9292
@assert style in [:uniform, :gathering, :auto]
9393
centralword == :auto && hasparameter(wc, :centralword) && (centralword = getparameter(wc, :centralword))
94+
centralword != :auto && setparameter!(wc, centralword, :centralword)
9495
if centralword == :auto || centralword === true
9596
max_i = argmax(wc.weights)
9697
max_i2 = length(wc)>1 ? partialsortperm(wc.weights, 2, rev=true) : max_i
@@ -119,11 +120,13 @@ function layout!(wc::WC; style=:auto, rt=:auto, centralword=:auto, reorder=:auto
119120
end
120121
reorder == :auto && hasparameter(wc, :reorder) && (reorder = getparameter(wc, :reorder))
121122
reorder == :auto && (reorder=identity)
123+
reorder != :auto && setparameter!(wc, reorder, :reorder)
122124
qtrees = reorder(qtrees)
123125
centralword !== false && (qtrees = [wc.qtrees[centralword], qtrees...])
124126
if length(wc.qtrees) > 0 + (centralword !== false)
125127
style == :auto && hasparameter(wc, :style) && (style = getparameter(wc, :style))
126128
style == :auto && (style = rand()<0.8 ? :uniform : :gathering)
129+
style != :auto && setparameter!(wc, style, :style)
127130
if style == :gathering
128131
if rt == :auto
129132
if hasparameter(wc, :rt)
@@ -133,9 +136,11 @@ function layout!(wc::WC; style=:auto, rt=:auto, centralword=:auto, reorder=:auto
133136
rt = 1
134137
println("gathering style: rt = 1, ellipse")
135138
end
139+
rt != :auto && setparameter!(wc, rt, :rt)
136140
end
137141
p = min(50, 2 / rt)
138142
level == :auto && hasparameter(wc, :level) && (level = getparameter(wc, :level))
143+
level != :auto && setparameter!(wc, level, :level)
139144
level == :auto && (level=5)
140145
ind = Stuffing.place!(deepcopy(wc.maskqtree), qtrees, arg...;
141146
roomfinder=findroom_gathering, p=p, level=level, callback=callback, kargs...)

0 commit comments

Comments
 (0)