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

Adding Directionality #120

Merged
merged 50 commits into from
Dec 3, 2023
Merged

Adding Directionality #120

merged 50 commits into from
Dec 3, 2023

Conversation

ntalluri
Copy link
Collaborator

@ntalluri ntalluri commented Aug 23, 2023

Closes #107

src/util.py Outdated Show resolved Hide resolved
src/dataset.py Outdated Show resolved Hide resolved
@ntalluri
Copy link
Collaborator Author

Update Summary.py For Mixed Graphs #128

@agitter
Copy link
Collaborator

agitter commented Sep 19, 2023

Now that we can support mixed graphs, I can update the EGFR example network to the original version that included directed and undirected edges. I'll need to adjust the edge weight that was greater than 1 again. The file came from https://raw.githubusercontent.com/koksal/tps/master/data/networks/phosphosite-irefindex13.0-uniprot.txt

@agitter
Copy link
Collaborator

agitter commented Sep 22, 2023

I merged the Cytoscape changes and resolved merge conflicts in 39b4748. We can extend Cytoscape to support the U and D edge types in the pull request and then update the image to v2.

Copy link
Collaborator

@agitter agitter left a comment

Choose a reason for hiding this comment

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

I continued reviewing and made it through all of the source files under the spras directory.

CONTRIBUTING.md Outdated Show resolved Hide resolved
CONTRIBUTING.md Outdated Show resolved Hide resolved
CONTRIBUTING.md Outdated Show resolved Hide resolved
CONTRIBUTING.md Outdated Show resolved Hide resolved
spras/analysis/graphspace.py Outdated Show resolved Hide resolved
spras/mincostflow.py Outdated Show resolved Hide resolved
spras/omicsintegrator1.py Outdated Show resolved Hide resolved
spras/meo.py Outdated Show resolved Hide resolved
spras/omicsintegrator2.py Outdated Show resolved Hide resolved
spras/omicsintegrator2.py Outdated Show resolved Hide resolved
Copy link
Collaborator

@agitter agitter left a comment

Choose a reason for hiding this comment

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

I finished reviewing the rest of the files in the pull request.

test/GenerateInputs/expected/allpairs-network-expected.txt Outdated Show resolved Hide resolved
test/ParseOutputs/expected/allpairs-pathway-expected.txt Outdated Show resolved Hide resolved
test/GenerateInputs/test_generate_inputs.py Outdated Show resolved Hide resolved
test/GenerateInputs/test_generate_inputs.py Outdated Show resolved Hide resolved
test/ParseOutputs/input/meo-raw-pathway.txt Outdated Show resolved Hide resolved
test/GenerateInputs/test_generate_inputs.py Outdated Show resolved Hide resolved
test/ParseOutputs/test_parse_outputs.py Outdated Show resolved Hide resolved
test/ParseOutputs/test_parse_outputs.py Outdated Show resolved Hide resolved
@agitter
Copy link
Collaborator

agitter commented Dec 3, 2023

I ran the algorithms with the EGFR test data as a final test, which nicely illustrates outputs on a mixed graph. That revealed some problems with self-edges in the dataset that MEO couldn't handle, so I removed them. I also noticed the edge direction support in Cytoscape wasn't working yet, so I rebuilt and pushed the updated Docker image. That didn't fix the problem:
image
I believe it is because there isn't a header row. We will add support for that later (#4 (comment)) and then can retest this.

b4d6e1c contains changes from my final proofreading and formatting. If the tests pass, I'll merge.

@agitter agitter merged commit acea45e into Reed-CompBio:master Dec 3, 2023
5 checks passed
@agitter agitter mentioned this pull request Dec 3, 2023
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.

Supporting directed edges
2 participants