From 7f2973a51c5ca3bed4fb3e823357aa8d46f58552 Mon Sep 17 00:00:00 2001
From: Christian Beckmann <c.beckmann@donders.ru.nl>
Date: Thu, 12 Aug 2004 13:41:26 +0000
Subject: [PATCH] ready for fsl 3.2
---
meldata.cc | 2 +-
melgmix.h | 2 +-
melica.h | 2 +-
melodic.cc | 2 +-
melodic.h | 2 +-
meloptions.cc | 2 +-
meloptions.h | 2 +-
melpca.cc | 2 +-
melpca.h | 2 +-
melreport.cc | 2 +-
melreport.h | 14 +++++++-------
11 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/meldata.cc b/meldata.cc
index 8f6f9b0..cdcae29 100644
--- a/meldata.cc
+++ b/meldata.cc
@@ -5,7 +5,7 @@
Christian F. Beckmann, FMRIB Image Analysis Group
- Copyright (C) 1999-2002 University of Oxford */
+ Copyright (C) 1999-2004 University of Oxford */
/* CCOPYRIGHT */
diff --git a/melgmix.h b/melgmix.h
index 9adcc0e..71891ac 100644
--- a/melgmix.h
+++ b/melgmix.h
@@ -5,7 +5,7 @@
Christian F. Beckmann, FMRIB Image Analysis Group
- Copyright (C) 1999-2002 University of Oxford */
+ Copyright (C) 1999-2004 University of Oxford */
/* CCOPYRIGHT */
diff --git a/melica.h b/melica.h
index 1e8905e..2d9718c 100644
--- a/melica.h
+++ b/melica.h
@@ -5,7 +5,7 @@
Christian F. Beckmann, FMRIB Image Analysis Group
- Copyright (C) 1999-2002 University of Oxford */
+ Copyright (C) 1999-2004 University of Oxford */
/* CCOPYRIGHT */
diff --git a/melodic.cc b/melodic.cc
index 206ae55..f59a633 100644
--- a/melodic.cc
+++ b/melodic.cc
@@ -5,7 +5,7 @@
Christian F. Beckmann, FMRIB Image Analysis Group
- Copyright (C) 1999-2003 University of Oxford */
+ Copyright (C) 1999-2004 University of Oxford */
/* CCOPYRIGHT */
diff --git a/melodic.h b/melodic.h
index afa4b18..afc7e77 100644
--- a/melodic.h
+++ b/melodic.h
@@ -5,7 +5,7 @@
Christian F. Beckmann, FMRIB Image Analysis Group
- Copyright (C) 1999-2002 University of Oxford */
+ Copyright (C) 1999-2004 University of Oxford */
/* CCOPYRIGHT */
diff --git a/meloptions.cc b/meloptions.cc
index cb8719a..7087b46 100644
--- a/meloptions.cc
+++ b/meloptions.cc
@@ -6,7 +6,7 @@
Christian F. Beckmann, FMRIB Image Analysis Group
- Copyright (C) 1999-2002 University of Oxford */
+ Copyright (C) 1999-2004 University of Oxford */
/* CCOPYRIGHT */
diff --git a/meloptions.h b/meloptions.h
index 1a23775..ecd3482 100644
--- a/meloptions.h
+++ b/meloptions.h
@@ -6,7 +6,7 @@
Christian F. Beckmann, FMRIB Image Analysis Group
- Copyright (C) 1999-2002 University of Oxford */
+ Copyright (C) 1999-2004 University of Oxford */
/* CCOPYRIGHT */
diff --git a/melpca.cc b/melpca.cc
index 3812c2a..451c3cc 100644
--- a/melpca.cc
+++ b/melpca.cc
@@ -5,7 +5,7 @@
Christian F. Beckmann, FMRIB Image Analysis Group
- Copyright (C) 1999-200 University of Oxford */
+ Copyright (C) 1999-2004 University of Oxford */
/* CCOPYRIGHT */
diff --git a/melpca.h b/melpca.h
index 63dc7f4..6f67649 100644
--- a/melpca.h
+++ b/melpca.h
@@ -5,7 +5,7 @@
Christian F. Beckmann, FMRIB Image Analysis Group
- Copyright (C) 1999-2002 University of Oxford */
+ Copyright (C) 1999-2004 University of Oxford */
/* CCOPYRIGHT */
diff --git a/melreport.cc b/melreport.cc
index b39c0bc..e96632d 100644
--- a/melreport.cc
+++ b/melreport.cc
@@ -5,7 +5,7 @@
Christian F. Beckmann, FMRIB Image Analysis Group
- Copyright (C) 1999-2002 University of Oxford */
+ Copyright (C) 1999-2004 University of Oxford */
/* CCOPYRIGHT */
diff --git a/melreport.h b/melreport.h
index befa76a..acb987b 100644
--- a/melreport.h
+++ b/melreport.h
@@ -5,7 +5,7 @@
Christian F. Beckmann, FMRIB Image Analysis Group
- Copyright (C) 1999-2002 University of Oxford */
+ Copyright (C) 1999-2004 University of Oxford */
/* CCOPYRIGHT */
@@ -84,7 +84,7 @@ namespace Melodic{
if( bool(opts.genreport.value()) ){
report << "<hr><h2>Analysis methods</h2> <p>"<<endl;
- report << "Analysis was carried out using MELODIC (Multivariate Exploratory Linear Decomposition into Independent Components) Version 2.00, part of FSL (FMRIB's Software Library, <A HREF=\"http://www.fmrib.ox.ac.uk/fsl/\">www.fmrib.ox.ac.uk/fsl</A>), an implementation for the estimation of a Probabilistic Independent Component Analysis model [Beckmann 2002]."<<endl;
+ report << "Analysis was carried out using MELODIC (Multivariate Exploratory Linear Decomposition into Independent Components) Version 2.00, part of FSL (FMRIB's Software Library, <A HREF=\"http://www.fmrib.ox.ac.uk/fsl/\">www.fmrib.ox.ac.uk/fsl</A>), an implementation for the estimation of a Probabilistic Independent Component Analysis model [Beckmann 2004]."<<endl;
report << "The following melodic pre-processing was applied to the input data file: "<< endl;
@@ -103,7 +103,7 @@ namespace Melodic{
if(melodat.get_PPCA().Storage()>0){
report << "probabilistic Principal Component Analysis where the number of dimensions was estimated using ";
if(opts.pca_est.value() == string("lap"))
- report << "the Laplace approximation to the Bayesian evidence of the model order [Beckmann 2001, Minka 2000]. " << endl;
+ report << "the Laplace approximation to the Bayesian evidence of the model order [Minka 2000, Beckmann 2004]. " << endl;
else
if(opts.pca_est.value() == string("bic"))
report << "the <em> Bayesian Information Criterion</em> (BIC) [Kass 1993]. " << endl;
@@ -114,7 +114,7 @@ namespace Melodic{
if(opts.pca_est.value() == string("aic"))
report << "the <em> Akaike Information Criterion</em> (AIC) [Akaike 1969]. " << endl;
else
- report << "a committee of approximations to Bayesian the model order [Beckmann 2001, Minka 2000]. " << endl;
+ report << "a committee of approximations to Bayesian the model order [Beckmann 2004]. " << endl;
}
else
@@ -126,7 +126,7 @@ namespace Melodic{
report << "Estimated Component maps were divided by the standard deviation of the residual noise";
if(opts.perf_mm.value())
- report << " and thresholded by fitting a mixture model to the histogram of intensity values [Beckmann 2002]. <p>" << endl;
+ report << " and thresholded by fitting a mixture model to the histogram of intensity values [Beckmann 2004]. <p>" << endl;
else
report <<".<p>" << endl;
@@ -140,7 +140,7 @@ namespace Melodic{
report << "<h3>References</h3> <p>"<<endl;
report << "[Hyvärinen 1999] A. Hyvärinen. Fast and Robust Fixed-Point Algorithms for Independent Component Analysis. IEEE Transactions on Neural Networks 10(3):626-634, 1999.<br> " << endl;
- report << "[Beckmann 2002] C.F. Beckmann and S.M. Smith. Probabilistic Independent Component Analysis for FMRI. <A HREF=\"http://www.fmrib.ox.ac.uk/analysis/techrep/\">Technical Report TR02CB1</A>, FMRIB Analysis Group, 2002. <br>" << endl;
+ report << "[Beckmann 2004] C.F. Beckmann and S.M. Smith. Probabilistic Independent Component Analysis for Functional Magnetic Resonance Imaging. IEEE Transactions on Medical Imaging 23(2):137-152 2004. <br>" << endl;
/* if(opts.perf_mm.value()){ */
/* report << "[Bullmore 1996] E. Bullmore <em>et. al.</em> Statistical methods of estimation and inference for functional MR image analysis. Magnetic Resonance in Medicine, 35(2):261-177, 1996. <br>" << endl; */
@@ -150,7 +150,7 @@ namespace Melodic{
if(melodat.get_PPCA().Storage()>0){
report << "[Everson 2000] R. Everson and S. Roberts. Inferring the eigenvalues of covariance matrices from limited, noisy data. IEEE Trans Signal Processing, 48(7):2083-2091, 2000<br>"<<endl;
report << "[Tipping 1999] M.E. Tipping and C.M.Bishop. Probabilistic Principal component analysis. J Royal Statistical Society B, 61(3), 1999. <br>" << endl;
- report << "[Beckmann 2001] C.F. Beckmann, J.A. Noble and S.M. Smith. Investigating the intrinsic dimensionality of FMRI data for ICA. In Seventh Int. Conf. on Functional Mapping of the Human Brain, 2001. <br>" << endl;
+ /* report << "[Beckmann 2001] C.F. Beckmann, J.A. Noble and S.M. Smith. Investigating the intrinsic dimensionality of FMRI data for ICA. In Seventh Int. Conf. on Functional Mapping of the Human Brain, 2001. <br>" << endl;*/
if(opts.pca_est.value() == string("lap"))
report << "[Minka 2000] T. Minka. Automatic choice of dimensionality for PCA. Technical Report 514, MIT Media Lab Vision and Modeling Group, 2000. <BR>"<< endl;
else
--
GitLab