Improved conflict resolution in Hungarian (+ remove broken normalization) #51
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.
For the row-wise normalization, this was introduced in the wrong place, but also on further discussion with Jeff and tests on RibonanzaNet, it seems like this is likely ineffective/not really correct
For the improved conflict resolution algorithm, we now pick conflicting base pairs based on highest probability where possible, otherwise similar to Threshknot (bp distance then lowest base) where applicable
I tested a number of sample scenarios by hand in an attempt to verify the various conditions here