CCSDS 508.1-B Re-entry Data Message parser and serializer
rdm: rename find_float/find_float_or (merlint E331)
+23
-23
+23
-23
lib/rdm.ml
+23
-23
lib/rdm.ml
···
133
133
134
134
let find key pairs = List.assoc_opt key pairs
135
135
136
-
let find_float key pairs =
136
+
let float_val key pairs =
137
137
match find key pairs with Some v -> float_of v | None -> None
138
138
139
-
let find_float_or key default pairs =
140
-
match find_float key pairs with Some f -> f | None -> default
139
+
let float_or key default pairs =
140
+
match float_val key pairs with Some f -> f | None -> default
141
141
142
142
let parse_header pairs =
143
143
{
···
178
178
else
179
179
Some
180
180
{
181
-
x = find_float_or "X" 0.0 pairs;
182
-
y = find_float_or "Y" 0.0 pairs;
183
-
z = find_float_or "Z" 0.0 pairs;
184
-
x_dot = find_float_or "X_DOT" 0.0 pairs;
185
-
y_dot = find_float_or "Y_DOT" 0.0 pairs;
186
-
z_dot = find_float_or "Z_DOT" 0.0 pairs;
181
+
x = float_or "X" 0.0 pairs;
182
+
y = float_or "Y" 0.0 pairs;
183
+
z = float_or "Z" 0.0 pairs;
184
+
x_dot = float_or "X_DOT" 0.0 pairs;
185
+
y_dot = float_or "Y_DOT" 0.0 pairs;
186
+
z_dot = float_or "Z_DOT" 0.0 pairs;
187
187
}
188
188
189
189
let parse_physical pairs =
190
-
let wet_mass = find_float "WET_MASS" pairs in
191
-
let dry_mass = find_float "DRY_MASS" pairs in
192
-
let area_pc = find_float "AREA_PC" pairs in
193
-
let cd_area_over_mass = find_float "CD_AREA_OVER_MASS" pairs in
194
-
let cr_area_over_mass = find_float "CR_AREA_OVER_MASS" pairs in
195
-
let initial_orbit_lifetime = find_float "INITIAL_ORBIT_LIFETIME" pairs in
190
+
let wet_mass = float_val "WET_MASS" pairs in
191
+
let dry_mass = float_val "DRY_MASS" pairs in
192
+
let area_pc = float_val "AREA_PC" pairs in
193
+
let cd_area_over_mass = float_val "CD_AREA_OVER_MASS" pairs in
194
+
let cr_area_over_mass = float_val "CR_AREA_OVER_MASS" pairs in
195
+
let initial_orbit_lifetime = float_val "INITIAL_ORBIT_LIFETIME" pairs in
196
196
match
197
197
( wet_mass,
198
198
dry_mass,
···
220
220
{
221
221
reentry_epoch;
222
222
reentry_epoch_ptime = Kvn.parse_epoch reentry_epoch;
223
-
reentry_epoch_uncertainty = find_float "REENTRY_EPOCH_UNCERTAINTY" pairs;
223
+
reentry_epoch_uncertainty = float_val "REENTRY_EPOCH_UNCERTAINTY" pairs;
224
224
controlled = find "CONTROLLED" pairs;
225
-
impact_latitude = find_float "IMPACT_LATITUDE" pairs;
226
-
impact_longitude = find_float "IMPACT_LONGITUDE" pairs;
227
-
impact_altitude = find_float "IMPACT_ALTITUDE" pairs;
225
+
impact_latitude = float_val "IMPACT_LATITUDE" pairs;
226
+
impact_longitude = float_val "IMPACT_LONGITUDE" pairs;
227
+
impact_altitude = float_val "IMPACT_ALTITUDE" pairs;
228
228
impact_epoch = find "IMPACT_EPOCH" pairs;
229
-
disintegration_altitude = find_float "DISINTEGRATION_ALTITUDE" pairs;
230
-
surviving_mass_fraction = find_float "SURVIVING_MASS_FRACTION" pairs;
231
-
ground_casualty_area = find_float "GROUND_CASUALTY_AREA" pairs;
232
-
casualty_expectation = find_float "CASUALTY_EXPECTATION" pairs;
229
+
disintegration_altitude = float_val "DISINTEGRATION_ALTITUDE" pairs;
230
+
surviving_mass_fraction = float_val "SURVIVING_MASS_FRACTION" pairs;
231
+
ground_casualty_area = float_val "GROUND_CASUALTY_AREA" pairs;
232
+
casualty_expectation = float_val "CASUALTY_EXPECTATION" pairs;
233
233
}
234
234
235
235
let of_string s =