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            },
101            sampling: SamplingV1 {
102                interval_m: Some(r.sampling.interval_m),
103            },
104            reticle: r.reticle.clone(),
105            // Carried straight across: segments are always regenerated from the PUBLISHED
106            // ballistic_coefficient (see `apply_bc5d_correction`), so re-applying the
107            // table on a re-solve reproduces — never compounds — the correction. Dropping
108            // it instead would misattribute the correction's whole effect to whatever a
109            // perturbation caller happened to be perturbing.
110            corrections: r.corrections.clone(),
111        }
112    }
113}
114
115fn wind_from_resolved(w: &ResolvedWindV1) -> WindV1 {
116    match w {
117        ResolvedWindV1::Constant(c) => WindV1 {
118            speed_mps: Some(c.speed_mps),
119            direction_from_rad: Some(c.direction_from_rad),
120            vertical_speed_mps: Some(c.vertical_speed_mps),
121            segments: None,
122            // See the module doc: direction_from_rad above is already shooter-relative;
123            // echoing a "compass" reference back would re-reference it a second time.
124            wind_reference: None,
125        },
126        ResolvedWindV1::Segmented(s) => WindV1 {
127            speed_mps: None,
128            direction_from_rad: None,
129            vertical_speed_mps: None,
130            segments: Some(
131                s.segments
132                    .iter()
133                    .map(|g| WindSegmentV1 {
134                        until_distance_m: g.until_distance_m,
135                        speed_mps: g.speed_mps,
136                        direction_from_rad: g.direction_from_rad,
137                        vertical_speed_mps: Some(g.vertical_speed_mps),
138                    })
139                    .collect(),
140            ),
141            // See the module doc and the constant-wind arm above.
142            wind_reference: None,
143        },
144    }
145}
146
147#[cfg(test)]
148mod tests {
149    use crate::solve_json::decode_solve_request_v1;
150    use crate::solve_json::{
151        PressureReferenceV1, ResolvedWindV1, SolveRequestV1, WindReferenceV1, WindShearModelV1,
152    };
153    use crate::solve_v1::solve_v1;
154
155    fn sample_json() -> String {
156        serde_json::json!({
157            "schema_version": 1,
158            "projectile": {"mass_kg": 0.0113, "diameter_m": 0.00782, "drag_model": "G7",
159                           "ballistic_coefficient": 0.243},
160            "rifle": {"muzzle_velocity_mps": 823.0, "sight_height_m": 0.05},
161            "shot": {"max_range_m": 900.0, "zero_distance_m": 100.0},
162            "atmosphere": {"temperature_k": 288.0, "pressure_pa": 101325.0},
163            "wind": {"speed_mps": 3.0, "direction_from_rad": std::f64::consts::FRAC_PI_2},
164            "solver": {}, "effects": {}, "sampling": {"interval_m": 50.0}
165        })
166        .to_string()
167    }
168
169    /// Resolution is idempotent through a round-trip: re-solving a request
170    /// rebuilt from a resolved request must resolve to exactly the same values.
171    /// This is the acceptance gate for Phase 0.
172    ///
173    /// Compares the whole success envelope, not just `resolved_request`: some effects (the
174    /// windage-zero convergence bias, see `roundtrip_preserves_the_windage_zero_bias` below)
175    /// never appear in `resolved_request` at all -- on the very first solve, not only after a
176    /// round-trip -- so `resolved_request` equality alone cannot catch every regression.
177    #[test]
178    fn resolution_is_idempotent_through_roundtrip() {
179        let first = solve_v1(decode_solve_request_v1(&sample_json()).unwrap()).unwrap();
180        let rebuilt: SolveRequestV1 = (&first.resolved_request).into();
181        let second = solve_v1(rebuilt).unwrap();
182        assert_eq!(
183            serde_json::to_value(&first.resolved_request).unwrap(),
184            serde_json::to_value(&second.resolved_request).unwrap(),
185            "resolved request changed after a round-trip"
186        );
187        assert_eq!(
188            first.summary, second.summary,
189            "summary changed after a round-trip"
190        );
191        assert_eq!(
192            first.samples, second.samples,
193            "samples changed after a round-trip"
194        );
195    }
196
197    /// The windage-zero convergence bias (`sight_offset_lateral_m` / `zero_poi_right_m`,
198    /// applied via `BallisticInputs::windage_zero_bias_rad`) is a term
199    /// `calculate_and_set_zero_angle` adds to azimuth ALONGSIDE the elevation search -- it is
200    /// not carried by `muzzle_angle_rad`, and (unlike the elevation) it never appears in
201    /// `resolved_request` at all, on the first solve or any later one. Skipping the elevation
202    /// search on a round-tripped request must not also skip this separate term, or an
203    /// offset-mounted sight / deliberate horizontal zero bias would silently stop converging
204    /// the moment a resolved request round-trips. `resolved_request` alone cannot see this
205    /// (compare `first.resolved_request` above with `second.resolved_request` below: they are
206    /// byte-identical even when this regresses), so this compares the solved trajectory too.
207    #[test]
208    fn roundtrip_preserves_the_windage_zero_bias() {
209        let json = serde_json::json!({
210            "schema_version": 1,
211            "projectile": {"mass_kg": 0.0113, "diameter_m": 0.00782, "drag_model": "G7",
212                           "ballistic_coefficient": 0.243},
213            "rifle": {"muzzle_velocity_mps": 823.0, "sight_height_m": 0.05,
214                      "sight_offset_lateral_m": 0.03},
215            "shot": {"max_range_m": 900.0, "zero_distance_m": 100.0, "zero_poi_right_m": 0.02},
216            "atmosphere": {"temperature_k": 288.0, "pressure_pa": 101325.0},
217            "wind": {"speed_mps": 3.0, "direction_from_rad": std::f64::consts::FRAC_PI_2},
218            "solver": {}, "effects": {}, "sampling": {"interval_m": 50.0}
219        })
220        .to_string();
221        let first = solve_v1(decode_solve_request_v1(&json).unwrap()).unwrap();
222        let rebuilt: SolveRequestV1 = (&first.resolved_request).into();
223        let second = solve_v1(rebuilt).unwrap();
224
225        assert_eq!(
226            serde_json::to_value(&first.resolved_request).unwrap(),
227            serde_json::to_value(&second.resolved_request).unwrap(),
228            "resolved request changed after a round-trip"
229        );
230        assert_eq!(
231            first.summary, second.summary,
232            "summary changed after a round-trip -- the windage-zero bias may have been dropped"
233        );
234        assert_eq!(
235            first.samples, second.samples,
236            "samples changed after a round-trip -- the windage-zero bias may have been dropped"
237        );
238        // Sanity check: the bias is actually nonzero in this fixture, so the comparisons
239        // above are exercising the real thing rather than two agreeing zeros.
240        let windage_m = first
241            .samples
242            .last()
243            .expect("at least one sample")
244            .windage_m;
245        assert!(
246            windage_m.abs() > 0.1,
247            "fixture must produce a non-negligible windage-zero bias to be a meaningful test, \
248             got {windage_m} m"
249        );
250    }
251
252    /// A zeroed solve must not silently re-zero on the way back.
253    #[test]
254    fn roundtrip_preserves_the_effective_muzzle_angle() {
255        let first = solve_v1(decode_solve_request_v1(&sample_json()).unwrap()).unwrap();
256        let rebuilt: SolveRequestV1 = (&first.resolved_request).into();
257        assert_eq!(
258            rebuilt.shot.muzzle_angle_rad,
259            Some(first.resolved_request.shot.muzzle_angle_rad)
260        );
261        assert_eq!(
262            rebuilt.shot.zero_distance_m,
263            first.resolved_request.shot.zero_distance_m
264        );
265    }
266
267    /// A QNH-declared pressure is reduced to absolute station pressure exactly once.
268    /// `ResolvedAtmosphereV1::pressure_pa` is already that reduced value; the rebuilt
269    /// request deliberately does not echo `pressure_reference: "qnh"` back alongside it
270    /// (see the module doc), so the round-tripped resolved echo differs in exactly that one
271    /// field. What must NOT differ is the reduced `pressure_pa` value itself: if the
272    /// rebuilt request echoed the mode back too, the second resolve would reduce it a
273    /// second time and silently corrupt it.
274    #[test]
275    fn roundtrip_does_not_double_reduce_a_qnh_pressure() {
276        let json = serde_json::json!({
277            "schema_version": 1,
278            "projectile": {"mass_kg": 0.0113, "diameter_m": 0.00782, "drag_model": "G7",
279                           "ballistic_coefficient": 0.243},
280            "rifle": {"muzzle_velocity_mps": 823.0, "sight_height_m": 0.05},
281            "shot": {"max_range_m": 900.0},
282            "atmosphere": {"altitude_m": 500.0, "temperature_k": 288.0, "pressure_pa": 101325.0,
283                           "pressure_reference": "qnh"},
284            "wind": {}, "solver": {}, "effects": {}, "sampling": {"interval_m": 50.0}
285        })
286        .to_string();
287        let first = solve_v1(decode_solve_request_v1(&json).unwrap()).unwrap();
288        assert_eq!(
289            first.resolved_request.atmosphere.pressure_reference,
290            Some(PressureReferenceV1::Qnh)
291        );
292
293        let rebuilt: SolveRequestV1 = (&first.resolved_request).into();
294        let second = solve_v1(rebuilt).unwrap();
295
296        // The one deliberate difference: the reference mode is not echoed back (its
297        // transform is already baked into pressure_pa, so re-supplying it would be a
298        // second application, not a no-op).
299        assert_eq!(second.resolved_request.atmosphere.pressure_reference, None);
300        // What actually matters -- the physical quantity -- is unchanged.
301        assert_eq!(
302            second.resolved_request.atmosphere.pressure_pa,
303            first.resolved_request.atmosphere.pressure_pa,
304            "a round-tripped QNH pressure must not be reduced a second time"
305        );
306        assert_eq!(
307            second.resolved_request.atmosphere.altitude_m,
308            first.resolved_request.atmosphere.altitude_m
309        );
310        assert_eq!(
311            second.resolved_request.atmosphere.temperature_k,
312            first.resolved_request.atmosphere.temperature_k
313        );
314    }
315
316    /// A compass-declared wind direction is converted to shooter-relative exactly once.
317    /// The resolved direction is already that converted value; the rebuilt request
318    /// deliberately does not echo `wind_reference: "compass"` back alongside it (see the
319    /// module doc), so the round-tripped resolved echo differs in exactly that one field.
320    /// What must NOT differ is the converted `direction_from_rad` value itself: if the
321    /// rebuilt request echoed the mode back too, the second resolve would re-reference it
322    /// against the shot azimuth a second time and silently corrupt it.
323    #[test]
324    fn roundtrip_does_not_double_reference_a_compass_wind() {
325        let json = serde_json::json!({
326            "schema_version": 1,
327            "projectile": {"mass_kg": 0.0113, "diameter_m": 0.00782, "drag_model": "G7",
328                           "ballistic_coefficient": 0.243},
329            "rifle": {"muzzle_velocity_mps": 823.0, "sight_height_m": 0.05},
330            "shot": {"max_range_m": 900.0, "shot_azimuth_rad": 0.3},
331            "atmosphere": {},
332            "wind": {"speed_mps": 3.0, "direction_from_rad": 1.0, "wind_reference": "compass"},
333            "solver": {}, "effects": {}, "sampling": {"interval_m": 50.0}
334        })
335        .to_string();
336        let first = solve_v1(decode_solve_request_v1(&json).unwrap()).unwrap();
337        let ResolvedWindV1::Constant(first_wind) = &first.resolved_request.wind else {
338            panic!("constant wind expected");
339        };
340        assert_eq!(first_wind.wind_reference, Some(WindReferenceV1::Compass));
341        // Sanity check: compass mode actually converted the direction (it is not simply
342        // echoing the 1.0 rad bearing the request supplied).
343        assert_ne!(first_wind.direction_from_rad, 1.0);
344        let first_direction_from_rad = first_wind.direction_from_rad;
345
346        let rebuilt: SolveRequestV1 = (&first.resolved_request).into();
347        let second = solve_v1(rebuilt).unwrap();
348        let ResolvedWindV1::Constant(second_wind) = &second.resolved_request.wind else {
349            panic!("constant wind expected");
350        };
351
352        // The one deliberate difference: the reference mode is not echoed back.
353        assert_eq!(second_wind.wind_reference, None);
354        // What actually matters -- the physical quantity -- is unchanged.
355        assert_eq!(
356            second_wind.direction_from_rad, first_direction_from_rad,
357            "a round-tripped compass wind must not be re-referenced a second time"
358        );
359    }
360
361    /// `effects.wind_shear_model` (0.36.0) is carried straight across, unlike the two
362    /// reference modes above. It is not a declaration about how a sibling value was entered,
363    /// so re-supplying it re-applies the same shear rather than compounding a transform --
364    /// and dropping it would misattribute the whole of the shear's effect to whatever a
365    /// perturbation caller happened to be perturbing.
366    ///
367    /// The trajectory is compared, not just the resolved request: the shear only shows up in
368    /// the numbers, so a rebuilt request that quietly lost the model would still produce an
369    /// identical-looking `resolved_request` if the echo alone were carried.
370    #[test]
371    fn roundtrip_preserves_the_wind_shear_model() {
372        // Lofted well above the 10 m boundary-layer reference height so the profile is
373        // actually engaged; a flat shot would agree either way. `muzzle_angle_rad` is given
374        // directly so no zero search runs between the two solves.
375        let json = serde_json::json!({
376            "schema_version": 1,
377            "projectile": {"mass_kg": 0.0113, "diameter_m": 0.00782, "drag_model": "G7",
378                           "ballistic_coefficient": 0.243},
379            "rifle": {"muzzle_velocity_mps": 823.0, "sight_height_m": 0.05},
380            "shot": {"max_range_m": 2000.0, "muzzle_angle_rad": 0.15,
381                     "ground_threshold_m": -2000.0},
382            "atmosphere": {},
383            "wind": {"speed_mps": 4.0, "direction_from_rad": std::f64::consts::FRAC_PI_2},
384            "solver": {}, "effects": {"wind_shear_model": "logarithmic"},
385            "sampling": {"interval_m": 250.0}
386        })
387        .to_string();
388
389        let first = solve_v1(decode_solve_request_v1(&json).unwrap()).unwrap();
390        assert_eq!(
391            first.resolved_request.effects.wind_shear_model,
392            Some(WindShearModelV1::Logarithmic)
393        );
394
395        let rebuilt: SolveRequestV1 = (&first.resolved_request).into();
396        assert_eq!(
397            rebuilt.effects.wind_shear_model,
398            Some(WindShearModelV1::Logarithmic),
399            "the shear model must be carried onto the rebuilt request"
400        );
401
402        let second = solve_v1(rebuilt).unwrap();
403        assert_eq!(
404            second.resolved_request.effects.wind_shear_model,
405            Some(WindShearModelV1::Logarithmic)
406        );
407        assert_eq!(
408            first.samples, second.samples,
409            "a round-tripped request must re-apply the same shear, not drop it"
410        );
411
412        // Sanity check that the assertion above has teeth: this shot really is one where the
413        // model changes the answer, so "identical samples" is not vacuously true.
414        let unsheared_json = json.replace(r#""wind_shear_model":"logarithmic""#, "");
415        let unsheared = solve_v1(decode_solve_request_v1(&unsheared_json).unwrap()).unwrap();
416        assert_ne!(
417            unsheared.samples, first.samples,
418            "the fixture must be a shot where wind shear actually changes the trajectory"
419        );
420    }
421}