From 15c7b59df2f2bf28cf7ecacb2d0c0267e338868b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Riedemann?= <38795484+longemen3000@users.noreply.github.com> Date: Thu, 26 Dec 2024 01:04:16 -0300 Subject: [PATCH 1/2] Update Project.toml --- Project.toml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index 1bbdf3e..50bbfc5 100644 --- a/Project.toml +++ b/Project.toml @@ -7,13 +7,11 @@ version = "0.1.6" BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e" ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" SymbolicTracingUtils = "77ddf47f-b2ab-4ded-95ee-54f4fa148129" TrajectoryGamesBase = "ac1ac542-73eb-4349-ae1b-660ab3609574" -Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [compat] BlockArrays = "0.16.43, 1" @@ -27,3 +25,11 @@ SymbolicTracingUtils = "0.1.1" TrajectoryGamesBase = "0.3.10" Zygote = "0.6.73" julia = "1.11" + +[extras] +FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" + +[targets] +test = ["FiniteDiff", "Test", "Zygote"] From ca6c5119b4108b38ccad576332692c4ba95aab40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Riedemann?= <38795484+longemen3000@users.noreply.github.com> Date: Thu, 26 Dec 2024 01:13:22 -0300 Subject: [PATCH 2/2] remove TrajectoryGamesBase dep --- Project.toml | 2 -- src/MixedComplementarityProblems.jl | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Project.toml b/Project.toml index 50bbfc5..8934e13 100644 --- a/Project.toml +++ b/Project.toml @@ -11,7 +11,6 @@ ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" SymbolicTracingUtils = "77ddf47f-b2ab-4ded-95ee-54f4fa148129" -TrajectoryGamesBase = "ac1ac542-73eb-4349-ae1b-660ab3609574" [compat] BlockArrays = "0.16.43, 1" @@ -22,7 +21,6 @@ ForwardDiff = "0.10.38" LinearAlgebra = "1.11.0" SparseArrays = "1.11.0" SymbolicTracingUtils = "0.1.1" -TrajectoryGamesBase = "0.3.10" Zygote = "0.6.73" julia = "1.11" diff --git a/src/MixedComplementarityProblems.jl b/src/MixedComplementarityProblems.jl index 0125f35..f3e7c80 100644 --- a/src/MixedComplementarityProblems.jl +++ b/src/MixedComplementarityProblems.jl @@ -2,10 +2,11 @@ module MixedComplementarityProblems using SparseArrays: SparseArrays using LinearAlgebra: LinearAlgebra, I, norm, eigvals -using BlockArrays: blocks, blocksizes -using TrajectoryGamesBase: to_blockvector +using BlockArrays: blocks, blocksizes, BlockArray using SymbolicTracingUtils: SymbolicTracingUtils as SymbolicTracingUtils +to_blockvector(block_dimensions) = Base.Fix2(BlockArray,block_dimensions) + include("mcp.jl") include("solver.jl") include("game.jl")