graspologic icon indicating copy to clipboard operation
graspologic copied to clipboard
verified publisher icon graspologic-org

Jw feature

Open jwellan1 opened this issue 3 years ago • 1 comments

  • [ ] Does this PR have a descriptive title that could go in our release notes?
  • [ ] Does this PR add any new dependencies?
  • [x] Does this PR modify any existing APIs?
    • [x] Is the change to the API backwards compatible?
  • [x] Have you built the documentation (reference and/or tutorial) and verified the generated documentation is appropriate?

Reference Issues/PRs

What does this implement/fix? Briefly explain your changes.

This PR adds the code Ben Pedigo wrote for statistically comparing two networks using either the Erdos-Renyi Test or the Group Connection Test. This code is in a new module called graspologic/symmetry. Tutorial files are in docs/tutorials/symmetry_testing.

Any other comments?

jwellan1 avatar Aug 12 '22 18:08 jwellan1

CLA assistant check
All CLA requirements met.

ghost avatar Aug 12 '22 18:08 ghost

hey @jwellan1 - not sure what happened here (and maybe you are already aware of it), but it looks like you merged in a bunch of commits from main or some other old history

bdpedigo avatar Sep 08 '22 15:09 bdpedigo

I was trying to push my commit and couldn't understand what was stopping it so I was trying to make the right pull command to fix it. Do you think I've made unfixable changes to my branch, or is there something I need to do to fix it?

From: Benjamin Pedigo @.> Sent: Thursday, September 8, 2022 11:45 AM To: microsoft/graspologic @.> Cc: Jeremy M Welland @.>; Mention @.> Subject: Re: [microsoft/graspologic] Added density test and group connection test to the inference module (PR #981)

  External Email - Use Caution

hey @jwellan1https://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fjwellan1&data=05%7C01%7Cjwellan1%40jhmi.edu%7Ca6c07d56a1344c968f0c08da91b12a1b%7C9fa4f438b1e6473b803f86f8aedf0dec%7C0%7C0%7C637982487348929052%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=OiqntBTL3HPFJWCum2LW%2BRzuY1SQ8q4Q4Vkl3ximcgA%3D&reserved=0 - not sure what happened here (and maybe you are already aware of it), but it looks like you merged in a bunch of commits from main or some other old history

Reply to this email directly, view it on GitHubhttps://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fgraspologic%2Fpull%2F981%23issuecomment-1240897018&data=05%7C01%7Cjwellan1%40jhmi.edu%7Ca6c07d56a1344c968f0c08da91b12a1b%7C9fa4f438b1e6473b803f86f8aedf0dec%7C0%7C0%7C637982487348929052%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=CHAztFyLzM%2BdogE3cbnV8B6m0Zp6T3MUMQel6TKU3Kw%3D&reserved=0, or unsubscribehttps://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FA2EZC56GXPOHYTSHT3DZVGDV5ICYNANCNFSM56MOMJ4Q&data=05%7C01%7Cjwellan1%40jhmi.edu%7Ca6c07d56a1344c968f0c08da91b12a1b%7C9fa4f438b1e6473b803f86f8aedf0dec%7C0%7C0%7C637982487349085291%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=qBBs7%2BClm7IbYMVI2JRYL8gY1TfFccHYaMRjJnV9AVQ%3D&reserved=0. You are receiving this because you were mentioned.Message ID: @.***>

jwellan1 avatar Sep 08 '22 20:09 jwellan1

I was trying to push my commit and couldn't understand what was stopping it so I was trying to make the right pull command to fix it. Do you think I've made unfixable changes to my branch, or is there something I need to do to fix it? From: Benjamin Pedigo @.> Sent: Thursday, September 8, 2022 11:45 AM To: microsoft/graspologic @.> Cc: Jeremy M Welland @.>; Mention @.> Subject: Re: [microsoft/graspologic] Added density test and group connection test to the inference module (PR #981) External Email - Use Caution hey @jwellan1https://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fjwellan1&data=05%7C01%7Cjwellan1%40jhmi.edu%7Ca6c07d56a1344c968f0c08da91b12a1b%7C9fa4f438b1e6473b803f86f8aedf0dec%7C0%7C0%7C637982487348929052%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=OiqntBTL3HPFJWCum2LW%2BRzuY1SQ8q4Q4Vkl3ximcgA%3D&reserved=0 - not sure what happened here (and maybe you are already aware of it), but it looks like you merged in a bunch of commits from main or some other old history - Reply to this email directly, view it on GitHubhttps://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fgraspologic%2Fpull%2F981%23issuecomment-1240897018&data=05%7C01%7Cjwellan1%40jhmi.edu%7Ca6c07d56a1344c968f0c08da91b12a1b%7C9fa4f438b1e6473b803f86f8aedf0dec%7C0%7C0%7C637982487348929052%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=CHAztFyLzM%2BdogE3cbnV8B6m0Zp6T3MUMQel6TKU3Kw%3D&reserved=0, or unsubscribehttps://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FA2EZC56GXPOHYTSHT3DZVGDV5ICYNANCNFSM56MOMJ4Q&data=05%7C01%7Cjwellan1%40jhmi.edu%7Ca6c07d56a1344c968f0c08da91b12a1b%7C9fa4f438b1e6473b803f86f8aedf0dec%7C0%7C0%7C637982487349085291%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=qBBs7%2BClm7IbYMVI2JRYL8gY1TfFccHYaMRjJnV9AVQ%3D&reserved=0. You are receiving this because you were mentioned.Message ID: @.***>

Hard for me to say just because I'm not sure exactly how you rebased/merged. If it was just one of the recent commits, you can try looking through those (e.g. https://github.com/microsoft/graspologic/pull/981/commits/044c4a204c56d7e98e83732256774adbb2b7e201 you can see that some files are messed with that I dont think you mean to mess with). Then you can have a look at https://sethrobertson.github.io/GitFixUm/fixup.html for tips on how to remove those offending commits.

the thing that makes me worried though is how if you look at the commit history on this PR, you are somehow pulling in some changes from ~2years ago (i think you may have done something with main instead of dev?). I have seen that happen before and i never know exactly what command is causing and how to fix. If all else fails, you can open a new PR from a fresh branch (usually not ideal because we have the review history above, but that wont be lost, not a huge deal)

bdpedigo avatar Sep 08 '22 23:09 bdpedigo

This PR continues as PR #992 https://github.com/microsoft/graspologic/pull/992 (closing this PR because existing branch has become compromised).

jwellan1 avatar Sep 19 '22 19:09 jwellan1