diff --git a/julia/src/Thesis.jl b/julia/src/Thesis.jl index a96a9ca..9f863d8 100644 --- a/julia/src/Thesis.jl +++ b/julia/src/Thesis.jl @@ -15,7 +15,6 @@ module Thesis using PlotlyJS using Distributed - include("./errors.jl") include("./constants.jl") include("./spacecraft.jl") diff --git a/julia/test/inner_loop/phase.jl b/julia/test/inner_loop/phase.jl index 8acf38e..5ea7978 100644 --- a/julia/test/inner_loop/phase.jl +++ b/julia/test/inner_loop/phase.jl @@ -7,7 +7,7 @@ # First we'll test an Earth case # Initial Setup T = rand( 8hour : second : day ) - revs = 3 + revs = 8 n = 10 * revs start_mass = 10_000. @@ -39,19 +39,20 @@ # Now the sun case T = rand( 0.5year : hour : 1.5year ) + tof = 0.7T n = 20 start_mass = 12_000. # A simple orbit raising again, to keep things simple start = gen_orbit(T, start_mass) - thrust = spiral(0.6, n, start, bepi, revs*T) - final = prop(thrust, start, bepi, revs*T)[2] + thrust = spiral(0.6, n, start, bepi, tof) + final = prop(thrust, start, bepi, tof)[2] new_T = 2π * √( xyz_to_oe(final, Sun.μ)[1]^3 / Sun.μ ) # This should be close enough to converge - thrust_guess = spiral(0.55, n, start, bepi, revs*T) - result = solve_phase(start, final, bepi, revs*T, thrust_guess) - calc_path, calc_final = prop(result.zero, start, bepi, revs*T, interpolate=true) + thrust_guess = spiral(0.55, n, start, bepi, tof) + result = solve_phase(start, final, bepi, tof, thrust_guess) + calc_path, calc_final = prop(result.zero, start, bepi, tof, interpolate=true) # Test @test converged(result) diff --git a/julia/test/runtests.jl b/julia/test/runtests.jl index 9dbd4d7..7dcbc8d 100644 --- a/julia/test/runtests.jl +++ b/julia/test/runtests.jl @@ -4,7 +4,6 @@ using LinearAlgebra using SPICE using Thesis -# Tests @testset "All Tests" begin include("plotting.jl") include("inner_loop/laguerre-conway.jl") @@ -12,5 +11,3 @@ using Thesis include("inner_loop/phase.jl") # include("inner_loop/monotonic_basin_hopping.jl") end - -print()