Skip to content

Commit

Permalink
Fixed a few more GCC 4.6.3 errors with ambiguous ambiguity
Browse files Browse the repository at this point in the history
  • Loading branch information
lisitsyn committed Aug 7, 2013
1 parent 7d3f37f commit 1965e5e
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/shogun/mathematics/ajd/FFDiag.h
Expand Up @@ -54,7 +54,7 @@ class CFFDiag : public CApproxJointDiagonalizer
* @return V the matrix that best diagonalizes C
*/
static SGMatrix<float64_t> diagonalize(SGNDArray<float64_t> C,
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0),
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0,false),
double eps=CMath::MACHINE_EPSILON,
int itermax=200);

Expand All @@ -66,7 +66,7 @@ class CFFDiag : public CApproxJointDiagonalizer
* @return V the matrix that best diagonalizes C
*/
virtual SGMatrix<float64_t> compute(SGNDArray<float64_t> C,
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0),
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0,false),
double eps=CMath::MACHINE_EPSILON,
int itermax=200)
{
Expand Down
4 changes: 2 additions & 2 deletions src/shogun/mathematics/ajd/JADiag.h
Expand Up @@ -54,7 +54,7 @@ class CJADiag : public CApproxJointDiagonalizer
* @return V the matrix that best diagonalizes C
*/
static SGMatrix<float64_t> diagonalize(SGNDArray<float64_t> C,
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0),
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0,false),
double eps=CMath::MACHINE_EPSILON,
int itermax=200);

Expand All @@ -66,7 +66,7 @@ class CJADiag : public CApproxJointDiagonalizer
* @return V the matrix that best diagonalizes C
*/
virtual SGMatrix<float64_t> compute(SGNDArray<float64_t> C,
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0),
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0,false),
double eps=CMath::MACHINE_EPSILON,
int itermax=200)
{
Expand Down
4 changes: 2 additions & 2 deletions src/shogun/mathematics/ajd/JADiagOrth.h
Expand Up @@ -54,7 +54,7 @@ class CJADiagOrth : public CApproxJointDiagonalizer
* @return V the matrix that best diagonalizes C
*/
static SGMatrix<float64_t> diagonalize(SGNDArray<float64_t> C,
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0),
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0,false),
double eps=CMath::MACHINE_EPSILON,
int itermax=200);

Expand All @@ -66,7 +66,7 @@ class CJADiagOrth : public CApproxJointDiagonalizer
* @return V the matrix that best diagonalizes C
*/
virtual SGMatrix<float64_t> compute(SGNDArray<float64_t> C,
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0),
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0,false),
double eps=CMath::MACHINE_EPSILON,
int itermax=200)
{
Expand Down
4 changes: 2 additions & 2 deletions src/shogun/mathematics/ajd/Jedi.h
Expand Up @@ -53,7 +53,7 @@ class CJedi : public CApproxJointDiagonalizer
* @return V the matrix that best diagonalizes C
*/
static SGMatrix<float64_t> diagonalize(SGNDArray<float64_t> C,
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0),
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0,false),
double eps=CMath::MACHINE_EPSILON,
int itermax=200);

Expand All @@ -65,7 +65,7 @@ class CJedi : public CApproxJointDiagonalizer
* @return V the matrix that best diagonalizes C
*/
virtual SGMatrix<float64_t> compute(SGNDArray<float64_t> C,
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0),
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0,false),
double eps=CMath::MACHINE_EPSILON,
int itermax=200)
{
Expand Down
4 changes: 2 additions & 2 deletions src/shogun/mathematics/ajd/QDiag.h
Expand Up @@ -53,7 +53,7 @@ class CQDiag : public CApproxJointDiagonalizer
* @return V the matrix that best diagonalizes C
*/
static SGMatrix<float64_t> diagonalize(SGNDArray<float64_t> C,
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0),
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0,false),
double eps=CMath::MACHINE_EPSILON,
int itermax=200);

Expand All @@ -65,7 +65,7 @@ class CQDiag : public CApproxJointDiagonalizer
* @return V the matrix that best diagonalizes C
*/
virtual SGMatrix<float64_t> compute(SGNDArray<float64_t> C,
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0),
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0,false),
double eps=CMath::MACHINE_EPSILON,
int itermax=200)
{
Expand Down
4 changes: 2 additions & 2 deletions src/shogun/mathematics/ajd/UWedge.h
Expand Up @@ -53,7 +53,7 @@ class CUWedge : public CApproxJointDiagonalizer
* @return V the matrix that best diagonalizes C
*/
static SGMatrix<float64_t> diagonalize(SGNDArray<float64_t> C,
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0),
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0,false),
double eps=1e-12,
int itermax=200);

Expand All @@ -65,7 +65,7 @@ class CUWedge : public CApproxJointDiagonalizer
* @return V the matrix that best diagonalizes C
*/
virtual SGMatrix<float64_t> compute(SGNDArray<float64_t> C,
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0),
SGMatrix<float64_t> V0 = SGMatrix<float64_t>(NULL,0,0,false),
double eps=1e-12,
int itermax=200)
{
Expand Down

0 comments on commit 1965e5e

Please sign in to comment.