Skip to content

Commit

Permalink
Merge pull request #49 from larshinueber/feature/specify-env
Browse files Browse the repository at this point in the history
Fix dependencies in environment and rerun all examples
  • Loading branch information
DominicDirkx authored Sep 3, 2024
2 parents 084e1d2 + 57bfcd5 commit 7f88ddb
Show file tree
Hide file tree
Showing 24 changed files with 547 additions and 346 deletions.
21 changes: 21 additions & 0 deletions environment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# dependencies fixed for reproducibility
name: tudat-examples
channels:
- conda-forge
- tudat-team
dependencies:
- tudatpy=0.8.0
- boost-cpp=1.78.0 # for Tudat compatibility with pygmo
- matplotlib=3.9.1
- scipy=1.14.1
- pandas=2.2.2
- astropy=6.1.2
- numpy=1.26.4
- pygmo=2.19.5
- ipython=8.26.0
- ipykernel=6.29.5
- nbconvert=7.16.4 # for create_script.py utility
- tqdm=4.66.5 # for create_script.py utility
- pip
- pip:
- astroquery==0.4.8.dev9321
28 changes: 14 additions & 14 deletions estimation/covariance_estimated_parameters.ipynb

Large diffs are not rendered by default.

66 changes: 41 additions & 25 deletions estimation/estimation_dynamical_models.ipynb

Large diffs are not rendered by default.

127 changes: 64 additions & 63 deletions estimation/estimation_with_mpc.ipynb

Large diffs are not rendered by default.

56 changes: 32 additions & 24 deletions estimation/full_estimation_example.ipynb

Large diffs are not rendered by default.

84 changes: 50 additions & 34 deletions estimation/galilean_moons_state_estimation.ipynb

Large diffs are not rendered by default.

196 changes: 124 additions & 72 deletions mission_design/cassini1_mga_optimization.ipynb

Large diffs are not rendered by default.

33 changes: 20 additions & 13 deletions mission_design/earth_mars_transfer_window.ipynb

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions mission_design/hodographic_shaping_mga_optimization.ipynb

Large diffs are not rendered by default.

28 changes: 23 additions & 5 deletions mission_design/low_thrust_earth_mars_transfer_window.ipynb

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions propagation/impact_manifolds_lpo_cr3bp.ipynb

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions propagation/keplerian_satellite_orbit.ipynb

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions propagation/linear_sensitivity_analysis.ipynb

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions propagation/mga_trajectories.ipynb

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions propagation/perturbed_satellite_orbit.ipynb

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions propagation/reentry_trajectory.ipynb

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions propagation/separation_satellites_diff_drag.ipynb

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions propagation/solar_system_propagation.ipynb

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions propagation/thrust_between_Earth_Moon.ipynb

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions propagation/two_stage_rocket_ascent.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@
" return [\n",
" propagation_setup.dependent_variable.altitude( section_name, \"Mars\" ),\n",
" propagation_setup.dependent_variable.airspeed( section_name, \"Mars\" ),\n",
" propagation_setup.dependent_variable.dynamic_pressure( section_name ),\n",
" propagation_setup.dependent_variable.dynamic_pressure( section_name, \"Mars\" ),\n",
" propagation_setup.dependent_variable.body_mass( section_name ),\n",
" propagation_setup.dependent_variable.total_acceleration_norm( section_name ),\n",
" propagation_setup.dependent_variable.single_acceleration_norm(\n",
Expand Down Expand Up @@ -679,8 +679,8 @@
"name": "stderr",
"output_type": "stream",
"text": [
"Minimum step size exceeded.\n",
"Error, propagation terminated at t=982325034.782465, returning propagation data up to current time.\n"
"Error in step-size control, minimum step size 0.000100 is higher than required time step 0.000091\n",
"Error, propagation terminated at t=982325034.782484, returning propagation data up to current time.\n"
]
}
],
Expand Down Expand Up @@ -868,7 +868,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"Minimum step size exceeded.\n",
"Error in step-size control, minimum step size 0.000100 is higher than required time step 0.000091\n",
"Error, propagation terminated at t=982325135.921483, returning propagation data up to current time.\n"
]
}
Expand Down Expand Up @@ -966,7 +966,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Stage separation occured after 3.91 minutes.\n"
"Stage separation occurred after 3.91 minutes.\n"
]
},
{
Expand All @@ -976,7 +976,7 @@
"traceback": [
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[0;31mIndexError\u001b[0m Traceback (most recent call last)",
"Cell \u001b[0;32mIn[25], line 4\u001b[0m\n\u001b[1;32m 1\u001b[0m \u001b[38;5;28mprint\u001b[39m(\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mStage separation occured after \u001b[39m\u001b[38;5;132;01m%.2f\u001b[39;00m\u001b[38;5;124m minutes.\u001b[39m\u001b[38;5;124m\"\u001b[39m \u001b[38;5;241m%\u001b[39m ((final_epoch_section_1\u001b[38;5;241m-\u001b[39mtimes[\u001b[38;5;241m0\u001b[39m])\u001b[38;5;241m/\u001b[39m\u001b[38;5;241m60\u001b[39m))\n\u001b[1;32m 3\u001b[0m \u001b[38;5;66;03m# Compute the index at which the time since launch gets above 10 minutes\u001b[39;00m\n\u001b[0;32m----> 4\u001b[0m idx_crop \u001b[38;5;241m=\u001b[39m \u001b[43mnp\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mwhere\u001b[49m\u001b[43m(\u001b[49m\u001b[43mtimes_since_launch\u001b[49m\u001b[38;5;241;43m/\u001b[39;49m\u001b[38;5;241;43m60\u001b[39;49m\u001b[43m \u001b[49m\u001b[38;5;241;43m>\u001b[39;49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43m \u001b[49m\u001b[38;5;241;43m10\u001b[39;49m\u001b[43m)\u001b[49m\u001b[43m[\u001b[49m\u001b[38;5;241;43m0\u001b[39;49m\u001b[43m]\u001b[49m\u001b[43m[\u001b[49m\u001b[38;5;241;43m0\u001b[39;49m\u001b[43m]\u001b[49m\n\u001b[1;32m 6\u001b[0m \u001b[38;5;66;03m# Create a figure with 5 subplots: a grid of 2x2, then one horizontal one at the bottom\u001b[39;00m\n\u001b[1;32m 7\u001b[0m fig \u001b[38;5;241m=\u001b[39m plt\u001b[38;5;241m.\u001b[39mfigure(figsize\u001b[38;5;241m=\u001b[39m(\u001b[38;5;241m9\u001b[39m, \u001b[38;5;241m11\u001b[39m))\n",
"Cell \u001b[0;32mIn[25], line 7\u001b[0m\n\u001b[1;32m 1\u001b[0m \u001b[38;5;28mprint\u001b[39m(\n\u001b[1;32m 2\u001b[0m \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mStage separation occurred after \u001b[39m\u001b[38;5;132;01m%.2f\u001b[39;00m\u001b[38;5;124m minutes.\u001b[39m\u001b[38;5;124m\"\u001b[39m\n\u001b[1;32m 3\u001b[0m \u001b[38;5;241m%\u001b[39m ((final_epoch_section_1 \u001b[38;5;241m-\u001b[39m times[\u001b[38;5;241m0\u001b[39m]) \u001b[38;5;241m/\u001b[39m \u001b[38;5;241m60\u001b[39m)\n\u001b[1;32m 4\u001b[0m )\n\u001b[1;32m 6\u001b[0m \u001b[38;5;66;03m# Compute the index at which the time since launch gets above 10 minutes\u001b[39;00m\n\u001b[0;32m----> 7\u001b[0m idx_crop \u001b[38;5;241m=\u001b[39m \u001b[43mnp\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mwhere\u001b[49m\u001b[43m(\u001b[49m\u001b[43mtimes_since_launch\u001b[49m\u001b[43m \u001b[49m\u001b[38;5;241;43m/\u001b[39;49m\u001b[43m \u001b[49m\u001b[38;5;241;43m60\u001b[39;49m\u001b[43m \u001b[49m\u001b[38;5;241;43m>\u001b[39;49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43m \u001b[49m\u001b[38;5;241;43m10\u001b[39;49m\u001b[43m)\u001b[49m\u001b[43m[\u001b[49m\u001b[38;5;241;43m0\u001b[39;49m\u001b[43m]\u001b[49m\u001b[43m[\u001b[49m\u001b[38;5;241;43m0\u001b[39;49m\u001b[43m]\u001b[49m\n\u001b[1;32m 9\u001b[0m \u001b[38;5;66;03m# Create a figure with 5 subplots: a grid of 2x2, then one horizontal one at the bottom\u001b[39;00m\n\u001b[1;32m 10\u001b[0m fig \u001b[38;5;241m=\u001b[39m plt\u001b[38;5;241m.\u001b[39mfigure(figsize\u001b[38;5;241m=\u001b[39m(\u001b[38;5;241m9\u001b[39m, \u001b[38;5;241m11\u001b[39m))\n",
"\u001b[0;31mIndexError\u001b[0m: index 0 is out of bounds for axis 0 with size 0"
]
}
Expand Down
25 changes: 21 additions & 4 deletions pygmo/asteroid_orbit_optimization/aoo_custom_environment.ipynb

Large diffs are not rendered by default.

Large diffs are not rendered by default.

31 changes: 24 additions & 7 deletions pygmo/asteroid_orbit_optimization/aoo_optimization.ipynb

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions pygmo/himmelblau_minimization.ipynb

Large diffs are not rendered by default.

0 comments on commit 7f88ddb

Please sign in to comment.