search

UMPsychMethodsCore / MethodsCore

All of the projects that the methods core develops, combined into one repository!
7 stars 0 forks source link

Graphtheory updates 11/21/2014 #366

Closed yfangumich closed 8 years ago

yfangumich commented 9 years ago
  1. Add options for cleansing correlation data before graph theoretical calculation.
  2. Some updates on help comments.
  3. Some bug fixes.
dankessler commented 9 years ago

Hey @yfangumich , I noticed that you added mc_CovariateCorrectionFast.m in the graphtheory lib folder.

Public already contains this file due to an earlier merge of matlabScripts_beta. The version in public is older than what you've included in your pull requests (it doesn't support F testing) but the current version in matlabScripts_beta does (and appears to be identical to your version).

Rather than copying that function, it's probably better to have the code in only one place, which will make support easier (especially with hotfixes for bugs).

To that end, I suggest you

  1. Revert the commit that introduced mc_CovariateCorrectionFast.m. Provide some info in the commit message for why you are doing this, and consider referencing this issue/pull request as #366 in the commit message so that it links to this discussion.
  2. Partially revert the reversion with git revert $SHA -n. The -n flag will prevent it from actually commiting the reversion. You will then need to manually reset to unstage the changes that would introduce the mc_CovariateCorrectionFast.m file.
  3. Commit, and push to your github repo. That should update the pull request.