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

include MARA classification #60

Merged
merged 4 commits into from
Jun 10, 2015
Merged

include MARA classification #60

merged 4 commits into from
Jun 10, 2015

Conversation

irenne
Copy link

@irenne irenne commented Apr 24, 2015

closes issue #19

%
% For more information, see: http://www.user.tu-berlin.de/irene.winkler/artifacts/
%
% THIS FUNCTION REQUIRES CLASSIFIER .MAT FILES TO BE INCLUDED IN THE PATH.
Copy link
Contributor

Choose a reason for hiding this comment

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

update this description, mentioning that the dependencies can be downloaded with
bbci_import_dependencies('MARA')

@BenjaminBlankertz
Copy link
Contributor

The requirement to have the required files in the path is not so nice. I think they should be stored, e.g., somewhere below [BTB.DataDir, '/bbciFile'] and then you load them accordingly
load( fullfile( BTB.DataDir, 'bbciFile', 'MARAtrdata', 'fv_training_MARA') );

In the demo, it should be checked whether the required files exist. If not issue an error message that explains where to store the files and where to get them.
(Btw. in the ZIP file, there are these auxiliary MACOSX files. Would b nice to remove them from the archieve.)

The demo looks very good!


lambda = 100;

load inv_matrix_icbm152.mat; %L (forward matrix 115 x 2124 x 3), clab (channel labels)
Copy link
Contributor

Choose a reason for hiding this comment

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

try
loadData = load(fullfile(BTB.Dir, 'external', 'mara', 'inv_matrix_icbm152.mat'))
L = loadData.L
clab = loadData.clab
catch
error(sprintf('could not load dependencies of MARA. \nMake sure that you have have successfully downloaded the requested files with \n\n> bbci_import_dependencies(''MARA'') '))
end

@JohannesHoehne
Copy link
Contributor

@BenjaminBlankertz : The MARA data can be downloaded with the bbci_import_dependencies('MARA')

However, saving these directly into the BTB.DataDir may be problematic as the startup script will be executed before defining the DataDir... Therefore, I vote for leaving the MARA data in the BTB.Dir/external/mara ...

@BenjaminBlankertz
Copy link
Contributor

Ok. From my side, the issue can be closed.

JohannesHoehne added a commit that referenced this pull request Jun 10, 2015
include MARA classification
@JohannesHoehne JohannesHoehne merged commit d580f39 into bbci:master Jun 10, 2015
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.

3 participants