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