Skip to content

[AUTO] JuliaFormatter.jl run #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[AUTO] JuliaFormatter.jl run #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions test/suite/solve/test_descriptive_routing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,14 @@ struct MockSolution2 <: CTModels.AbstractSolution
solver
end

CommonSolve.solve(::MockOCP2, ::CTModels.AbstractInitialGuess, d::RoutingMockDiscretizer, m::RoutingMockModeler, s::RoutingMockSolver; display::Bool)::MockSolution2 = MockSolution2(
d, m, s
)
CommonSolve.solve(
::MockOCP2,
::CTModels.AbstractInitialGuess,
d::RoutingMockDiscretizer,
m::RoutingMockModeler,
s::RoutingMockSolver;
display::Bool,
)::MockSolution2 = MockSolution2(d, m, s)

# ============================================================================
# Test function
Expand Down
4 changes: 3 additions & 1 deletion test/suite/solve/test_explicit.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ struct MockSolver <: CTSolvers.AbstractNLPSolver
options::CTSolvers.StrategyOptions
end

CommonSolve.solve(::MockOCP, ::MockInit, ::MockDiscretizer, ::MockModeler, ::MockSolver; display::Bool)::MockSolution = MockSolution()
CommonSolve.solve(
::MockOCP, ::MockInit, ::MockDiscretizer, ::MockModeler, ::MockSolver; display::Bool
)::MockSolution = MockSolution()

function test_explicit()
Test.@testset "solve_explicit (contract tests with mocks)" verbose=VERBOSE showtiming=SHOWTIMING begin
Expand Down
13 changes: 11 additions & 2 deletions test/suite/solve/test_orchestration.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,21 @@ struct MockSolver <: CTSolvers.AbstractNLPSolver
end

# Short-circuit Layer 3 for mocks (explicit mode: typed mock components)
CommonSolve.solve(::MockOCP, ::MockInit, ::MockDiscretizer, ::MockModeler, ::MockSolver; display::Bool)::MockSolution = MockSolution()
CommonSolve.solve(
::MockOCP, ::MockInit, ::MockDiscretizer, ::MockModeler, ::MockSolver; display::Bool
)::MockSolution = MockSolution()

# Short-circuit Layer 3 for mocks (descriptive mode: real abstract component types)
# solve_descriptive builds real CTDirect.Collocation, CTSolvers.ADNLP, etc.
# This override catches those calls for MockOCP without running a real solver.
CommonSolve.solve(::MockOCP, ::CTModels.AbstractInitialGuess, ::CTDirect.AbstractDiscretizer, ::CTSolvers.AbstractNLPModeler, ::CTSolvers.AbstractNLPSolver; display::Bool)::MockSolution = MockSolution()
CommonSolve.solve(
::MockOCP,
::CTModels.AbstractInitialGuess,
::CTDirect.AbstractDiscretizer,
::CTSolvers.AbstractNLPModeler,
::CTSolvers.AbstractNLPSolver;
display::Bool,
)::MockSolution = MockSolution()

# ============================================================================
# TOP-LEVEL: Real test problems for integration tests
Expand Down