diff --git a/Contents.m b/Contents.m index 75858b3..0878404 100644 --- a/Contents.m +++ b/Contents.m @@ -1,5 +1,5 @@ % -% MemToolbox beta 2 +% MemToolbox 1.0.0 % % The MemToolbox is a collection of MATLAB functions for modeling visual % working memory. In support of its goal to provide a full suite of data @@ -15,9 +15,12 @@ % % If you want to acknowledge use of this software when you publish your % research, you might say something like, "Data analysis was performed -% in MATLAB using the MemToolbox (citation)." +% in MATLAB using the MemToolbox (Suchow, Brady, Fougnie & Alvarez, in press)." +% +% and then cite % -% [citation goes here] +% Suchow, J. W., Brady, T. F., Fougnie, D., & Alvarez, G. A. (in press). +% Modeling visual working memory with the MemToolbox. Journal of Vision. % % MemFit.m - a general purpose fitting tool % Setup.m - install MemToolbox to Matlab PATH diff --git a/LICENSE b/LICENSE index 7c3bc4a..a391e3d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2012 by Timothy F. Brady, Jordan W. Suchow, Daryl Fougnie, and George A. Alvarez. All rights reserved. +Copyright (c) 2013 by Timothy F. Brady, Jordan W. Suchow, Daryl Fougnie, and George A. Alvarez. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/MemData/Contents.m b/MemData/Contents.m index 639ba57..66e43d6 100644 --- a/MemData/Contents.m +++ b/MemData/Contents.m @@ -5,4 +5,7 @@ % % Data manipulation % Resample - Resample the data -% SplitDataByField - Splits a dataset into subsets based on the given field \ No newline at end of file +% SplitDataByField - Splits a dataset into subsets based on the given field +% SplitDataByCondition - Splits a dataset into subsets based on .condition +% GetDataByField - Gets all elements of data from the requested field +% RemoveDataByField - Removes all elements of data from the requested field \ No newline at end of file diff --git a/MemExperiments/Contents.m b/MemExperiments/Contents.m index cd336f1..4e0d58a 100644 --- a/MemExperiments/Contents.m +++ b/MemExperiments/Contents.m @@ -1,6 +1,6 @@ % % MemToolbox::MemExperiments -% beta 2 +% 1.0.0 % % MemExperiments contains example code for running a continuous color % report experiment in the style of Zhang & Luck (2008). diff --git a/MemFit.m b/MemFit.m index 1594108..cf333a3 100644 --- a/MemFit.m +++ b/MemFit.m @@ -249,7 +249,7 @@ end end if(verbosity > 0) - fprintf('\nThis analysis was performed using a\nbeta release of the MemToolbox.\n\n') + fprintf('\nThis analysis was performed using MemToolbox version 1.0.0.\n\n') end end diff --git a/MemFitting/Contents.m b/MemFitting/Contents.m index 0d09328..c945194 100644 --- a/MemFitting/Contents.m +++ b/MemFitting/Contents.m @@ -7,8 +7,8 @@ % MAP - Find maximum a posterior fit of model to data % % Fit multiple subjects at once -% FitMultipleSubjects_Hierarchical - treat subjects as samples from a global normal -% FitMultipleSubjects_Independent - fits many subjects data using MAP +% FitMultipleSubjects_MAP - fits many subjects' data using MAP +% FitMultipleSubjects_MLE - fits many subjects' data using MLE % % Utility functions % MCMCSummarize - Convert samples from MCMC into estimates of parameters diff --git a/MemModels/Contents.m b/MemModels/Contents.m index 11e011f..1680e6d 100644 --- a/MemModels/Contents.m +++ b/MemModels/Contents.m @@ -24,4 +24,4 @@ % FixParameterValue - fix any parameter in a model to a specific value % Orientation - converts a model to use a 180 degree space % TwoAFC - converts a model so that can be fit to 2afc data -% +% WithLapses - adds inattentional parameter to any model diff --git a/MemTutorial/Contents.m b/MemTutorial/Contents.m index d40dc27..8975943 100644 --- a/MemTutorial/Contents.m +++ b/MemTutorial/Contents.m @@ -2,12 +2,9 @@ % % Files % demo1 - -% demo2 - -% demo4 - -% demo7 - +% ... +% demo18 % GridSearch_Example - % MCMC_Example - -% ModelComparison_Example - Example data % PlotModelFitInteractive_Example - -% Splines_Example - ------------------------------------------------------------------------- -% SplinesWithGuesses_Example - ------------------------------------------------------------------------- +% TemplateModel - example model with helper text \ No newline at end of file diff --git a/README b/README index 87a8933..6128a84 100644 --- a/README +++ b/README @@ -1,5 +1,4 @@ -MemToolbox beta. - +MemToolbox 1.0.0. The MemToolbox is a collection of MATLAB functions for modeling visual working memory. In support of its goal to provide a full suite of data @@ -14,6 +13,8 @@ If you wish to acknowledge use of this software when you publish your research, you might say something like, "Data analysis was performed using the MemToolbox (memtoolbox.org)." +The MemToolbox uses semantic versioning (http://semver.org/). + Contents: MemFit.m - a general purpose fitting tool Setup.m - adds the toolbox and its subfolders to the path