Skip to content

Commit 8e6a11e

Browse files
committed
typing
1 parent 0871b7a commit 8e6a11e

File tree

4 files changed

+32
-24
lines changed

4 files changed

+32
-24
lines changed

src/adam_impact_study/analysis/collect.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,10 @@ def create_missing_window_results_worker(
302302

303303

304304
def create_missing_window_results(
305-
observations: Observations, window_results: WindowResult, max_processes: int = 1, chunk_size: int = 100
305+
observations: Observations,
306+
window_results: WindowResult,
307+
max_processes: int = 1,
308+
chunk_size: int = 100,
306309
) -> WindowResult:
307310
"""Create missing window results for observations that do not have correspondingwindow results.
308311
@@ -470,5 +473,7 @@ def collect_all_results(
470473
window_results = collect_all_window_results_new(
471474
run_dir, max_processes=max_processes
472475
)
473-
window_results = create_missing_window_results(observations, window_results, max_processes=max_processes)
476+
window_results = create_missing_window_results(
477+
observations, window_results, max_processes=max_processes
478+
)
474479
return impactor_orbits, observations, timings, window_results

src/adam_impact_study/analysis/main.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ def compute_observation_cadence(
455455

456456
def _select_ip_at_discovery_time(
457457
orbit_id: str,
458-
all_window_results: WindowResult, # Note! Pass in all windows
458+
all_window_results: WindowResult, # Note! Pass in all windows
459459
discovery_dates: DiscoveryDates,
460460
) -> float:
461461
"""
@@ -466,13 +466,17 @@ def _select_ip_at_discovery_time(
466466
if len(orbit_results) == 0 or len(orbit_discovery_date) == 0:
467467
return None
468468

469-
assert len(orbit_discovery_date) == 1, f"{orbit_id} had {len(orbit_discovery_date)} discovery dates, expected 1"
470-
469+
assert (
470+
len(orbit_discovery_date) == 1
471+
), f"{orbit_id} had {len(orbit_discovery_date)} discovery dates, expected 1"
472+
471473
if pc.all(pc.is_null(orbit_discovery_date.discovery_date.days)).as_py():
472474
return None
473475

474476
discovery_window = orbit_results.apply_mask(
475-
orbit_results.observation_end.equals(orbit_discovery_date.discovery_date, precision="ms")
477+
orbit_results.observation_end.equals(
478+
orbit_discovery_date.discovery_date, precision="ms"
479+
)
476480
)
477481

478482
return discovery_window.impact_probability[0].as_py()
@@ -489,7 +493,9 @@ def summarize_impact_study_object_results(
489493
Summarize the impact study results for a single object.
490494
"""
491495
impactor_orbit = impactor_orbits.select("orbit_id", orbit_id)
492-
assert len(impactor_orbit) == 1, f"{orbit_id} had {len(impactor_orbit)} impactor orbits, expected 1"
496+
assert (
497+
len(impactor_orbit) == 1
498+
), f"{orbit_id} had {len(impactor_orbit)} impactor orbits, expected 1"
493499

494500
orbit_observations = observations.select("orbit_id", orbit_id)
495501
orbit_results_timing = results_timing.select("orbit_id", orbit_id)
@@ -504,7 +510,6 @@ def summarize_impact_study_object_results(
504510
pc.equal(orbit_window_results.status, "complete")
505511
).as_py()
506512

507-
508513
first_observation = orbit_observations.coordinates.time.min()
509514
last_observation = orbit_observations.coordinates.time.max()
510515

@@ -691,14 +696,13 @@ def summarize_impact_study_results(
691696
futures = []
692697
results = ImpactorResultSummary.empty()
693698

694-
# Place our objects in the object store if we are using ray
699+
# Place our objects in the object store if we are using ray
695700
if use_ray:
696701
impactor_orbits_ref = ray.put(impactor_orbits)
697702
observations_ref = ray.put(observations)
698703
results_timing_ref = ray.put(results_timing)
699704
window_results_ref = ray.put(window_results)
700705

701-
702706
for orbit_id in unique_orbit_ids:
703707
if use_ray:
704708
futures.append(

src/adam_impact_study/analysis/plots.py

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,11 @@ def plot_warning_time_histogram(
2727
summary = summary.apply_mask(summary.complete())
2828

2929
fig, ax = plt.subplots(1, 1, dpi=200)
30-
warning_time_max = (
31-
pc.ceil(
32-
pc.max(
33-
pc.subtract(
34-
summary.orbit.impact_time.mjd(),
35-
summary.ip_threshold_1_percent.mjd(),
36-
)
30+
warning_time_max = pc.ceil(
31+
pc.max(
32+
pc.subtract(
33+
summary.orbit.impact_time.mjd(),
34+
summary.ip_threshold_1_percent.mjd(),
3735
)
3836
)
3937
)
@@ -195,7 +193,6 @@ def plot_arclength_by_diameter(
195193

196194
unique_diameters = summary.orbit.diameter.unique().sort().to_pylist()
197195
colors = plt.cm.coolwarm(np.linspace(0, 1, len(unique_diameters)))
198-
199196

200197
# Get the max arc length
201198
max_arc_length = pc.max(summary.arc_length()).as_py()
@@ -213,14 +210,12 @@ def plot_arclength_by_diameter(
213210
alpha=0.7,
214211
label=f"{diameter:.3f} km",
215212
)
216-
213+
217214
ax.set_xlabel("Arc Length [days]")
218215
ax.set_ylabel("Count")
219216
ax.legend(frameon=False, bbox_to_anchor=(1.01, 0.75))
220217

221218
return fig, ax
222-
223-
224219

225220

226221
def plot_runtime_by_diameter(
@@ -922,7 +917,9 @@ def plot_arc_length_by_diameter_decade(
922917
orbits_at_diameter_and_decade = orbits_at_decade.select(
923918
"orbit.diameter", diameter
924919
)
925-
arc_length = orbits_at_diameter_and_decade.arc_length().to_numpy(zero_copy_only=False)
920+
arc_length = orbits_at_diameter_and_decade.arc_length().to_numpy(
921+
zero_copy_only=False
922+
)
926923
mean_arc_length = np.mean(arc_length) if arc_length.size > 0 else 0
927924
arc_length_by_diameter_decade = qv.concatenate(
928925
[

src/adam_impact_study/types.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class ImpactorOrbits(qv.Table):
4848
impact_time = Timestamp.as_column()
4949
dynamical_class = qv.LargeStringColumn()
5050
ast_class = qv.LargeStringColumn()
51-
diameter = qv.Float64Column() # km
51+
diameter = qv.Float64Column() # km
5252
albedo = qv.Float64Column()
5353
H_r = qv.Float64Column()
5454
u_r = qv.Float64Column()
@@ -293,7 +293,9 @@ def days_100_percent_to_impact(self) -> pa.FloatArray:
293293
self.orbit.impact_time.mjd(), self.ip_threshold_100_percent.mjd()
294294
)
295295

296-
def get_diameter_decade_data(self) -> Tuple[npt.NDArray[np.int64], npt.NDArray[np.int64], list]:
296+
def get_diameter_decade_data(
297+
self,
298+
) -> Tuple[npt.NDArray[np.int64], npt.NDArray[np.int64], list]:
297299
"""
298300
Extract impact decades and common data needed for diameter-decade analysis.
299301
Returns

0 commit comments

Comments
 (0)