projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
further attempted changes for ipMIDI on windows
[ardour.git]
/
libs
/
qm-dsp
/
maths
/
Polyfit.h
diff --git
a/libs/qm-dsp/maths/Polyfit.h
b/libs/qm-dsp/maths/Polyfit.h
index 86bb64cb1e76e2b7f11b8262cfdbb0bd5bfb3177..a5c2ca2af457241579edd581b53bdf647cbdbf3e 100644
(file)
--- a/
libs/qm-dsp/maths/Polyfit.h
+++ b/
libs/qm-dsp/maths/Polyfit.h
@@
-53,13
+53,13
@@
public:
const vector<double> &y,
vector<double> &coef);
const vector<double> &y,
vector<double> &coef);
-
+
private:
TPolyFit &operator = (const TPolyFit &); // disable assignment
TPolyFit(); // and instantiation
TPolyFit(const TPolyFit&); // and copying
private:
TPolyFit &operator = (const TPolyFit &); // disable assignment
TPolyFit(); // and instantiation
TPolyFit(const TPolyFit&); // and copying
-
+
static void Square (const Matrix &x, // Matrix multiplication routine
const vector<double> &y,
Matrix &a, // A = transpose X times X
static void Square (const Matrix &x, // Matrix multiplication routine
const vector<double> &y,
Matrix &a, // A = transpose X times X
@@
-105,13
+105,13
@@
double TPolyFit::PolyFit2 (const vector<double> &x,
// nterms = coefs.size()
// npoints = x.size()
{
// nterms = coefs.size()
// npoints = x.size()
{
- int i, j;
+
unsigned
int i, j;
double xi, yi, yc, srs, sum_y, sum_y2;
Matrix xmatr; // Data matrix
Matrix a;
vector<double> g; // Constant vector
double xi, yi, yc, srs, sum_y, sum_y2;
Matrix xmatr; // Data matrix
Matrix a;
vector<double> g; // Constant vector
- const int npoints(x.size());
- const int nterms(coefs.size());
+ const
unsigned
int npoints(x.size());
+ const
unsigned
int nterms(coefs.size());
double correl_coef;
zeroise(g, nterms);
zeroise(a, nterms, nterms);
double correl_coef;
zeroise(g, nterms);
zeroise(a, nterms, nterms);
@@
-260,8
+260,8
@@
bool TPolyFit::GaussJordan (Matrix &b,
for( int i = 0; i < ncol; ++i)
coef[i] = w[i][0];
for( int i = 0; i < ncol; ++i)
coef[i] = w[i][0];
-
-
+
+
return true;
} // end; { procedure GaussJordan }
//----------------------------------------------------------------------------------------------
return true;
} // end; { procedure GaussJordan }
//----------------------------------------------------------------------------------------------
@@
-274,11
+274,12
@@
bool TPolyFit::GaussJordan2(Matrix &b,
{
//GaussJordan2; // first half of GaussJordan
// actual start of gaussj
{
//GaussJordan2; // first half of GaussJordan
// actual start of gaussj
-
+
double big, t;
double pivot;
double determ;
double big, t;
double pivot;
double determ;
- int irow, icol;
+ int irow = 0;
+ int icol = 0;
int ncol(b.size());
int nv = 1; // single constant vector
for(int i = 0; i < ncol; ++i)
int ncol(b.size());
int nv = 1; // single constant vector
for(int i = 0; i < ncol; ++i)
@@
-404,4
+405,4
@@
void NSUtility::zeroise(vector<vector<int> > &matrix, int m, int n)
#endif
#endif
-
+