Skip to content

Commit 38e4613

Browse files
committed
Inverse default 'normalize' flag; optimize
1 parent 87d70eb commit 38e4613

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/Histograms.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,11 @@ Returns:
193193
- w1_uv: number; the Wasserstein-1 distance
194194
"""
195195
function W1(u_samples::AbstractVector, v_samples::AbstractVector;
196-
normalize = true)
197-
L = maximum([u_samples; v_samples]) - minimum([u_samples; v_samples])
196+
normalize = false)
198197
return if !normalize
199198
scsta.wasserstein_distance(u_samples, v_samples)
200199
else
200+
L = maximum( (u_samples; v_samples) ) - minimum( (u_samples; v_samples) )
201201
scsta.wasserstein_distance(u_samples, v_samples) / L
202202
end
203203
end
@@ -226,7 +226,7 @@ of the two (minimum number of rows) will be taken.
226226
computed for each pair (u_j, v_j) individually.
227227
"""
228228
function W1(U_samples::AbstractMatrix, V_samples::AbstractMatrix;
229-
normalize = true)
229+
normalize = false)
230230
if size(U_samples, 1) != size(V_samples, 1)
231231
println(warn("W1"), "sizes of U_samples & V_samples don't match; ",
232232
"will use the minimum of the two")
@@ -241,10 +241,10 @@ function W1(U_samples::AbstractMatrix, V_samples::AbstractMatrix;
241241
return w1_UV
242242
end
243243

244-
W1(U_samples::AbstractMatrix, v_samples::AbstractVector; normalize = true) =
244+
W1(U_samples::AbstractMatrix, v_samples::AbstractVector; normalize = false) =
245245
W1(vec(U_samples), v_samples; normalize = normalize)
246246

247-
W1(u_samples::AbstractVector, V_samples::AbstractMatrix; normalize = true) =
247+
W1(u_samples::AbstractVector, V_samples::AbstractMatrix; normalize = false) =
248248
W1(u_samples, vec(V_samples); normalize = normalize)
249249

250250
"""

0 commit comments

Comments
 (0)