Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/Anonymous--Alpha/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Alpha\\drag_curve.csv",
"inertia": [
0.05,
0.05,
21.074
21.074,
21.074,
0.05
],
"mass": 23.279,
"radius": 0.0765
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Beta/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Beta\\drag_curve.csv",
"inertia": [
0.012064,
0.012064,
1.2632
1.2632,
1.2632,
0.012064
],
"mass": 4.8422,
"radius": 0.0508
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Epsilon/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Epsilon\\drag_curve.csv",
"inertia": [
0.055,
0.055,
14.862
14.862,
14.862,
0.055
],
"mass": 22.578,
"radius": 0.0665
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Eta/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Eta\\drag_curve.csv",
"inertia": [
0.13516,
0.13516,
12.776
12.776,
12.776,
0.13516
],
"mass": 23.118,
"radius": 0.0745
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Gamma/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Gamma\\drag_curve.csv",
"inertia": [
0.040851,
0.040851,
9.7111
9.7111,
9.7111,
0.040851
],
"mass": 17.163,
"radius": 0.075
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Iota/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Iota\\drag_curve.csv",
"inertia": [
0.0091756,
0.0091756,
3.1389
3.1389,
3.1389,
0.0091756
],
"mass": 9.811,
"radius": 0.061500000000000006
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Kappa/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Kappa\\drag_curve.csv",
"inertia": [
0.14741,
0.14741,
126.0
126.0,
126.0,
0.14741
],
"mass": 42.924,
"radius": 0.078
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Lambda/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Lambda\\drag_curve.csv",
"inertia": [
0.0084849,
0.0084849,
41.426
41.426,
41.426,
0.0084849
],
"mass": 23.061,
"radius": 0.078
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Mu/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Mu\\drag_curve.csv",
"inertia": [
0.1265,
0.1265,
9.9032
9.9032,
9.9032,
0.1265
],
"mass": 17.861,
"radius": 0.075
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Nu/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Nu\\drag_curve.csv",
"inertia": [
0.15095,
0.15095,
77.457
77.457,
77.457,
0.15095
],
"mass": 30.254,
"radius": 0.0765
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Omicron/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Omicron\\drag_curve.csv",
"inertia": [
0.34261,
0.34261,
83.941
83.941,
83.941,
0.34261
],
"mass": 51.551,
"radius": 0.0895
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Pi/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Pi\\drag_curve.csv",
"inertia": [
0.049903,
0.049903,
3.7259
3.7259,
3.7259,
0.049903
],
"mass": 14.667,
"radius": 0.07675
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Rho/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Rho\\drag_curve.csv",
"inertia": [
0.035532,
0.035532,
6.5479
6.5479,
6.5479,
0.035532
],
"mass": 9.8765,
"radius": 0.047
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Sigma/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Sigma\\drag_curve.csv",
"inertia": [
0.22429,
0.22429,
12.157
12.157,
12.157,
0.22429
],
"mass": 17.891,
"radius": 0.077
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Theta/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Theta\\drag_curve.csv",
"inertia": [
0.0056233,
0.0056233,
2.571
2.571,
2.571,
0.0056233
],
"mass": 5.8234,
"radius": 0.0465
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Xi/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Xi\\drag_curve.csv",
"inertia": [
0.029124,
0.029124,
12.171
12.171,
12.171,
0.029124
],
"mass": 18.298,
"radius": 0.0508
Expand Down
6 changes: 3 additions & 3 deletions examples/Anonymous--Zeta/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\Anonymous--Zeta\\drag_curve.csv",
"inertia": [
0.035926,
0.035926,
11.635
11.635,
11.635,
0.035926
],
"mass": 16.069,
"radius": 0.051500000000000004
Expand Down
6 changes: 3 additions & 3 deletions examples/EPFL--BellaLui--2020/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\EPFL--BellaLui--2020\\drag_curve.csv",
"inertia": [
0.096246,
0.096246,
5.8581
5.8581,
5.8581,
0.096246
],
"mass": 8.419,
"radius": 0.078
Expand Down
6 changes: 3 additions & 3 deletions examples/NDRT--Rocket--2020/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\NDRT--Rocket--2020\\drag_curve.csv",
"inertia": [
0.15089,
0.15089,
18.411
18.411,
18.411,
0.15089
],
"mass": 20.735,
"radius": 0.1016
Expand Down
6 changes: 3 additions & 3 deletions examples/ProjetoJupiter--Valetudo--2019/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples/ProjetoJupiter--Valetudo--2019/drag_curve.csv",
"inertia": [
0.01467,
0.01467,
5.5915
5.5915,
5.5915,
0.01467
],
"mass": 8.2564,
"radius": 0.04045000000000001
Expand Down
6 changes: 3 additions & 3 deletions examples/WERT--Prometheus--2022/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples\\WERT--Prometheus--2022\\drag_curve.csv",
"inertia": [
0.043,
0.043,
4.563
4.563,
4.563,
0.043
],
"mass": 14.737,
"radius": 0.06985
Expand Down
6 changes: 3 additions & 3 deletions examples/rocket_with_elliptical_fins/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@
"coordinate_system_orientation": "nose_to_tail",
"drag_curve": "examples/rocket_with_elliptical_fins/drag_curve.csv",
"inertia": [
0.000278,
0.000278,
0.024
0.024,
0.024,
0.000278
],
"mass": 0.437,
"radius": 0.025
Expand Down
2 changes: 1 addition & 1 deletion rocketserializer/components/rocket.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def search_rocket(bs, datapoints, data_labels, burnout_position):
logger.info("Collected rocket mass.")

# get inertias
inertia_z, inertia_i = get_inertias(data_labels, burnout_position, datapoints)
inertia_i, inertia_z = get_inertias(data_labels, burnout_position, datapoints)
settings["inertia"] = (inertia_i, inertia_i, inertia_z)
logger.info("Collected rocket inertia.")

Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/EPFL--BellaLui--2020/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"radius": 0.078,
"mass": 8.419,
"inertia": [
0.096246,
0.096246,
5.8581
5.8581,
5.8581,
0.096246
],
"center_of_mass_without_propellant": 1.559,
"coordinate_system_orientation": "nose_to_tail",
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/NDRT--Rocket--2020/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"radius": 0.1016,
"mass": 20.735,
"inertia": [
0.15089,
0.15089,
18.411
18.411,
18.411,
0.15089
],
"center_of_mass_without_propellant": 1.7041,
"coordinate_system_orientation": "nose_to_tail",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"radius": 0.04045000000000001,
"mass": 8.2564,
"inertia": [
0.01467,
0.01467,
5.5915
5.5915,
5.5915,
0.01467
],
"center_of_mass_without_propellant": 1.4023,
"coordinate_system_orientation": "nose_to_tail",
Expand Down
6 changes: 6 additions & 0 deletions tests/acceptance/test_ork_extractor.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import json

import pytest
import math


@pytest.mark.parametrize(
Expand Down Expand Up @@ -48,6 +49,11 @@ def test_ork_extractor(expected_results_file, fixture, request):
# assert all the keys are equal
assert set(settings.keys()) == set(expected_results.keys())

# roll inertia < pitch inertia for slender rockets
inertia = settings["rocket"]["inertia"]
if not math.isnan(inertia[0]):
assert inertia[2] < inertia[0]

# remove sensitive keys
settings, expected_results = remove_sensitive_keys(settings, expected_results)

Expand Down