Merge branch 'main' into generalized-maximizer

Author: BatyLeo

test/InferOptTestUtils/Manifest.toml

@@ -0,0 +1,14 @@
+name = "InferOptTestUtils"
+uuid = "da316ebf-0808-4679-97b0-38aabd8f7bf9"
+authors = ["Guillaume Dalle", "Léo Baty", "Louis Bouvier", "Axel Parmentier"]
+version = "0.1.0"
+
+[deps]
+Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
+Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
+GridGraphs = "dd2b58c7-5af7-4f17-9e46-57c68ac813fb"
+InferOpt = "4846b161-c94e-4150-8dac-c7ae193c601f"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"

test/InferOptTestUtils/Project.toml

@@ -13,8 +13,8 @@ include("const.jl")
 include("maximizers.jl")
 include("dataset.jl")
 include("error.jl")
-include("perf.jl")
 include("loss.jl")
+include("perf.jl")
 include("pipeline.jl")
 
 export DECREASE, EPOCHS, NB_FEATURES, NB_INSTANCES, NOISE_STD, VERBOSE

test/InferOptTestUtils/loss.jl

@@ -0,0 +1,15 @@
+abstract type PipelineLoss end
+
+struct PipelineLossExperience <: PipelineLoss end
+struct PipelineLossImitation <: PipelineLoss end
+struct PipelineLossImitationθ <: PipelineLoss end
+struct PipelineLossImitationθy <: PipelineLoss end
+struct PipelineLossImitationLoss <: PipelineLoss end
+
+get_loss(::PipelineLossExperience, loss, res, x, θ, y) = loss(res; instance=x)
+get_loss(::PipelineLossImitation, loss, res, x, θ, y) = loss(res, y; instance=x)
+get_loss(::PipelineLossImitationθ, loss, res, x, θ, y) = loss(res, θ; instance=x)
+get_loss(::PipelineLossImitationθy, loss, res, x, θ, y) = loss(res, θ, y; instance=x)
+function get_loss(::PipelineLossImitationLoss, loss, res, x, θ, y)
+    return loss(res, (; y_true=y, θ_true=θ); instance=x)
+end

…t/InferOptTestUtils/InferOptTestUtils.jl …ferOptTestUtils/src/InferOptTestUtils.jltest/InferOptTestUtils/InferOptTestUtils.jl renamed to test/InferOptTestUtils/src/InferOptTestUtils.jl test/InferOptTestUtils/InferOptTestUtils.jl renamed to test/InferOptTestUtils/src/InferOptTestUtils.jl

@@ -19,13 +19,15 @@ function generate_predictions(encoder, maximizer, X)
 end
 
 function update_perf!(
+    pl::PipelineLoss,
     perf_storage::NamedTuple;
     data_train,
     data_test,
     true_encoder,
     encoder,
     true_maximizer,
-    pipeline_loss,
+    maximizer,
+    loss,
     error_function,
     cost,
 )
@@ -42,8 +44,14 @@ function update_perf!(
     (X_train, thetas_train, Y_train) = data_train
     (X_test, thetas_test, Y_test) = data_test
 
-    train_loss = sum(pipeline_loss(x, θ, y) for (x, θ, y) in zip(data_train...))
-    test_loss = sum(pipeline_loss(x, θ, y) for (x, θ, y) in zip(data_test...))
+    train_loss = sum(
+        get_loss(pl, loss, maximizer(encoder(x); instance=x), x, θ, y) for
+        (x, θ, y) in zip(data_train...)
+    )
+    test_loss = sum(
+        get_loss(pl, loss, maximizer(encoder(x); instance=x), x, θ, y) for
+        (x, θ, y) in zip(data_test...)
+    )
 
     Y_train_pred = generate_predictions(encoder, true_maximizer, X_train)
     Y_test_pred = generate_predictions(encoder, true_maximizer, X_test)