Skip to content

Fix hit detection condition in trajectorycalc.py #26

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

Open
JoshuaWol wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix hit detection condition in trajectorycalc.py #26

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
8 changes: 7 additions & 1 deletion ALt-Trajectories/trajectorycalc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def calc_distances() -> list[tuple[float, float, float]]:
if z>target_z:
prev_hit_z = True

if prev_hit_z and z<target_z:
if prev_hit_z and z<=target_z:
hit = True

effect_of_drag = (-Cd * rho * x_Area * v**2) / (2 * m)
Expand All @@ -53,6 +53,9 @@ def calc_distances() -> list[tuple[float, float, float]]:
v_x += accel_x * dt
v_z += accel_z * dt

prev_x = x
prev_z = z

x += v_x * dt
z += v_z * dt
t += dt
Expand All @@ -63,10 +66,13 @@ def calc_distances() -> list[tuple[float, float, float]]:
missed = True

if hit:
if not math.isclose(z,target_z, rel_tol = 0.0005):
x = x - (x - x_prev) * (z - target_z) / (z - z_prev)
result.append((x, math.degrees(theta_i), vi))




return result


Expand Down
Loading