Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keyboard interrupt support in propagation #9

Merged
merged 1 commit into from
Apr 29, 2024
+74 −61
Merged

Keyboard interrupt support in propagation #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
135 changes: 74 additions & 61 deletions src/neospy/rust/propagation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use neospy_core::{
spice::{self, get_spk_singleton},
state::State,
};
use pyo3::{pyfunction, PyResult, Python};
use pyo3::{pyfunction, PyErr, PyResult, Python};
use rayon::prelude::*;

use crate::simult_states::SimulStateLike;
Expand All @@ -20,74 +20,87 @@ pub fn propagation_n_body_spk_py(
jd_final: f64,
include_asteroids: bool,
a_terms: Vec<Option<(f64, f64, f64, bool)>>,
suppress: Option<bool>,
suppress_errors: Option<bool>,
) -> PyResult<Vec<PyState>> {
let suppress = suppress.unwrap_or(true);
let suppress_errors = suppress_errors.unwrap_or(true);
let states = states.into_states(py)?;

states
.into_iter()
.zip(a_terms)
.collect_vec()
.into_par_iter()
.map(|(mut state, a_term)| {
let a_term = a_term.map(|(a1, a2, a3, comet)| {
if comet {
propagation::NonGravModel::new_comet_default(a1, a2, a3)
} else {
propagation::NonGravModel::new_r2(a1, a2, a3)
}
});
let spk = get_spk_singleton().try_read().unwrap();
let center = state.center_id;
if let Err(e) = spk.try_change_center(&mut state, 0) {
if !suppress {
Err(e)?;
};
return Ok(
State::new_nan(state.desig.clone(), jd_final, state.frame, center).into(),
);
};
let mut res: Vec<PyState> = Vec::new();

// propagation is broken into chunks of 1000 states, every time a chunk is completed
// python is checked for signals. This allows keyboard interrupts to be caught
// and the process interrupted.

for chunk in states.into_iter().zip(a_terms).collect_vec().chunks(1000) {
py.check_signals()?;

// if the input has a NAN in it, skip the propagation entirely and return
// the nans.
if state.pos.iter().any(|x| !x.is_finite()) || state.vel.iter().any(|x| !x.is_finite())
{
if !suppress {
Err(NEOSpyError::ValueError("Input state contains NaNs.".into()))?;
let mut proc_chunk = chunk
.to_vec()
.into_par_iter()
.map(|(mut state, a_term)| {
let a_term = a_term.map(|(a1, a2, a3, comet)| {
if comet {
propagation::NonGravModel::new_comet_default(a1, a2, a3)
} else {
propagation::NonGravModel::new_r2(a1, a2, a3)
}
});
let spk = get_spk_singleton().try_read().unwrap();
let center = state.center_id;
if let Err(e) = spk.try_change_center(&mut state, 0) {
if !suppress_errors {
Err(e)?;
};
return Ok::<PyState, PyErr>(
State::new_nan(state.desig.clone(), jd_final, state.frame, center).into(),
);
};
return Ok(
State::new_nan(state.desig.clone(), jd_final, state.frame, center).into(),
);
}
let desig = state.desig.clone();
let frame = state.frame;
match propagation::propagate_n_body_spk(state, jd_final, include_asteroids, a_term) {
Ok(mut state) => {
if let Err(er) = spk.try_change_center(&mut state, center) {
if !suppress {
Err(er)?;
}
return Ok(State::new_nan(desig, jd_final, frame, center).into());

// if the input has a NAN in it, skip the propagation entirely and return
// the nans.
if state.pos.iter().any(|x| !x.is_finite())
|| state.vel.iter().any(|x| !x.is_finite())
{
if !suppress_errors {
Err(NEOSpyError::ValueError("Input state contains NaNs.".into()))?;
};
Ok(state.into())
return Ok(
State::new_nan(state.desig.clone(), jd_final, state.frame, center).into(),
);
}
Err(er) => {
if !suppress {
Err(er)?
} else {
if let neospy_core::errors::NEOSpyError::Impact(id, time) = er {
eprintln!(
"Impact detected between {:?} <-> {} at time {}",
desig,
spice::try_name_from_id(id).unwrap_or(id.to_string()),
time
);
let desig = state.desig.clone();
let frame = state.frame;
match propagation::propagate_n_body_spk(state, jd_final, include_asteroids, a_term)
{
Ok(mut state) => {
if let Err(er) = spk.try_change_center(&mut state, center) {
if !suppress_errors {
Err(er)?;
}
return Ok(State::new_nan(desig, jd_final, frame, center).into());
};
Ok(State::new_nan(desig, jd_final, frame, center).into())
Ok(state.into())
}
Err(er) => {
if !suppress_errors {
Err(er)?
} else {
if let neospy_core::errors::NEOSpyError::Impact(id, time) = er {
eprintln!(
"Impact detected between {:?} <-> {} at time {}",
desig,
spice::try_name_from_id(id).unwrap_or(id.to_string()),
time
);
};
Ok(State::new_nan(desig, jd_final, frame, center).into())
}
}
}
}
})
.collect()
})
.collect::<PyResult<Vec<_>>>()?;
res.append(&mut proc_chunk);
}

Ok(res)
}
Loading