@@ -91,6 +91,7 @@ function layout!(wc::WC; style=:auto, rt=:auto, centralword=:auto, reorder=:auto
91
91
end
92
92
@assert style in [:uniform , :gathering , :auto ]
93
93
centralword == :auto && hasparameter (wc, :centralword ) && (centralword = getparameter (wc, :centralword ))
94
+ centralword != :auto && setparameter! (wc, centralword, :centralword )
94
95
if centralword == :auto || centralword === true
95
96
max_i = argmax (wc. weights)
96
97
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
119
120
end
120
121
reorder == :auto && hasparameter (wc, :reorder ) && (reorder = getparameter (wc, :reorder ))
121
122
reorder == :auto && (reorder= identity)
123
+ reorder != :auto && setparameter! (wc, reorder, :reorder )
122
124
qtrees = reorder (qtrees)
123
125
centralword != = false && (qtrees = [wc. qtrees[centralword], qtrees... ])
124
126
if length (wc. qtrees) > 0 + (centralword != = false )
125
127
style == :auto && hasparameter (wc, :style ) && (style = getparameter (wc, :style ))
126
128
style == :auto && (style = rand ()< 0.8 ? :uniform : :gathering )
129
+ style != :auto && setparameter! (wc, style, :style )
127
130
if style == :gathering
128
131
if rt == :auto
129
132
if hasparameter (wc, :rt )
@@ -133,9 +136,11 @@ function layout!(wc::WC; style=:auto, rt=:auto, centralword=:auto, reorder=:auto
133
136
rt = 1
134
137
println (" gathering style: rt = 1, ellipse" )
135
138
end
139
+ rt != :auto && setparameter! (wc, rt, :rt )
136
140
end
137
141
p = min (50 , 2 / rt)
138
142
level == :auto && hasparameter (wc, :level ) && (level = getparameter (wc, :level ))
143
+ level != :auto && setparameter! (wc, level, :level )
139
144
level == :auto && (level= 5 )
140
145
ind = Stuffing. place! (deepcopy (wc. maskqtree), qtrees, arg... ;
141
146
roomfinder= findroom_gathering, p= p, level= level, callback= callback, kargs... )
0 commit comments