Made many revisions. Still some to go

julia/make_plots.jl

@@ -3,18 +3,20 @@ using PlotlyJS: savefig
 
 a = ∛(Sun.μ * ( year/2π )^2 )
 start = [ oe_to_xyz([ a, 0., 0., 0., 0., 0.5 ], Sun.μ); 10_000. ]
-path = Thesis.prop(zeros(100,3), start, bepi, year)[1]
+path = Thesis.prop(zeros(100,3), start, bepi, year)
 p = Thesis.plot([path],
-                colors=["#0FF"],
-                title="Single LaGuerre-Conway-Propagated Orbit")
+                colors=["#F0F"],
+                title="Single LaGuerre-Conway-Propagated Orbit",
+                mode="light")
 savefig(p, "LaTeX/fig/laguerre_plot.png")
 
 t = 5year
 spiral_sc = Sc("test", 1000., 2000., 0.0005, 50, 0.9)
 start = [ oe_to_xyz([ 0.7a, 0.05, 0.1, 0., 0., 0.5 ], Sun.μ); 100_000. ]
 spiral_thrust = spiral(0.2, 100_000, start, spiral_sc, t)
-spiral_path = Thesis.prop(spiral_thrust, start, spiral_sc, t)[1]
+spiral_path = Thesis.prop(spiral_thrust, start, spiral_sc, t)
 p = Thesis.plot([spiral_path],
-                colors=["#0FF"],
-                title="Spiral Orbit")
+                colors=["#F0F"],
+                title="Spiral Orbit",
+                mode="light")
 savefig(p, "LaTeX/fig/spiral_plot.png")

julia/src/utilities/conversions.jl

@@ -132,7 +132,7 @@ function conv_T(Tm::Vector{Float64},
            si*sθ          si*cθ           ci      ]
     Tx, Ty, Tz = DCM*thrust_rθh
 
-    state = prop_one([Tx, Ty, Tz], state, craft, time/n, primary)
+    state = prop([Tx Ty Tz], state, craft, time/n, primary=primary)[2,:]
     push!(Txs, Tx)
     push!(Tys, Ty)
     push!(Tzs, Tz)

julia/src/utilities/plotting.jl

@@ -286,7 +286,7 @@ function plot(paths::Vector{Matrix{Real}};
   traces = [ trace... ]
   for i = 2:length(paths)
     color = colors === nothing ? random_color() : colors[i]
-    trace, new_limit = gen_plot(paths[i],label=labels[i],color=color,markers=markers)
+    trace, new_limit = gen_plot(paths[i],label=labels[i],color=colors[i],markers=markers)
     push!(traces, trace...)
     limit = max(limit, new_limit)
   end

julia/src/utilities/propagator.jl

@@ -20,7 +20,7 @@ function prop(ΔVs::AbstractArray,
               time::Real;
               primary::Body=Sun)
 
-  size(ΔVs)[2] == 3 || throw(ΔVsize_Error(size(ΔVs)))
+  size(ΔVs)[2] == 3 || throw(ΔVsize_Error(size(ΔVs)[1]))
   n = size(ΔVs)[1]
   output = Array{Real,2}(undef,n+1,7)
   current = copy(state)