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

Fcma partial sim matrix #168

Merged
merged 8 commits into from Jan 26, 2017

Conversation

Projects
None yet
2 participants
@yidawang
Contributor

yidawang commented Jan 25, 2017

add partial similarity matrix algorithm in correlation-based classification
add the corresponding test code
rename some methods
improve the example code

Show outdated Hide outdated brainiak/fcma/classifier.py
Show outdated Hide outdated brainiak/fcma/classifier.py
Show outdated Hide outdated brainiak/fcma/classifier.py
@@ -57,7 +63,10 @@ class Classifier(BaseEstimator):
default None

This comment has been minimized.

@mihaic

mihaic Jan 25, 2017

Contributor

Attributes are not set during initialization. They are not None.

@mihaic

mihaic Jan 25, 2017

Contributor

Attributes are not set during initialization. They are not None.

This comment has been minimized.

@yidawang

yidawang Jan 25, 2017

Contributor

deleted this line

@yidawang

yidawang Jan 25, 2017

Contributor

deleted this line

@@ -57,7 +63,10 @@ class Classifier(BaseEstimator):
default None
training_data\_ is None except clf is SVM.SVC with precomputed kernel,
in which case training data is needed to compute
the similarity vector for each sample to be classified
the similarity vector for each sample to be classified.
However, if the test samples are also provided during the fit,

This comment has been minimized.

@mihaic

mihaic Jan 25, 2017

Contributor

Please add a paragraph at the beginning of the docstring explaining how testing data can be passed to fit as an optimization.

@mihaic

mihaic Jan 25, 2017

Contributor

Please add a paragraph at the beginning of the docstring explaining how testing data can be passed to fit as an optimization.

This comment has been minimized.

@yidawang

yidawang Jan 26, 2017

Contributor

done

@yidawang

yidawang Jan 26, 2017

Contributor

done

Show outdated Hide outdated brainiak/fcma/classifier.py
Show outdated Hide outdated brainiak/fcma/classifier.py
Show outdated Hide outdated brainiak/fcma/classifier.py
Show outdated Hide outdated examples/fcma/classification.py

yidawang added some commits Jan 26, 2017

@mihaic

mihaic approved these changes Jan 26, 2017

@mihaic mihaic merged commit ae41eba into brainiak:master Jan 26, 2017

2 of 3 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
linux Build finished.
Details
macos Build finished.
Details

@yidawang yidawang deleted the yidawang:fcma_partial_sim_matrix branch Jan 26, 2017

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