diff --git a/figs/dt0.0001-a0-altitudes.jpg b/figs/dt0.0001-a0-altitudes.jpg deleted file mode 100644 index b85e6fb..0000000 Binary files a/figs/dt0.0001-a0-altitudes.jpg and /dev/null differ diff --git a/figs/dt0.0001-a0-angles.jpg b/figs/dt0.0001-a0-angles.jpg deleted file mode 100644 index f455617..0000000 Binary files a/figs/dt0.0001-a0-angles.jpg and /dev/null differ diff --git a/figs/dt0.0001-a1-altitudes.jpg b/figs/dt0.0001-a1-altitudes.jpg deleted file mode 100644 index bdb1602..0000000 Binary files a/figs/dt0.0001-a1-altitudes.jpg and /dev/null differ diff --git a/figs/dt0.0001-a1-angles.jpg b/figs/dt0.0001-a1-angles.jpg deleted file mode 100644 index b69214a..0000000 Binary files a/figs/dt0.0001-a1-angles.jpg and /dev/null differ diff --git a/figs/dt0.0001-a2-altitudes.jpg b/figs/dt0.0001-a2-altitudes.jpg deleted file mode 100644 index 108192d..0000000 Binary files a/figs/dt0.0001-a2-altitudes.jpg and /dev/null differ diff --git a/figs/dt0.0001-a2-angles.jpg b/figs/dt0.0001-a2-angles.jpg deleted file mode 100644 index fc04456..0000000 Binary files a/figs/dt0.0001-a2-angles.jpg and /dev/null differ diff --git a/figs/dt0.0001-a3-altitudes.jpg b/figs/dt0.0001-a3-altitudes.jpg deleted file mode 100644 index fcd07d7..0000000 Binary files a/figs/dt0.0001-a3-altitudes.jpg and /dev/null differ diff --git a/figs/dt0.0001-a3-angles.jpg b/figs/dt0.0001-a3-angles.jpg deleted file mode 100644 index aa3b770..0000000 Binary files a/figs/dt0.0001-a3-angles.jpg and /dev/null differ diff --git a/figs/dt0.0001-a4-altitudes.jpg b/figs/dt0.0001-a4-altitudes.jpg deleted file mode 100644 index 6510b00..0000000 Binary files a/figs/dt0.0001-a4-altitudes.jpg and /dev/null differ diff --git a/figs/dt0.0001-a4-angles.jpg b/figs/dt0.0001-a4-angles.jpg deleted file mode 100644 index 428ab34..0000000 Binary files a/figs/dt0.0001-a4-angles.jpg and /dev/null differ diff --git a/figs/dt0.0001-a5-altitudes.jpg b/figs/dt0.0001-a5-altitudes.jpg deleted file mode 100644 index ba1de64..0000000 Binary files a/figs/dt0.0001-a5-altitudes.jpg and /dev/null differ diff --git a/figs/dt0.0001-a5-angles.jpg b/figs/dt0.0001-a5-angles.jpg deleted file mode 100644 index a11a5c8..0000000 Binary files a/figs/dt0.0001-a5-angles.jpg and /dev/null differ diff --git a/figs/dt0.0001-a6-altitudes.jpg b/figs/dt0.0001-a6-altitudes.jpg deleted file mode 100644 index eaac0c8..0000000 Binary files a/figs/dt0.0001-a6-altitudes.jpg and /dev/null differ diff --git a/figs/dt0.0001-a6-angles.jpg b/figs/dt0.0001-a6-angles.jpg deleted file mode 100644 index 172cd88..0000000 Binary files a/figs/dt0.0001-a6-angles.jpg and /dev/null differ diff --git a/figs/dt0.0001-a7-altitudes.jpg b/figs/dt0.0001-a7-altitudes.jpg deleted file mode 100644 index 630584c..0000000 Binary files a/figs/dt0.0001-a7-altitudes.jpg and /dev/null differ diff --git a/figs/dt0.0001-a7-angles.jpg b/figs/dt0.0001-a7-angles.jpg deleted file mode 100644 index e9fcfaf..0000000 Binary files a/figs/dt0.0001-a7-angles.jpg and /dev/null differ diff --git a/figs/dt0.0001-a8-altitudes.jpg b/figs/dt0.0001-a8-altitudes.jpg deleted file mode 100644 index 0f76dda..0000000 Binary files a/figs/dt0.0001-a8-altitudes.jpg and /dev/null differ diff --git a/figs/dt0.0001-a8-angles.jpg b/figs/dt0.0001-a8-angles.jpg deleted file mode 100644 index 1c69791..0000000 Binary files a/figs/dt0.0001-a8-angles.jpg and /dev/null differ diff --git a/figs/dt0.0001-a9-altitudes.jpg b/figs/dt0.0001-a9-altitudes.jpg deleted file mode 100644 index c8dbcad..0000000 Binary files a/figs/dt0.0001-a9-altitudes.jpg and /dev/null differ diff --git a/figs/dt0.0001-a9-angles.jpg b/figs/dt0.0001-a9-angles.jpg deleted file mode 100644 index 139416f..0000000 Binary files a/figs/dt0.0001-a9-angles.jpg and /dev/null differ diff --git a/figs/dt0.0001-alt-time.jpg b/figs/dt0.0001-alt-time.jpg deleted file mode 100644 index cd55fe5..0000000 Binary files a/figs/dt0.0001-alt-time.jpg and /dev/null differ diff --git a/figs/dt0.0001-altitudes.jpg b/figs/dt0.0001-altitudes.jpg deleted file mode 100644 index 6ccd746..0000000 Binary files a/figs/dt0.0001-altitudes.jpg and /dev/null differ diff --git a/figs/dt0.0001-angles.jpg b/figs/dt0.0001-angles.jpg deleted file mode 100644 index 78329f6..0000000 Binary files a/figs/dt0.0001-angles.jpg and /dev/null differ diff --git a/figs/dt0.0001-az-time.jpg b/figs/dt0.0001-az-time.jpg deleted file mode 100644 index 44aedc6..0000000 Binary files a/figs/dt0.0001-az-time.jpg and /dev/null differ diff --git a/figs/dt0.0001-fd-time.jpg b/figs/dt0.0001-fd-time.jpg deleted file mode 100644 index d18e8a0..0000000 Binary files a/figs/dt0.0001-fd-time.jpg and /dev/null differ diff --git a/figs/dt0.0001-lr-altitude.jpg b/figs/dt0.0001-lr-altitude.jpg deleted file mode 100644 index 22ec4ef..0000000 Binary files a/figs/dt0.0001-lr-altitude.jpg and /dev/null differ diff --git a/figs/dt0.0001-lr-angle.jpg b/figs/dt0.0001-lr-angle.jpg deleted file mode 100644 index eedc56f..0000000 Binary files a/figs/dt0.0001-lr-angle.jpg and /dev/null differ diff --git a/figs/dt0.0001-position-time.jpg b/figs/dt0.0001-position-time.jpg deleted file mode 100644 index ba56e25..0000000 Binary files a/figs/dt0.0001-position-time.jpg and /dev/null differ diff --git a/figs/dt0.0001-ratios.jpg b/figs/dt0.0001-ratios.jpg deleted file mode 100644 index e87cc16..0000000 Binary files a/figs/dt0.0001-ratios.jpg and /dev/null differ diff --git a/figs/dt0.0001-speed-time.jpg b/figs/dt0.0001-speed-time.jpg deleted file mode 100644 index d97df97..0000000 Binary files a/figs/dt0.0001-speed-time.jpg and /dev/null differ diff --git a/figs/dt0.0001-vx-time.jpg b/figs/dt0.0001-vx-time.jpg deleted file mode 100644 index cb97063..0000000 Binary files a/figs/dt0.0001-vx-time.jpg and /dev/null differ diff --git a/figs/dt0.0001-vz-time.jpg b/figs/dt0.0001-vz-time.jpg deleted file mode 100644 index 623c1f4..0000000 Binary files a/figs/dt0.0001-vz-time.jpg and /dev/null differ diff --git a/figs/dt0.0001-x-z.jpg b/figs/dt0.0001-x-z.jpg deleted file mode 100644 index f12c6f1..0000000 Binary files a/figs/dt0.0001-x-z.jpg and /dev/null differ diff --git a/figs/dt0.001-a0-altitudes.jpg b/figs/dt0.001-a0-altitudes.jpg new file mode 100644 index 0000000..95c92f9 Binary files /dev/null and b/figs/dt0.001-a0-altitudes.jpg differ diff --git a/figs/dt0.001-a0-angles.jpg b/figs/dt0.001-a0-angles.jpg new file mode 100644 index 0000000..ffed886 Binary files /dev/null and b/figs/dt0.001-a0-angles.jpg differ diff --git a/figs/dt0.001-a1-altitudes.jpg b/figs/dt0.001-a1-altitudes.jpg new file mode 100644 index 0000000..9d5a15f Binary files /dev/null and b/figs/dt0.001-a1-altitudes.jpg differ diff --git a/figs/dt0.001-a1-angles.jpg b/figs/dt0.001-a1-angles.jpg new file mode 100644 index 0000000..75f5480 Binary files /dev/null and b/figs/dt0.001-a1-angles.jpg differ diff --git a/figs/dt0.001-a2-altitudes.jpg b/figs/dt0.001-a2-altitudes.jpg new file mode 100644 index 0000000..61f2a24 Binary files /dev/null and b/figs/dt0.001-a2-altitudes.jpg differ diff --git a/figs/dt0.001-a2-angles.jpg b/figs/dt0.001-a2-angles.jpg new file mode 100644 index 0000000..9783cc1 Binary files /dev/null and b/figs/dt0.001-a2-angles.jpg differ diff --git a/figs/dt0.001-a3-altitudes.jpg b/figs/dt0.001-a3-altitudes.jpg new file mode 100644 index 0000000..5e260df Binary files /dev/null and b/figs/dt0.001-a3-altitudes.jpg differ diff --git a/figs/dt0.001-a3-angles.jpg b/figs/dt0.001-a3-angles.jpg new file mode 100644 index 0000000..fff7542 Binary files /dev/null and b/figs/dt0.001-a3-angles.jpg differ diff --git a/figs/dt0.001-a4-altitudes.jpg b/figs/dt0.001-a4-altitudes.jpg new file mode 100644 index 0000000..f31e544 Binary files /dev/null and b/figs/dt0.001-a4-altitudes.jpg differ diff --git a/figs/dt0.001-a4-angles.jpg b/figs/dt0.001-a4-angles.jpg new file mode 100644 index 0000000..86911ef Binary files /dev/null and b/figs/dt0.001-a4-angles.jpg differ diff --git a/figs/dt0.001-a5-altitudes.jpg b/figs/dt0.001-a5-altitudes.jpg new file mode 100644 index 0000000..fccfa0b Binary files /dev/null and b/figs/dt0.001-a5-altitudes.jpg differ diff --git a/figs/dt0.001-a5-angles.jpg b/figs/dt0.001-a5-angles.jpg new file mode 100644 index 0000000..a6b2f4d Binary files /dev/null and b/figs/dt0.001-a5-angles.jpg differ diff --git a/figs/dt0.001-a6-altitudes.jpg b/figs/dt0.001-a6-altitudes.jpg new file mode 100644 index 0000000..724da01 Binary files /dev/null and b/figs/dt0.001-a6-altitudes.jpg differ diff --git a/figs/dt0.001-a6-angles.jpg b/figs/dt0.001-a6-angles.jpg new file mode 100644 index 0000000..8705c5b Binary files /dev/null and b/figs/dt0.001-a6-angles.jpg differ diff --git a/figs/dt0.001-a7-altitudes.jpg b/figs/dt0.001-a7-altitudes.jpg new file mode 100644 index 0000000..3d4e7d3 Binary files /dev/null and b/figs/dt0.001-a7-altitudes.jpg differ diff --git a/figs/dt0.001-a7-angles.jpg b/figs/dt0.001-a7-angles.jpg new file mode 100644 index 0000000..df72957 Binary files /dev/null and b/figs/dt0.001-a7-angles.jpg differ diff --git a/figs/dt0.001-a8-altitudes.jpg b/figs/dt0.001-a8-altitudes.jpg new file mode 100644 index 0000000..874d59c Binary files /dev/null and b/figs/dt0.001-a8-altitudes.jpg differ diff --git a/figs/dt0.001-a8-angles.jpg b/figs/dt0.001-a8-angles.jpg new file mode 100644 index 0000000..9fa6751 Binary files /dev/null and b/figs/dt0.001-a8-angles.jpg differ diff --git a/figs/dt0.001-a9-altitudes.jpg b/figs/dt0.001-a9-altitudes.jpg new file mode 100644 index 0000000..e44637e Binary files /dev/null and b/figs/dt0.001-a9-altitudes.jpg differ diff --git a/figs/dt0.001-a9-angles.jpg b/figs/dt0.001-a9-angles.jpg new file mode 100644 index 0000000..d75ed82 Binary files /dev/null and b/figs/dt0.001-a9-angles.jpg differ diff --git a/figs/dt0.001-alt-time.jpg b/figs/dt0.001-alt-time.jpg new file mode 100644 index 0000000..d6ec827 Binary files /dev/null and b/figs/dt0.001-alt-time.jpg differ diff --git a/figs/dt0.001-altitudes.jpg b/figs/dt0.001-altitudes.jpg new file mode 100644 index 0000000..769ab4e Binary files /dev/null and b/figs/dt0.001-altitudes.jpg differ diff --git a/figs/dt0.001-angles.jpg b/figs/dt0.001-angles.jpg new file mode 100644 index 0000000..5d29246 Binary files /dev/null and b/figs/dt0.001-angles.jpg differ diff --git a/figs/dt0.001-az-time.jpg b/figs/dt0.001-az-time.jpg new file mode 100644 index 0000000..350f323 Binary files /dev/null and b/figs/dt0.001-az-time.jpg differ diff --git a/figs/dt0.001-fd-time.jpg b/figs/dt0.001-fd-time.jpg new file mode 100644 index 0000000..6bc81f7 Binary files /dev/null and b/figs/dt0.001-fd-time.jpg differ diff --git a/figs/dt0.001-lr-altitude.jpg b/figs/dt0.001-lr-altitude.jpg new file mode 100644 index 0000000..879aafc Binary files /dev/null and b/figs/dt0.001-lr-altitude.jpg differ diff --git a/figs/dt0.001-lr-angle.jpg b/figs/dt0.001-lr-angle.jpg new file mode 100644 index 0000000..f46bc8f Binary files /dev/null and b/figs/dt0.001-lr-angle.jpg differ diff --git a/figs/dt0.001-position-time.jpg b/figs/dt0.001-position-time.jpg new file mode 100644 index 0000000..f01ec63 Binary files /dev/null and b/figs/dt0.001-position-time.jpg differ diff --git a/figs/dt0.001-ratios.jpg b/figs/dt0.001-ratios.jpg new file mode 100644 index 0000000..3838f1f Binary files /dev/null and b/figs/dt0.001-ratios.jpg differ diff --git a/figs/dt0.001-speed-time.jpg b/figs/dt0.001-speed-time.jpg new file mode 100644 index 0000000..138c61e Binary files /dev/null and b/figs/dt0.001-speed-time.jpg differ diff --git a/figs/dt0.001-vx-time.jpg b/figs/dt0.001-vx-time.jpg new file mode 100644 index 0000000..6d6bfd1 Binary files /dev/null and b/figs/dt0.001-vx-time.jpg differ diff --git a/figs/dt0.001-vz-time.jpg b/figs/dt0.001-vz-time.jpg new file mode 100644 index 0000000..0ef0a96 Binary files /dev/null and b/figs/dt0.001-vz-time.jpg differ diff --git a/figs/dt0.001-x-z.jpg b/figs/dt0.001-x-z.jpg new file mode 100644 index 0000000..4dedc43 Binary files /dev/null and b/figs/dt0.001-x-z.jpg differ diff --git a/out/README.md b/out/README.md index 99714e5..292ccc4 100644 --- a/out/README.md +++ b/out/README.md @@ -1,4 +1,27 @@ # Simulation data output Since running the simulation is costly here we provide the data gathered by the simulaiton so that it can be easily loaded and inspected. -- [ ] add the data structure +The output data inclues: + +``` +how = { + 't': data.t[0:I_land_BEST], + 'z': data.z[0:I_land_BEST], + 'vz': data.vz[0:I_land_BEST], + 'az': data.az[0:I_land_BEST], + 'x': data.x[0:I_land_BEST], + 'vx': data.vx[0:I_land_BEST], + 'Fd': data.Fd[0:I_land_BEST] +} +results = { + 'dt': dt, + 'launch_ratio': launch_ratio_BEST, + 'i_land': I_land_BEST, + 'takeoff_angle': takeoff_angle_BEST, + 'max_discovered_vx': MaxDiscoveredVx, + 'landing_burn_altitude': landingBurnAltitude_BEST, +} +# ratios: fuel ratios tested. +data = (results, how, ratios, attempts_history) + +``` diff --git a/out/optimal.pickle b/out/dt1e-3.save similarity index 70% rename from out/optimal.pickle rename to out/dt1e-3.save index 612182b..0cb8a52 100644 Binary files a/out/optimal.pickle and b/out/dt1e-3.save differ diff --git a/simulation.py b/simulation.py index 854cae5..2fc4ecc 100644 --- a/simulation.py +++ b/simulation.py @@ -445,7 +445,7 @@ def simulate(): print("Landing Burn Altitude = {}\n".format(landingBurnAltitude_BEST)) else: # load the data - print('loadig simulation data..') + print('loading simulation data..') (results, how, ratios, attempts_history) = load(args.load) dt = results['dt'] @@ -530,9 +530,11 @@ def simulate(): plt.savefig(f'figs/dt{dt}-position-time.jpg') plt.close() -plt.plot(x, z) -plt.xlabel('Horizontal Pos') -plt.ylabel("Vertical Pos") +x_km = x[:] / 1000 +z_km = z[:] / 1000 +plt.plot(x_km, z_km) +plt.xlabel('Horizontal Position (km)') +plt.ylabel('Altitude (km)') plt.title("X vs Z") plt.axis('equal') plt.legend() @@ -553,12 +555,12 @@ def simulate(): best_altitudes = [] for attempt, (angles, altitudes) in enumerate(attempts_history): best_angle = angles[-1] *10000 - best_alt = altitudes[-1] + best_alt = altitudes[-1] /1000 # convert it to km best_angles.append(best_angle) best_altitudes.append(best_alt) r1 = ratios[:] -r1, best_altitude = sort_two_lists(r1, best_altitudes) +r1, best_altitudes = sort_two_lists(r1, best_altitudes) plt.plot(r1, best_altitudes) plt.scatter(r1, best_altitudes) plt.xlabel('Launch ratio') @@ -572,13 +574,13 @@ def simulate(): plt.plot(r2, best_angles) plt.scatter(r2, best_angles) plt.xlabel('Launch ratio') -plt.ylabel("Best takeoff angle (*1e+4)") +plt.ylabel("Solved takeoff angle (1e-4 radians)") plt.title("Launch Ratio vs Takeoff Angle ") plt.savefig(f'figs/dt{dt}-lr-angle.jpg') plt.close() plot_attempts(ratios, f'dt{dt}-ratios.jpg', - ylabel='landing burn altitude', title='Explored ratios') + ylabel='Fuel takeoff ratio', title='Explored ratios') plt.close() @@ -608,5 +610,5 @@ def simulate(): title=f'Landing Burn Altitude State Space Exploration') plot_batch_attempts(angles_arr, ratios, fname=f'dt{dt}-angles.jpg', - ylabel='Takeoff angle (*1e+4)', + ylabel='Takeoff angle (1e-4 radians)', title=f'Takeoff Angle State Space Exploration')