From d937e23e0288ba9404823bcd39717666e69108be Mon Sep 17 00:00:00 2001
From: Mark Woolrich <woolrich@fmrib.ox.ac.uk>
Date: Thu, 1 May 2003 15:31:11 +0000
Subject: [PATCH] *** empty log message ***
---
film_gls.cc | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/film_gls.cc b/film_gls.cc
index 8b6fba5..ab702d4 100644
--- a/film_gls.cc
+++ b/film_gls.cc
@@ -100,15 +100,15 @@ int main(int argc, char *argv[])
if(!globalopts.noest)
{
- cerr << "Calculating residuals..." << endl;
+ cout << "Calculating residuals..." << endl;
for(int i = 1; i <= numTS; i++)
{
glimGls.setData(x.getSeries(i), parad.getDesignMatrix(), i);
residuals.getSeries(i) = glimGls.getResiduals();
}
- cerr << "Completed" << endl;
+ cout << "Completed" << endl;
- cerr << "Estimating residual autocorrelation..." << endl;
+ cout << "Estimating residual autocorrelation..." << endl;
if(globalopts.fitAutoRegressiveModel)
{
@@ -148,9 +148,10 @@ int main(int argc, char *argv[])
}
}
- cerr << "Completed" << endl;
+ cout << "Completed" << endl;
- cerr << "Prewhitening and Computing PEs..." << endl;
+ cout << "Prewhitening and Computing PEs..." << endl;
+ cout << "Percentage done:" << endl;
int co = 1;
for(int i = 1; i <= numTS; i++)
@@ -167,10 +168,11 @@ int main(int argc, char *argv[])
Matrix designmattw;
acEst.preWhiten(xprew, xw, i, designmattw);
- if(co > 1000)
+ if(co > 100)
{
co = 1;
- cerr << (float)i/(float)numTS << ",";
+ cout << 100.0*(float)i/(float)numTS << ",";
+ cout.flush();
}
else
co++;
@@ -181,10 +183,11 @@ int main(int argc, char *argv[])
}
else
{
- if(co > 1000)
+ if(co > 100)
{
co = 1;
- cerr << (float)i/(float)numTS << ",";
+ cout << 100.0*(float)i/(float)numTS << ",";
+ cout.flush();
}
else
co++;
--
GitLab