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.

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

Treebuilder: refactor trees_ vector #87

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

larissakl
Copy link
Contributor

We noted that the trees_ vector in HMMStateNetwork is actually superfluous because it always contains at most one element, making it unnecessary to save multiple Tree objects. Therefore, I refactored this to use a single member tree_ instead of a vector. As a result, constructs such as the TreeIndex and the concept of the masterTree in PersistentStateTree could also be removed.

Since I'm not 100% confident that everything is correct and I want to avoid breaking anything, I have opened this PR to merge into the seq2seq-revamp branch. If you however believe the changes are fine, we could also consider merging it directly into the master branch
This PR builds on the code from PR #85 .

@curufinwe
Copy link
Contributor

I merged PR #85 . Could you @larissakl or @SimBe195 update the target branch with it so that we don't see the changes from #85 in this PR? Thanks!

@larissakl
Copy link
Contributor Author

I merged the master branch into seq2seq-revamp, so the code from #85 should be included now

# Conflicts:
#	src/Search/AdvancedTreeSearch/PersistentStateTree.cc
#	src/Search/AdvancedTreeSearch/TreeBuilder.cc
@curufinwe
Copy link
Contributor

Hmm, the diff in GitHub still has a lot of the old changes. So something is not right yet.

@larissakl
Copy link
Contributor Author

I see what you mean. Do you have any suggestions how to solve that? I'm not very good at Git, to be honest.

@SimBe195
Copy link
Collaborator

SimBe195 commented Jan 9, 2025

Do you have any suggestions how to solve that?

It happens because this was created as a PR into seq2seq-revamp, not into master. Can you change the target of the PR to the master branch @larissakl ?

@larissakl
Copy link
Contributor Author

Sure, but as I said, I'm not completely confident that everything is correct. I tested it with old AdvancedTreeSearchJob, but I did not do any further extensive testing.

@larissakl larissakl changed the base branch from seq2seq-revamp to master January 9, 2025 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants