Revert tversky_loss changes

FluxML · Aug 16, 2022 · f49ec34 · f49ec34
1 parent a67400f
commit f49ec34
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/src/losses/functions.jl b/src/losses/functions.jl
@@ -516,26 +516,12 @@ Calculated as:
 
     1 - sum(|y .* ŷ| + 1) / (sum(y .* ŷ + (1 - β)*(1 .- y) .* ŷ + β*y .* (1 .- ŷ)) + 1)
 
-# Example
-```jldoctest
-julia> y = [0, 1, 0, 1, 1, 1];
-
-julia> ŷ_fp = [1, 1, 1, 1, 1, 1];  # 2 false positive -> 2 wrong predictions
-
-julia> ŷ_fnp = [1, 1, 0, 1, 1, 0];  # 1 false negative, 1 false positive -> 2 wrong predictions
-
-julia> Flux.tversky_loss(ŷ_fnp, y)
-0.19999999999999996
-
-julia> Flux.tversky_loss(ŷ_fp, y) < Flux.tversky_loss(ŷ_fnp, y)  # FN is given more weight
-true
-```
 """
 function tversky_loss(ŷ, y; β = ofeltype(ŷ, 0.7))
     _check_sizes(ŷ, y)
     #TODO add agg
     num = sum(y .* ŷ) + 1
-    den = sum(y .* ŷ + (1 - β) * (1 .- y) .* ŷ + β * y .* (1 .- ŷ)) + 1
+    den = sum(y .* ŷ + β * (1 .- y) .* ŷ + (1 - β) * y .* (1 .- ŷ)) + 1
     1 - num / den
 end
 

diff --git a/test/losses.jl b/test/losses.jl
@@ -163,8 +163,8 @@ y = [1.0 0.5 0.3 2.4]
 end
 
 @testset "tversky_loss" begin
-  @test Flux.tversky_loss(ŷ, y) ≈ 0.028747433264887046
-  @test Flux.tversky_loss(ŷ, y, β=0.8) ≈ 0.050200803212851364
+  @test Flux.tversky_loss(ŷ, y) ≈ -0.06772009029345383
+  @test Flux.tversky_loss(ŷ, y, β=0.8) ≈ -0.09490740740740744
   @test Flux.tversky_loss(y, y) ≈ -0.5576923076923075
 end