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

Jump to bottom

Fix build by upgrading CategoricalEmission::incorporate to take a weight #78

Merged
merged 1 commit into from
Jul 9, 2024
Merged

Fix build by upgrading CategoricalEmission::incorporate to take a weight #78

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
11 changes: 3 additions & 8 deletions cxx/emissions/categorical.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,9 @@ class CategoricalEmission : public Emission<int> {
}
};

void incorporate(const std::pair<int, int>& x) {
++N;
emission_dists[x.first].incorporate(x.second);
}

void unincorporate(const std::pair<int, int>& x) {
Copy link
Collaborator

@srvasude srvasude Jul 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should unincorporate be deleted?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. The base.hh Distribution class defines unincorporate(x) to just be incorporate(x, -1.0) and that definition is totally appropriate here.

--N;
emission_dists[x.first].unincorporate(x.second);
void incorporate(const std::pair<int, int>& x, double weight = 1.0) {
N += weight;
emission_dists[x.first].incorporate(x.second, weight);
}

double logp(const std::pair<int, int>& x) const {
Expand Down