Skip to content

Commit 19d9940

Browse files
committed
fix: revert unintended changes
1 parent cc3e5b2 commit 19d9940

File tree

3 files changed

+5
-243
lines changed

3 files changed

+5
-243
lines changed

.github/workflows/docs-link.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ jobs:
1313
name: Run CircleCI artifacts redirector
1414
steps:
1515
- name: GitHub Action step
16-
<<<<<<< HEAD
1716
uses: scientific-python/circleci-artifacts-redirector-action@v1
18-
=======
19-
uses: larsoner/circleci-artifacts-redirector-action@v1
20-
>>>>>>> main
2117
with:
2218
repo-token: ${{ secrets.GITHUB_TOKEN }}
2319
api-token: ${{ secrets.CIRCLECI_DOCS_LINK }}

docs/tutorials/.ipynb_checkpoints/10_Simulation_&_Tracking_Components-checkpoint.py

Lines changed: 0 additions & 231 deletions
This file was deleted.

stonesoup/models/transition/tests/test_ca.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,9 @@ def base(state_vec, noise_diff_coeffs):
134134

135135
# Evaluate the likelihood of the predicted state, given the prior
136136
# (with noise)
137-
prob = model_obj.pdf(
138-
State(new_state_vec_w_enoise),
139-
State(state_vec),
140-
timestamp=new_timestamp,
141-
time_interval=time_interval,
142-
)
137+
prob = model_obj.pdf(State(new_state_vec_w_enoise), State(state_vec),
138+
timestamp=new_timestamp, time_interval=time_interval)
143139
assert approx(prob) == multivariate_normal.pdf(
144-
new_state_vec_w_enoise.T, mean=np.array(F @ state_vec).ravel(), cov=Q
145-
)
140+
new_state_vec_w_enoise.T,
141+
mean=np.array(F@state_vec).ravel(),
142+
cov=Q)

0 commit comments

Comments
 (0)