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

Bug fixes for my files #25

Merged
merged 10 commits into from
May 6, 2023
Merged

Bug fixes for my files #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
981d4a9
added testing for gaussian and samba
asemposki Apr 4, 2023
10492c8
finished test suite
asemposki Apr 7, 2023
ded0ae6
updated testing suite
asemposki Apr 14, 2023
8dbeeca
new updates
asemposki Apr 19, 2023
62293c6
Fixed var_weights
asemposki Apr 19, 2023
75cdf0b
BAND camp notebook
asemposki May 2, 2023
3bfac61
almost done
asemposki May 3, 2023
cfe3f33
necessary bug fixes
asemposki May 3, 2023
3fec969
Merge branch 'develop' into develop
asemposki May 3, 2023
0aae2dc
Delete Taweret_MMM_Tutorial.ipynb
asemposki May 3, 2023
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
4 changes: 3 additions & 1 deletion Taweret/mix/gaussian.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ def predict(self, ci=68):
var = 1/denom

# variances for each model
self.var_weights = v/np.sum(v, axis=0)
v = np.asarray(v)
weights = 1.0/v
self.var_weights = weights/np.sum(weights, axis=0)

# std_dev calculation
std_dev = np.sqrt(var)
Expand Down
4 changes: 2 additions & 2 deletions test/test_gaussian.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ def test_evaluate_weights():
samba_arrays = np.loadtxt('samba_results.txt', delimiter=',')

# separate out weights
weights_low = samba_arrays[9]
weights_high = samba_arrays[8]
weights_low = samba_arrays[8]
weights_high = samba_arrays[9]

# test weights
assert np.allclose(weights_low, mixed.var_weights[0,:]), \
Expand Down