Skip to main content

ballistics_engine/
request_roundtrip.rs

1//! Reverse conversion from the canonical resolved request back into a solvable request
2//! (Phase 0 of the 0.33.0 decision-support train).
3//!
4//! The resolved request was otherwise output-only. The perturbation kernel needs to take a
5//! resolved request, change one input, and re-solve, which is impossible without this
6//! direction. Every resolved value is carried across explicitly: a silently lossy
7//! conversion would misattribute the dropped field's effect to whatever the caller happened
8//! to be perturbing.
9//!
10//! Two fields are deliberately NOT carried straight across, because the resolved sibling
11//! they'd ride along with is already the post-transform value, and re-supplying the
12//! original input mode would apply that transform a second time:
13//!
14//! - `atmosphere.pressure_reference`: when the original request declared `"qnh"`,
15//!   [`ResolvedAtmosphereV1::pressure_pa`] is already the REDUCED absolute station pressure
16//!   (see `resolve_atmosphere`'s QNH branch) -- echoing `"qnh"` back alongside that
17//!   already-reduced value would reduce it a second time. The rebuilt request always states
18//!   `pressure_pa` as absolute (the omitted-field default), which is what the resolved
19//!   value already is.
20//! - `wind.wind_reference`: when the original request declared `"compass"`, every resolved
21//!   wind direction is already converted to shooter-relative (see `resolve_wind`'s
22//!   `to_relative`) -- echoing `"compass"` back alongside an already-relative direction
23//!   would re-reference it against the shot azimuth a second time. The rebuilt request
24//!   always states directions as shooter-relative (the omitted-field default), which is
25//!   what the resolved values already are.
26//!
27//! `ResolvedShotV1` carries both `zero_distance_m` (caller intent) and `muzzle_angle_rad`
28//! (the effective angle after zeroing). Both are carried onto the rebuilt request: an
29//! explicit `muzzle_angle_rad` always takes priority over `zero_distance_m` at resolve time
30//! (see `resolve_shot` and `solve_v1`'s zero-search gate), so supplying both reproduces the
31//! exact original angle -- bit-identical, not just numerically re-converged -- while still
32//! preserving the original zeroing intent as metadata rather than dropping it.
33
34use crate::solve_json::*;
35
36impl From<&ResolvedSolveRequestV1> for SolveRequestV1 {
37    fn from(r: &ResolvedSolveRequestV1) -> Self {
38        SolveRequestV1 {
39            schema_version: SchemaVersionV1,
40            projectile: ProjectileV1 {
41                mass_kg: r.projectile.mass_kg,
42                diameter_m: r.projectile.diameter_m,
43                length_m: r.projectile.length_m,
44                drag_model: r.projectile.drag_model,
45                ballistic_coefficient: r.projectile.ballistic_coefficient,
46            },
47            rifle: RifleV1 {
48                muzzle_velocity_mps: r.rifle.muzzle_velocity_mps,
49                sight_height_m: Some(r.rifle.sight_height_m),
50                muzzle_height_m: Some(r.rifle.muzzle_height_m),
51                twist_rate_m_per_turn: Some(r.rifle.twist_rate_m_per_turn),
52                twist_direction: Some(r.rifle.twist_direction),
53                sight_offset_lateral_m: r.rifle.sight_offset_lateral_m,
54            },
55            shot: ShotV1 {
56                max_range_m: r.shot.max_range_m,
57                zero_distance_m: r.shot.zero_distance_m,
58                // Both are carried: zero_distance_m is caller intent, muzzle_angle_rad is
59                // the angle actually integrated after zeroing. An explicit muzzle_angle_rad
60                // always wins at resolve time (resolve_shot / solve_v1), so this reproduces
61                // the exact original angle with no re-zero, whether or not zero_distance_m
62                // is also present.
63                muzzle_angle_rad: Some(r.shot.muzzle_angle_rad),
64                aim_azimuth_rad: Some(r.shot.aim_azimuth_rad),
65                shot_azimuth_rad: Some(r.shot.shot_azimuth_rad),
66                shooting_angle_rad: Some(r.shot.shooting_angle_rad),
67                cant_angle_rad: Some(r.shot.cant_angle_rad),
68                target_height_m: Some(r.shot.target_height_m),
69                ground_threshold_m: Some(r.shot.ground_threshold_m),
70                zero_poi_up_m: r.shot.zero_poi_up_m,
71                zero_poi_right_m: r.shot.zero_poi_right_m,
72                drops_reference: r.shot.drops_reference,
73            },
74            atmosphere: AtmosphereV1 {
75                altitude_m: Some(r.atmosphere.altitude_m),
76                temperature_k: Some(r.atmosphere.temperature_k),
77                pressure_pa: Some(r.atmosphere.pressure_pa),
78                // See the module doc: pressure_pa above is already absolute station
79                // pressure; echoing a "qnh" reference back would reduce it a second time.
80                pressure_reference: None,
81                relative_humidity: Some(r.atmosphere.relative_humidity),
82                latitude_rad: r.atmosphere.latitude_rad,
83            },
84            wind: wind_from_resolved(&r.wind),
85            solver: SolverV1 {
86                method: Some(r.solver.method),
87                time_step_s: Some(r.solver.time_step_s),
88            },
89            effects: EffectsV1 {
90                magnus: Some(r.effects.magnus),
91                coriolis: Some(r.effects.coriolis),
92                enhanced_spin_drift: Some(r.effects.enhanced_spin_drift),
93                // Carried straight across, unlike the two reference modes above: the shear
94                // model is not a declaration about how a sibling value was ENTERED, it is
95                // the model itself, and the resolved echo is already the canonical name the
96                // solver ran. Re-supplying it re-applies the same shear rather than
97                // compounding a transform. `None` stays `None`, so a rebuilt request that
98                // never asked for shear still does not.
99                wind_shear_model: r.effects.wind_shear_model,
100                // Carried straight across, including a supplied `false`: re-submitting the
101                // round-tripped request has to reproduce the same correction, and an echo that
102                // collapsed `Some(false)` to `None` would be a request that says something
103                // slightly different from the one that produced it.
104                aerodynamic_jump: r.effects.aerodynamic_jump,
105            },
106            sampling: SamplingV1 {
107                interval_m: Some(r.sampling.interval_m),
108            },
109            reticle: r.reticle.clone(),
110            // Carried straight across: segments are always regenerated from the PUBLISHED
111            // ballistic_coefficient (see `apply_bc5d_correction`), so re-applying the
112            // table on a re-solve reproduces — never compounds — the correction. Dropping
113            // it instead would misattribute the correction's whole effect to whatever a
114            // perturbation caller happened to be perturbing.
115            corrections: r.corrections.clone(),
116        }
117    }
118}
119
120fn wind_from_resolved(w: &ResolvedWindV1) -> WindV1 {
121    match w {
122        ResolvedWindV1::Constant(c) => WindV1 {
123            speed_mps: Some(c.speed_mps),
124            direction_from_rad: Some(c.direction_from_rad),
125            vertical_speed_mps: Some(c.vertical_speed_mps),
126            segments: None,
127            // See the module doc: direction_from_rad above is already shooter-relative;
128            // echoing a "compass" reference back would re-reference it a second time.
129            wind_reference: None,
130        },
131        ResolvedWindV1::Segmented(s) => WindV1 {
132            speed_mps: None,
133            direction_from_rad: None,
134            vertical_speed_mps: None,
135            segments: Some(
136                s.segments
137                    .iter()
138                    .map(|g| WindSegmentV1 {
139                        until_distance_m: g.until_distance_m,
140                        speed_mps: g.speed_mps,
141                        direction_from_rad: g.direction_from_rad,
142                        vertical_speed_mps: Some(g.vertical_speed_mps),
143                    })
144                    .collect(),
145            ),
146            // See the module doc and the constant-wind arm above.
147            wind_reference: None,
148        },
149    }
150}
151
152#[cfg(test)]
153mod tests {
154    use crate::solve_json::decode_solve_request_v1;
155    use crate::solve_json::{
156        PressureReferenceV1, ResolvedWindV1, SolveRequestV1, WindReferenceV1, WindShearModelV1,
157    };
158    use crate::solve_v1::solve_v1;
159
160    fn sample_json() -> String {
161        serde_json::json!({
162            "schema_version": 1,
163            "projectile": {"mass_kg": 0.0113, "diameter_m": 0.00782, "drag_model": "G7",
164                           "ballistic_coefficient": 0.243},
165            "rifle": {"muzzle_velocity_mps": 823.0, "sight_height_m": 0.05},
166            "shot": {"max_range_m": 900.0, "zero_distance_m": 100.0},
167            "atmosphere": {"temperature_k": 288.0, "pressure_pa": 101325.0},
168            "wind": {"speed_mps": 3.0, "direction_from_rad": std::f64::consts::FRAC_PI_2},
169            "solver": {}, "effects": {}, "sampling": {"interval_m": 50.0}
170        })
171        .to_string()
172    }
173
174    /// Resolution is idempotent through a round-trip: re-solving a request
175    /// rebuilt from a resolved request must resolve to exactly the same values.
176    /// This is the acceptance gate for Phase 0.
177    ///
178    /// Compares the whole success envelope, not just `resolved_request`: some effects (the
179    /// windage-zero convergence bias, see `roundtrip_preserves_the_windage_zero_bias` below)
180    /// never appear in `resolved_request` at all -- on the very first solve, not only after a
181    /// round-trip -- so `resolved_request` equality alone cannot catch every regression.
182    #[test]
183    fn resolution_is_idempotent_through_roundtrip() {
184        let first = solve_v1(decode_solve_request_v1(&sample_json()).unwrap()).unwrap();
185        let rebuilt: SolveRequestV1 = (&first.resolved_request).into();
186        let second = solve_v1(rebuilt).unwrap();
187        assert_eq!(
188            serde_json::to_value(&first.resolved_request).unwrap(),
189            serde_json::to_value(&second.resolved_request).unwrap(),
190            "resolved request changed after a round-trip"
191        );
192        assert_eq!(
193            first.summary, second.summary,
194            "summary changed after a round-trip"
195        );
196        assert_eq!(
197            first.samples, second.samples,
198            "samples changed after a round-trip"
199        );
200    }
201
202    /// The windage-zero convergence bias (`sight_offset_lateral_m` / `zero_poi_right_m`,
203    /// applied via `BallisticInputs::windage_zero_bias_rad`) is a term
204    /// `calculate_and_set_zero_angle` adds to azimuth ALONGSIDE the elevation search -- it is
205    /// not carried by `muzzle_angle_rad`, and (unlike the elevation) it never appears in
206    /// `resolved_request` at all, on the first solve or any later one. Skipping the elevation
207    /// search on a round-tripped request must not also skip this separate term, or an
208    /// offset-mounted sight / deliberate horizontal zero bias would silently stop converging
209    /// the moment a resolved request round-trips. `resolved_request` alone cannot see this
210    /// (compare `first.resolved_request` above with `second.resolved_request` below: they are
211    /// byte-identical even when this regresses), so this compares the solved trajectory too.
212    #[test]
213    fn roundtrip_preserves_the_windage_zero_bias() {
214        let json = serde_json::json!({
215            "schema_version": 1,
216            "projectile": {"mass_kg": 0.0113, "diameter_m": 0.00782, "drag_model": "G7",
217                           "ballistic_coefficient": 0.243},
218            "rifle": {"muzzle_velocity_mps": 823.0, "sight_height_m": 0.05,
219                      "sight_offset_lateral_m": 0.03},
220            "shot": {"max_range_m": 900.0, "zero_distance_m": 100.0, "zero_poi_right_m": 0.02},
221            "atmosphere": {"temperature_k": 288.0, "pressure_pa": 101325.0},
222            "wind": {"speed_mps": 3.0, "direction_from_rad": std::f64::consts::FRAC_PI_2},
223            "solver": {}, "effects": {}, "sampling": {"interval_m": 50.0}
224        })
225        .to_string();
226        let first = solve_v1(decode_solve_request_v1(&json).unwrap()).unwrap();
227        let rebuilt: SolveRequestV1 = (&first.resolved_request).into();
228        let second = solve_v1(rebuilt).unwrap();
229
230        assert_eq!(
231            serde_json::to_value(&first.resolved_request).unwrap(),
232            serde_json::to_value(&second.resolved_request).unwrap(),
233            "resolved request changed after a round-trip"
234        );
235        assert_eq!(
236            first.summary, second.summary,
237            "summary changed after a round-trip -- the windage-zero bias may have been dropped"
238        );
239        assert_eq!(
240            first.samples, second.samples,
241            "samples changed after a round-trip -- the windage-zero bias may have been dropped"
242        );
243        // Sanity check: the bias is actually nonzero in this fixture, so the comparisons
244        // above are exercising the real thing rather than two agreeing zeros.
245        let windage_m = first.samples.last().expect("at least one sample").windage_m;
246        assert!(
247            windage_m.abs() > 0.1,
248            "fixture must produce a non-negligible windage-zero bias to be a meaningful test, \
249             got {windage_m} m"
250        );
251    }
252
253    /// A zeroed solve must not silently re-zero on the way back.
254    #[test]
255    fn roundtrip_preserves_the_effective_muzzle_angle() {
256        let first = solve_v1(decode_solve_request_v1(&sample_json()).unwrap()).unwrap();
257        let rebuilt: SolveRequestV1 = (&first.resolved_request).into();
258        assert_eq!(
259            rebuilt.shot.muzzle_angle_rad,
260            Some(first.resolved_request.shot.muzzle_angle_rad)
261        );
262        assert_eq!(
263            rebuilt.shot.zero_distance_m,
264            first.resolved_request.shot.zero_distance_m
265        );
266    }
267
268    /// A QNH-declared pressure is reduced to absolute station pressure exactly once.
269    /// `ResolvedAtmosphereV1::pressure_pa` is already that reduced value; the rebuilt
270    /// request deliberately does not echo `pressure_reference: "qnh"` back alongside it
271    /// (see the module doc), so the round-tripped resolved echo differs in exactly that one
272    /// field. What must NOT differ is the reduced `pressure_pa` value itself: if the
273    /// rebuilt request echoed the mode back too, the second resolve would reduce it a
274    /// second time and silently corrupt it.
275    #[test]
276    fn roundtrip_does_not_double_reduce_a_qnh_pressure() {
277        let json = serde_json::json!({
278            "schema_version": 1,
279            "projectile": {"mass_kg": 0.0113, "diameter_m": 0.00782, "drag_model": "G7",
280                           "ballistic_coefficient": 0.243},
281            "rifle": {"muzzle_velocity_mps": 823.0, "sight_height_m": 0.05},
282            "shot": {"max_range_m": 900.0},
283            "atmosphere": {"altitude_m": 500.0, "temperature_k": 288.0, "pressure_pa": 101325.0,
284                           "pressure_reference": "qnh"},
285            "wind": {}, "solver": {}, "effects": {}, "sampling": {"interval_m": 50.0}
286        })
287        .to_string();
288        let first = solve_v1(decode_solve_request_v1(&json).unwrap()).unwrap();
289        assert_eq!(
290            first.resolved_request.atmosphere.pressure_reference,
291            Some(PressureReferenceV1::Qnh)
292        );
293
294        let rebuilt: SolveRequestV1 = (&first.resolved_request).into();
295        let second = solve_v1(rebuilt).unwrap();
296
297        // The one deliberate difference: the reference mode is not echoed back (its
298        // transform is already baked into pressure_pa, so re-supplying it would be a
299        // second application, not a no-op).
300        assert_eq!(second.resolved_request.atmosphere.pressure_reference, None);
301        // What actually matters -- the physical quantity -- is unchanged.
302        assert_eq!(
303            second.resolved_request.atmosphere.pressure_pa,
304            first.resolved_request.atmosphere.pressure_pa,
305            "a round-tripped QNH pressure must not be reduced a second time"
306        );
307        assert_eq!(
308            second.resolved_request.atmosphere.altitude_m,
309            first.resolved_request.atmosphere.altitude_m
310        );
311        assert_eq!(
312            second.resolved_request.atmosphere.temperature_k,
313            first.resolved_request.atmosphere.temperature_k
314        );
315    }
316
317    /// A compass-declared wind direction is converted to shooter-relative exactly once.
318    /// The resolved direction is already that converted value; the rebuilt request
319    /// deliberately does not echo `wind_reference: "compass"` back alongside it (see the
320    /// module doc), so the round-tripped resolved echo differs in exactly that one field.
321    /// What must NOT differ is the converted `direction_from_rad` value itself: if the
322    /// rebuilt request echoed the mode back too, the second resolve would re-reference it
323    /// against the shot azimuth a second time and silently corrupt it.
324    #[test]
325    fn roundtrip_does_not_double_reference_a_compass_wind() {
326        let json = serde_json::json!({
327            "schema_version": 1,
328            "projectile": {"mass_kg": 0.0113, "diameter_m": 0.00782, "drag_model": "G7",
329                           "ballistic_coefficient": 0.243},
330            "rifle": {"muzzle_velocity_mps": 823.0, "sight_height_m": 0.05},
331            "shot": {"max_range_m": 900.0, "shot_azimuth_rad": 0.3},
332            "atmosphere": {},
333            "wind": {"speed_mps": 3.0, "direction_from_rad": 1.0, "wind_reference": "compass"},
334            "solver": {}, "effects": {}, "sampling": {"interval_m": 50.0}
335        })
336        .to_string();
337        let first = solve_v1(decode_solve_request_v1(&json).unwrap()).unwrap();
338        let ResolvedWindV1::Constant(first_wind) = &first.resolved_request.wind else {
339            panic!("constant wind expected");
340        };
341        assert_eq!(first_wind.wind_reference, Some(WindReferenceV1::Compass));
342        // Sanity check: compass mode actually converted the direction (it is not simply
343        // echoing the 1.0 rad bearing the request supplied).
344        assert_ne!(first_wind.direction_from_rad, 1.0);
345        let first_direction_from_rad = first_wind.direction_from_rad;
346
347        let rebuilt: SolveRequestV1 = (&first.resolved_request).into();
348        let second = solve_v1(rebuilt).unwrap();
349        let ResolvedWindV1::Constant(second_wind) = &second.resolved_request.wind else {
350            panic!("constant wind expected");
351        };
352
353        // The one deliberate difference: the reference mode is not echoed back.
354        assert_eq!(second_wind.wind_reference, None);
355        // What actually matters -- the physical quantity -- is unchanged.
356        assert_eq!(
357            second_wind.direction_from_rad, first_direction_from_rad,
358            "a round-tripped compass wind must not be re-referenced a second time"
359        );
360    }
361
362    /// `effects.wind_shear_model` (0.36.0) is carried straight across, unlike the two
363    /// reference modes above. It is not a declaration about how a sibling value was entered,
364    /// so re-supplying it re-applies the same shear rather than compounding a transform --
365    /// and dropping it would misattribute the whole of the shear's effect to whatever a
366    /// perturbation caller happened to be perturbing.
367    ///
368    /// The trajectory is compared, not just the resolved request: the shear only shows up in
369    /// the numbers, so a rebuilt request that quietly lost the model would still produce an
370    /// identical-looking `resolved_request` if the echo alone were carried.
371    #[test]
372    fn roundtrip_preserves_the_wind_shear_model() {
373        // Lofted well above the 10 m boundary-layer reference height so the profile is
374        // actually engaged; a flat shot would agree either way. `muzzle_angle_rad` is given
375        // directly so no zero search runs between the two solves.
376        let json = serde_json::json!({
377            "schema_version": 1,
378            "projectile": {"mass_kg": 0.0113, "diameter_m": 0.00782, "drag_model": "G7",
379                           "ballistic_coefficient": 0.243},
380            "rifle": {"muzzle_velocity_mps": 823.0, "sight_height_m": 0.05},
381            "shot": {"max_range_m": 2000.0, "muzzle_angle_rad": 0.15,
382                     "ground_threshold_m": -2000.0},
383            "atmosphere": {},
384            "wind": {"speed_mps": 4.0, "direction_from_rad": std::f64::consts::FRAC_PI_2},
385            "solver": {}, "effects": {"wind_shear_model": "logarithmic"},
386            "sampling": {"interval_m": 250.0}
387        })
388        .to_string();
389
390        let first = solve_v1(decode_solve_request_v1(&json).unwrap()).unwrap();
391        assert_eq!(
392            first.resolved_request.effects.wind_shear_model,
393            Some(WindShearModelV1::Logarithmic)
394        );
395
396        let rebuilt: SolveRequestV1 = (&first.resolved_request).into();
397        assert_eq!(
398            rebuilt.effects.wind_shear_model,
399            Some(WindShearModelV1::Logarithmic),
400            "the shear model must be carried onto the rebuilt request"
401        );
402
403        let second = solve_v1(rebuilt).unwrap();
404        assert_eq!(
405            second.resolved_request.effects.wind_shear_model,
406            Some(WindShearModelV1::Logarithmic)
407        );
408        assert_eq!(
409            first.samples, second.samples,
410            "a round-tripped request must re-apply the same shear, not drop it"
411        );
412
413        // Sanity check that the assertion above has teeth: this shot really is one where the
414        // model changes the answer, so "identical samples" is not vacuously true.
415        let unsheared_json = json.replace(r#""wind_shear_model":"logarithmic""#, "");
416        let unsheared = solve_v1(decode_solve_request_v1(&unsheared_json).unwrap()).unwrap();
417        assert_ne!(
418            unsheared.samples, first.samples,
419            "the fixture must be a shot where wind shear actually changes the trajectory"
420        );
421    }
422}