Walkers and gflux code #35
Open
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
Conflicts: hop/graph.py Conflict resolved; several commented lines were removed
…h.py. sitemap.py has been updated for use with networkx 1.9.1
…ead of local branch
…tcl appeared to be an older version
…and fixed the up/down flux option for the walker
…ere also indentation errors. The write_psf and _rate function/method are no longer copied. 2. Trajectory.py had many strange indents which should have caused syntax errors. It is not immediately apparent why these ever entered the code in the first place, but all of them should be removed. 3. sitemap.py had an earlier update to conform better with the new networkx. I improved the syntax so that it is now cleaner (used list() function instead of list comprehension).
… between 3.4 and main with my sorting additions
…olume sorting to make it consistent with 3.4, bug is fixed
Closed
|
Note for the future: see also comments on the code in the closed PR #20. |
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.
Pull request to maintain a record of @iwelland 's code:
Currently, this will not cleanly merge with master (at release 0.4.0 at time of PR). One will need to look at this PR in detail to check what needs to be included.