Bug fix: Optimizing branch lengths in NNI Engine via GP #484
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
davidrich27
changed the title
src/nni_evaluation_engine.cpp
Outdated
| // std::ignore = pre_nni; | ||
| // NNIBranchLengthOptimization(nni, new_edge_ids); | ||
| // } | ||
| // GetGPEngine().ProcessOperations(GetDAG().PopulatePLVs()); |
There was a problem hiding this comment.
Is it safe to now remove the commented code?
src/nni_evaluation_engine.cpp
Outdated
| } | ||
|
|
||
| GetGPEngine().ProcessOperations(GetDAG().ComputeLikelihoods()); | ||
| auto likelihoods = GetGPEngine().GetPerGPCSPLogLikelihoods(); | ||
| std::cout << "GPEngine::UpdateEngineAfterModifying [END]" << std::endl; |
There was a problem hiding this comment.
Let's either remove the printed message or make it optional with an is_quiet parameter.
| // GetLikelihoodEvalEngine().GetDAGBranchHandler().GetBranchLengthData(); | ||
| // return log_likelihoods.block(0, 0, GetEdgeCount(), log_likelihoods.cols()); | ||
| // } | ||
| const PLVEdgeHandler &GetLikelihoodPVs() const { |
There was a problem hiding this comment.
Commented code can go?
| "Adds all valid edges with present nodes to the DAG.") | ||
| .def( | ||
| "fully_connect", [](GPDAG &self) { self.FullyConnect(); }, | ||
| "Adds all valid edges with present nodes to the DAG.") | ||
| // ** I/O |
There was a problem hiding this comment.
Python complains with this version because it doesn't know about the return type. I've removed the return value, since we don't need it on the python side and that's less work than exposing it here.
There was a problem hiding this comment.
It looks like you made these changes.
chrisjenningsshaffer
requested changes
Dec 14, 2023
…lovi/bito into 483-nni-search-gp-branch-lengths-fix
chrisjenningsshaffer
approved these changes
Dec 19, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Closes #483
Tests
N/A
Checklist:
clang-formathas been run