From a62c6560c04f85ec92d7f7e555516d4546d4d056 Mon Sep 17 00:00:00 2001
From: David Flitney <dave.flitney@ndcn.ox.ac.uk>
Date: Fri, 17 Mar 2006 19:05:22 +0000
Subject: [PATCH] *** empty log message ***
---
f2z.cc | 3 ++-
miscmaths.cc | 12 ++++++------
volumeseries.cc | 4 ++--
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/f2z.cc b/f2z.cc
index d95f60d..4c91f5f 100644
--- a/f2z.cc
+++ b/f2z.cc
@@ -14,6 +14,7 @@
#include "utils/log.h"
#include "utils/tracer_plus.h"
#include "libprob.h"
+#include "miscmaths.h"
using namespace NEWMAT;
using namespace Utilities;
@@ -62,7 +63,7 @@ namespace MISCMATHS {
for(int i = 1; i <= N; i++)
{
// cerr << "i=" << i;
- iter = iter + top*::pow(f,(-(n+i-1)))/(::pow(alpha,i)*bot);
+ iter = iter + top*MISCMATHS::pow(f,(-(n+i-1)))/(MISCMATHS::pow(alpha,i)*bot);
top = top*(n-1+i)*(-1);
bot = bot*(n+m-1+i);
// cerr << "iter=" << iter;
diff --git a/miscmaths.cc b/miscmaths.cc
index 7541581..e9a092b 100644
--- a/miscmaths.cc
+++ b/miscmaths.cc
@@ -1679,7 +1679,7 @@ void element_mod_n(Matrix& Mat,double n)
int nextpow2(int n)
{
- return (int)std::pow(2,ceil(std::log(float(n))/std::log(float(2))));
+ return (int)pow(2,ceil(std::log(float(n))/std::log(float(2))));
}
void xcorr(const Matrix& p_ts, Matrix& ret, int lag, int p_zeropad)
@@ -2077,14 +2077,14 @@ float csevl(const float x, const ColumnVector& cs, const int n)
cout<<i<<",";
////////////////////
// update phim
- for(int l=1; l <= nevs; l++)
+ for(int li=1; li <= nevs; li++)
{
float b_m0 = 1e10;
float c_m0 = 2;
float c_m = 1.0/2.0 + c_m0;
- float b_m = 1.0/(0.5*(Sqr(B(l))+lambdaB(l))+1.0/b_m0);
- gam_m(l) = b_m*c_m;
+ float b_m = 1.0/(0.5*(Sqr(B(li))+lambdaB(li))+1.0/b_m0);
+ gam_m(li) = b_m*c_m;
}
// OUT(gam_m(1));
@@ -2096,8 +2096,8 @@ float csevl(const float x, const ColumnVector& cs, const int n)
SymmetricMatrix lambda_B(nevs);
lambda_B = 0;
- for(int l=1; l <= nevs; l++)
- lambda_B(l,l)=gam_m(l);
+ for(int lj=1; lj <= nevs; lj++)
+ lambda_B(lj,lj)=gam_m(lj);
SymmetricMatrix tmp = lambda_B + gam_y*ZZ;
lambda_B << tmp;
diff --git a/volumeseries.cc b/volumeseries.cc
index 7027a39..8546efc 100644
--- a/volumeseries.cc
+++ b/volumeseries.cc
@@ -280,8 +280,8 @@ namespace MISCMATHS {
{
for(int j = 1; j <= volSize; j++)
qv[j-1]=0;
- for(int j = 1; j <= numThresholdedSeries; j++)
- qv[int(preThresholdPositions(j))-1] = (*this)(i,j);
+ for(int k = 1; k <= numThresholdedSeries; k++)
+ qv[int(preThresholdPositions(k))-1] = (*this)(i,k);
FslWriteVolumes(OP, qv, 1);
}
--
GitLab