Merge pull request #97 from axelparmentier/fix-fyl-gm

Fix missing kwargs in FenchelYoungLoss with generalized maximizer

Author: BatyLeo

src/imitation/fenchel_young_loss.jl

@@ -141,7 +141,7 @@ function fenchel_young_F_and_first_part_of_grad(
     η = θ .+ ε .* Z
     y = oracle(η; kwargs...)
     F = objective_value(oracle, η, y; kwargs...)
-    return F, oracle.g(y)
+    return F, oracle.g(y; kwargs...)
 end
 
 function fenchel_young_F_and_first_part_of_grad(
@@ -165,5 +165,5 @@ function fenchel_young_F_and_first_part_of_grad(
     y = oracle(η; kwargs...)
     F = objective_value(oracle, η, y; kwargs...)
     y_scaled = y .* eZ
-    return F, oracle.g(y_scaled)
+    return F, oracle.g(y_scaled; kwargs...)
 end

test/InferOptTestUtils/src/maximizers.jl

@@ -12,7 +12,7 @@ function max_pricing(θ::AbstractVector; instance::AbstractMatrix)
     return weights .>= 0
 end
 
-g(y; kwargs...) = vec(sum(y; dims=2))
+g(y; instance, kwargs...) = vec(sum(y; dims=2))
 h(y; instance) = -sum(dij * yij for (dij, yij) in zip(instance, y))
 
 identity_kw(x; kwargs...) = identity(x)

test/generalized_maximizer.jl

@@ -19,7 +19,7 @@
 
     val = InferOpt.objective_value(generalized_maximizer, θ, y; instance)
 
-    @test val == θ' * g(y) + h(y; instance)
+    @test val == θ' * g(y; instance) + h(y; instance)
 end
 
 @testitem "Generalized maximizer - imit - MSE PerturbedAdditive" default_imports = false begin