updated some of the plot settings.

hamidzr · May 4, 2018 · bbafbb9 · bbafbb9
1 parent f8ae75e
commit bbafbb9
Show file tree

Hide file tree

Showing 69 changed files with 35 additions and 10 deletions.
diff --git a/figs/dt0.0001-a0-altitudes.jpg b/figs/dt0.0001-a0-altitudes.jpg
diff --git a/figs/dt0.0001-a0-angles.jpg b/figs/dt0.0001-a0-angles.jpg
diff --git a/figs/dt0.0001-a1-altitudes.jpg b/figs/dt0.0001-a1-altitudes.jpg
diff --git a/figs/dt0.0001-a1-angles.jpg b/figs/dt0.0001-a1-angles.jpg
diff --git a/figs/dt0.0001-a2-altitudes.jpg b/figs/dt0.0001-a2-altitudes.jpg
diff --git a/figs/dt0.0001-a2-angles.jpg b/figs/dt0.0001-a2-angles.jpg
diff --git a/figs/dt0.0001-a3-altitudes.jpg b/figs/dt0.0001-a3-altitudes.jpg
diff --git a/figs/dt0.0001-a3-angles.jpg b/figs/dt0.0001-a3-angles.jpg
diff --git a/figs/dt0.0001-a4-altitudes.jpg b/figs/dt0.0001-a4-altitudes.jpg
diff --git a/figs/dt0.0001-a4-angles.jpg b/figs/dt0.0001-a4-angles.jpg
diff --git a/figs/dt0.0001-a5-altitudes.jpg b/figs/dt0.0001-a5-altitudes.jpg
diff --git a/figs/dt0.0001-a5-angles.jpg b/figs/dt0.0001-a5-angles.jpg
diff --git a/figs/dt0.0001-a6-altitudes.jpg b/figs/dt0.0001-a6-altitudes.jpg
diff --git a/figs/dt0.0001-a6-angles.jpg b/figs/dt0.0001-a6-angles.jpg
diff --git a/figs/dt0.0001-a7-altitudes.jpg b/figs/dt0.0001-a7-altitudes.jpg
diff --git a/figs/dt0.0001-a7-angles.jpg b/figs/dt0.0001-a7-angles.jpg
diff --git a/figs/dt0.0001-a8-altitudes.jpg b/figs/dt0.0001-a8-altitudes.jpg
diff --git a/figs/dt0.0001-a8-angles.jpg b/figs/dt0.0001-a8-angles.jpg
diff --git a/figs/dt0.0001-a9-altitudes.jpg b/figs/dt0.0001-a9-altitudes.jpg
diff --git a/figs/dt0.0001-a9-angles.jpg b/figs/dt0.0001-a9-angles.jpg
diff --git a/figs/dt0.0001-alt-time.jpg b/figs/dt0.0001-alt-time.jpg
diff --git a/figs/dt0.0001-altitudes.jpg b/figs/dt0.0001-altitudes.jpg
diff --git a/figs/dt0.0001-angles.jpg b/figs/dt0.0001-angles.jpg
diff --git a/figs/dt0.0001-az-time.jpg b/figs/dt0.0001-az-time.jpg
diff --git a/figs/dt0.0001-fd-time.jpg b/figs/dt0.0001-fd-time.jpg
diff --git a/figs/dt0.0001-lr-altitude.jpg b/figs/dt0.0001-lr-altitude.jpg
diff --git a/figs/dt0.0001-lr-angle.jpg b/figs/dt0.0001-lr-angle.jpg
diff --git a/figs/dt0.0001-position-time.jpg b/figs/dt0.0001-position-time.jpg
diff --git a/figs/dt0.0001-ratios.jpg b/figs/dt0.0001-ratios.jpg
diff --git a/figs/dt0.0001-speed-time.jpg b/figs/dt0.0001-speed-time.jpg
diff --git a/figs/dt0.0001-vx-time.jpg b/figs/dt0.0001-vx-time.jpg
diff --git a/figs/dt0.0001-vz-time.jpg b/figs/dt0.0001-vz-time.jpg
diff --git a/figs/dt0.0001-x-z.jpg b/figs/dt0.0001-x-z.jpg
diff --git a/figs/dt0.001-a0-altitudes.jpg b/figs/dt0.001-a0-altitudes.jpg
diff --git a/figs/dt0.001-a0-angles.jpg b/figs/dt0.001-a0-angles.jpg
diff --git a/figs/dt0.001-a1-altitudes.jpg b/figs/dt0.001-a1-altitudes.jpg
diff --git a/figs/dt0.001-a1-angles.jpg b/figs/dt0.001-a1-angles.jpg
diff --git a/figs/dt0.001-a2-altitudes.jpg b/figs/dt0.001-a2-altitudes.jpg
diff --git a/figs/dt0.001-a2-angles.jpg b/figs/dt0.001-a2-angles.jpg
diff --git a/figs/dt0.001-a3-altitudes.jpg b/figs/dt0.001-a3-altitudes.jpg
diff --git a/figs/dt0.001-a3-angles.jpg b/figs/dt0.001-a3-angles.jpg
diff --git a/figs/dt0.001-a4-altitudes.jpg b/figs/dt0.001-a4-altitudes.jpg
diff --git a/figs/dt0.001-a4-angles.jpg b/figs/dt0.001-a4-angles.jpg
diff --git a/figs/dt0.001-a5-altitudes.jpg b/figs/dt0.001-a5-altitudes.jpg
diff --git a/figs/dt0.001-a5-angles.jpg b/figs/dt0.001-a5-angles.jpg
diff --git a/figs/dt0.001-a6-altitudes.jpg b/figs/dt0.001-a6-altitudes.jpg
diff --git a/figs/dt0.001-a6-angles.jpg b/figs/dt0.001-a6-angles.jpg
diff --git a/figs/dt0.001-a7-altitudes.jpg b/figs/dt0.001-a7-altitudes.jpg
diff --git a/figs/dt0.001-a7-angles.jpg b/figs/dt0.001-a7-angles.jpg
diff --git a/figs/dt0.001-a8-altitudes.jpg b/figs/dt0.001-a8-altitudes.jpg
diff --git a/figs/dt0.001-a8-angles.jpg b/figs/dt0.001-a8-angles.jpg
diff --git a/figs/dt0.001-a9-altitudes.jpg b/figs/dt0.001-a9-altitudes.jpg
diff --git a/figs/dt0.001-a9-angles.jpg b/figs/dt0.001-a9-angles.jpg
diff --git a/figs/dt0.001-alt-time.jpg b/figs/dt0.001-alt-time.jpg
diff --git a/figs/dt0.001-altitudes.jpg b/figs/dt0.001-altitudes.jpg
diff --git a/figs/dt0.001-angles.jpg b/figs/dt0.001-angles.jpg
diff --git a/figs/dt0.001-az-time.jpg b/figs/dt0.001-az-time.jpg
diff --git a/figs/dt0.001-fd-time.jpg b/figs/dt0.001-fd-time.jpg
diff --git a/figs/dt0.001-lr-altitude.jpg b/figs/dt0.001-lr-altitude.jpg
diff --git a/figs/dt0.001-lr-angle.jpg b/figs/dt0.001-lr-angle.jpg
diff --git a/figs/dt0.001-position-time.jpg b/figs/dt0.001-position-time.jpg
diff --git a/figs/dt0.001-ratios.jpg b/figs/dt0.001-ratios.jpg
diff --git a/figs/dt0.001-speed-time.jpg b/figs/dt0.001-speed-time.jpg
diff --git a/figs/dt0.001-vx-time.jpg b/figs/dt0.001-vx-time.jpg
diff --git a/figs/dt0.001-vz-time.jpg b/figs/dt0.001-vz-time.jpg
diff --git a/figs/dt0.001-x-z.jpg b/figs/dt0.001-x-z.jpg
diff --git 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 → out/dt1e-3.save b/out/optimal.pickle → out/dt1e-3.save
diff --git 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')