From 8e8a23c52a06304bf838b0b535b6de812f6396b2 Mon Sep 17 00:00:00 2001 From: Connor Date: Sun, 26 Sep 2021 12:55:08 -0600 Subject: [PATCH] Fixed the namespace warning --- julia/Manifest.toml | 40 ------------------- julia/Project.toml | 1 - julia/src/Thesis.jl | 1 + .../src/inner_loop/monotonic_basin_hopping.jl | 10 ++--- julia/src/lamberts.jl | 2 - julia/src/mission.jl | 2 - .../inner_loop/monotonic_basin_hopping.jl | 2 +- julia/test/runtests.jl | 1 + 8 files changed, 7 insertions(+), 52 deletions(-) diff --git a/julia/Manifest.toml b/julia/Manifest.toml index 0d4e7e0..63a9eb8 100644 --- a/julia/Manifest.toml +++ b/julia/Manifest.toml @@ -169,12 +169,6 @@ git-tree-sha1 = "3ed8fa7178a10d1cd0f1ca524f249ba6937490c0" uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" version = "1.3.0" -[[Distances]] -deps = ["LinearAlgebra", "Statistics", "StatsAPI"] -git-tree-sha1 = "abe4ad222b26af3337262b8afb28fab8d215e9f8" -uuid = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" -version = "0.10.3" - [[Distributed]] deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" @@ -353,12 +347,6 @@ git-tree-sha1 = "432428df5f360964040ed60418dd5601ecd240b6" uuid = "093fc24a-ae57-5d10-9952-331d41423f4d" version = "1.3.5" -[[LineSearches]] -deps = ["LinearAlgebra", "NLSolversBase", "NaNMath", "Parameters", "Printf"] -git-tree-sha1 = "f27132e551e959b3667d8c93eae90973225032dd" -uuid = "d3d80556-e9d4-5f37-9878-2ab0fcc64255" -version = "7.1.1" - [[LinearAlgebra]] deps = ["Libdl"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" @@ -440,18 +428,6 @@ git-tree-sha1 = "82dfb2cead9895e10ee1b0ca37a01088456c4364" uuid = "a975b10e-0019-58db-a62f-e48ff68538c9" version = "0.7.6" -[[NLSolversBase]] -deps = ["DiffResults", "Distributed", "FiniteDiff", "ForwardDiff"] -git-tree-sha1 = "144bab5b1443545bc4e791536c9f1eacb4eed06a" -uuid = "d41bc354-129a-5804-8e4c-c37616107c6c" -version = "7.8.1" - -[[NLsolve]] -deps = ["Distances", "LineSearches", "LinearAlgebra", "NLSolversBase", "Printf", "Reexport"] -git-tree-sha1 = "019f12e9a1a7880459d0173c182e6a99365d7ac1" -uuid = "2774e3e8-f4cf-5e23-947b-6d7e65073b56" -version = "4.5.1" - [[NaNMath]] git-tree-sha1 = "bfe47e760d60b82b66b61d2d44128b62e3a369fb" uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" @@ -482,12 +458,6 @@ git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" version = "1.4.1" -[[Parameters]] -deps = ["OrderedCollections", "UnPack"] -git-tree-sha1 = "2276ac65f1e236e0a6ea70baff3f62ad4c625345" -uuid = "d96e819e-fc66-5662-9728-84c9c7592b0a" -version = "0.12.2" - [[Parsers]] deps = ["Dates"] git-tree-sha1 = "438d35d2d95ae2c5e8780b330592b6de8494e779" @@ -618,11 +588,6 @@ version = "1.2.12" deps = ["LinearAlgebra", "SparseArrays"] uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" -[[StatsAPI]] -git-tree-sha1 = "1958272568dc176a1d881acb797beb909c785510" -uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" -version = "1.0.0" - [[TOML]] deps = ["Dates"] uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76" @@ -668,11 +633,6 @@ version = "1.3.0" deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" -[[UnPack]] -git-tree-sha1 = "387c1f73762231e86e0c9c5443ce3b4a0a9a0c2b" -uuid = "3a884ed6-31ef-47d7-9d2a-63182c4928ed" -version = "1.0.2" - [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" diff --git a/julia/Project.toml b/julia/Project.toml index f437e32..5a3549f 100644 --- a/julia/Project.toml +++ b/julia/Project.toml @@ -8,7 +8,6 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" -NLsolve = "2774e3e8-f4cf-5e23-947b-6d7e65073b56" PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5" PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" diff --git a/julia/src/Thesis.jl b/julia/src/Thesis.jl index b9cdedf..fd82220 100644 --- a/julia/src/Thesis.jl +++ b/julia/src/Thesis.jl @@ -5,6 +5,7 @@ module Thesis using PlotlyJS using Distributed using SPICE + using Dates: DateTime, Millisecond, Dates try furnsh("../../spice_files/naif0012.tls") diff --git a/julia/src/inner_loop/monotonic_basin_hopping.jl b/julia/src/inner_loop/monotonic_basin_hopping.jl index 3d8003a..2995c07 100644 --- a/julia/src/inner_loop/monotonic_basin_hopping.jl +++ b/julia/src/inner_loop/monotonic_basin_hopping.jl @@ -1,5 +1,3 @@ -using Dates - export mbh """ @@ -40,7 +38,7 @@ Returns a random date between two dates """ function gen_date(date_range::Tuple{DateTime, DateTime}) l0, lf = date_range - l0 + Dates.Millisecond(floor(rand()*(lf-l0).value)) + l0 + Millisecond(floor(rand()*(lf-l0).value)) end """ @@ -48,7 +46,7 @@ Returns a random amount of time in a range """ function gen_period(date_range::Tuple{DateTime, DateTime}) l0, lf = date_range - Dates.Millisecond(floor(rand()*(lf-l0).value)) + Millisecond(floor(rand()*(lf-l0).value)) end """ @@ -190,10 +188,10 @@ end function mbh( flybys::Vector{Body}, sc::Sc, start_mass::Float64, - launch_window::Pair{Date}, + launch_window::Tuple{DateTime, DateTime}, max_C3::Float64, max_v∞::Float64, - latest_arrival::Date, + latest_arrival::DateTime, primary::Body=Sun; search_patience::Int=1_000, drill_patience::Int=50) diff --git a/julia/src/lamberts.jl b/julia/src/lamberts.jl index 1ae7bfd..59114fa 100644 --- a/julia/src/lamberts.jl +++ b/julia/src/lamberts.jl @@ -1,5 +1,3 @@ -using Dates - """ I didn't want to have to write this...I'm going to try to do this as quickly as possible from old, bad code diff --git a/julia/src/mission.jl b/julia/src/mission.jl index c87508b..0284a6a 100644 --- a/julia/src/mission.jl +++ b/julia/src/mission.jl @@ -1,5 +1,3 @@ -using Dates - export Phase, Mission_Guess, Mission, Bad_Mission export test_phase1, test_phase2 export test_mission_guess, test_mission_guess_simple diff --git a/julia/test/inner_loop/monotonic_basin_hopping.jl b/julia/test/inner_loop/monotonic_basin_hopping.jl index 2d1ff4e..4d0641f 100644 --- a/julia/test/inner_loop/monotonic_basin_hopping.jl +++ b/julia/test/inner_loop/monotonic_basin_hopping.jl @@ -1,6 +1,6 @@ @testset "Monotonic Basin Hopping" begin - using PlotlyJS, NLsolve, Dates + using PlotlyJS println("Testing Monotonic Basin Hopper") diff --git a/julia/test/runtests.jl b/julia/test/runtests.jl index f86c16e..46ca670 100644 --- a/julia/test/runtests.jl +++ b/julia/test/runtests.jl @@ -3,6 +3,7 @@ using Random using LinearAlgebra using SPICE using Thesis +using Dates: DateTime, Dates try furnsh("../../spice_files/naif0012.tls")