Skip to content

Fix bugs before major pull request is approved - #197

Merged
mihaic merged 32 commits into
brainiak:masterfrom
lcnature:fix_bug
Mar 22, 2017
Merged

mihaic merged 32 commits into
brainiak:masterfrom
lcnature:fix_bug

Conversation

@lcnature

Copy link
Copy Markdown
Contributor

Since the pull request of adding GBRSA and score/transform function can take a while, I want to have this minor pull request while the major one is being reviewed.

  1. fix the bug in posterior estimation of beta in BRSA.
  2. changed the code where scipy.linalg.block_diag is called because its treatment of empty matrix changed last November. This issue also causes the failure of test in the pull request of distributed searchlight.
  3. speed up test_brsa.py

lcnature and others added 30 commits September 2, 2016 10:12
lcnature
a
 Changes to be committed:
	new file: brainiak/brsa/test.txt
lcnature
a
 Changes to be committed:
	new file: brainiak/brsa/test.txt
lcnature
a
 Changes to be committed:
	new file: brainiak/brsa/test.txt
lcnature
a
 Changes to be committed:
	new file: brainiak/brsa/test.txt
lcnature
a
 Changes to be committed:
	new file: brainiak/brsa/test.txt
lcnature
a
 Changes to be committed:
	new file: brainiak/brsa/test.txt
lcnature
a
 Changes to be committed:
	new file: brainiak/brsa/test.txt
lcnature
a
 Changes to be committed:
	new file: brainiak/brsa/test.txt
…nge in last November.

Fixed the bug in posterior estimation of betas since the review of the major pull request might take longer.
@mihaic

mihaic commented Mar 22, 2017

Copy link
Copy Markdown
Member

Please follow the naming convention for modules, even for example files, and even for notebook files:
https://www.python.org/dev/peps/pep-0008/#package-and-module-names

You could use bayesian_rsa_example.ipynb.

@lcnature

Copy link
Copy Markdown
Contributor Author

Done.

@mihaic
mihaic merged commit ab60664 into brainiak:master Mar 22, 2017
@lcnature
lcnature deleted the fix_bug branch March 22, 2017 20:13
CameronTEllis pushed a commit to CameronTEllis/brainiak that referenced this pull request May 12, 2017
* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* 	deleted:    brsa/test.txt

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* 	deleted:    brsa/test.txt

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* 	deleted:    brsa/test.txt

* 	deleted:    brsa/test.txt

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* 	deleted:    brsa/test.txt

* 	deleted:    brsa/test.txt

* 	deleted:    brsa/test.txt

* 	deleted:    brsa/test.txt

* Changed all usage of scipy.linalg.block_diag in accordance to its change in last November.
Fixed the bug in posterior estimation of betas since the review of the major pull request might take longer.

* reduce testing time for brsa

* renamed BRSA example

* rename brsa example
mihaic pushed a commit that referenced this pull request May 12, 2017
* Substantial edits to how noise is calculated. Some edits to how noise is created. Altered test and example to suit update

* pep8 update

* Made _calc_fwhm less complex

* Update for edits

* [reprsimil] Fix BRSA bugs (#197)

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* 	deleted:    brsa/test.txt

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* 	deleted:    brsa/test.txt

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* 	deleted:    brsa/test.txt

* 	deleted:    brsa/test.txt

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* a
 Changes to be committed:
	new file: brainiak/brsa/test.txt

* 	deleted:    brsa/test.txt

* 	deleted:    brsa/test.txt

* 	deleted:    brsa/test.txt

* 	deleted:    brsa/test.txt

* Changed all usage of scipy.linalg.block_diag in accordance to its change in last November.
Fixed the bug in posterior estimation of betas since the review of the major pull request might take longer.

* reduce testing time for brsa

* renamed BRSA example

* rename brsa example

* [dev] Fix LDFLAGS for LLVM on MacOS

* _calc_snr turned into _calc_sfnr with the necessary changes associated with it. Improves accuracy of noise modelling

* Pep8 errors corrected
danielsuo pushed a commit that referenced this pull request Nov 16, 2017
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.

2 participants