Skip to content

Commit

Permalink
few doxygen warning fixed in log-det
Browse files Browse the repository at this point in the history
  • Loading branch information
lambday committed Jul 28, 2013
1 parent ce0aca3 commit 7456300
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 16 deletions.
3 changes: 2 additions & 1 deletion src/shogun/lib/computation/job/DenseExactLogJob.cpp
Expand Up @@ -31,7 +31,8 @@ CDenseExactLogJob::CDenseExactLogJob()
}

CDenseExactLogJob::CDenseExactLogJob(CJobResultAggregator* aggregator,
CDenseMatrixOperator<float64_t>* log_operator, SGVector<float64_t> vector)
CDenseMatrixOperator<float64_t, float64_t>* log_operator,
SGVector<float64_t> vector)
: CIndependentJob(aggregator)
{
init();
Expand Down
Expand Up @@ -31,7 +31,7 @@ CIndividualJobResultAggregator::CIndividualJobResultAggregator()
}

CIndividualJobResultAggregator::CIndividualJobResultAggregator(
CLinearOperator<float64_t>* linear_operator,
CLinearOperator<float64_t, float64_t>* linear_operator,
SGVector<float64_t> vector,
const float64_t& const_multiplier)
: CStoreVectorAggregator<complex64_t>(vector.vlen),
Expand Down
Expand Up @@ -35,7 +35,7 @@ CRationalApproximationIndividualJob::CRationalApproximationIndividualJob()
CRationalApproximationIndividualJob::CRationalApproximationIndividualJob(
CJobResultAggregator* aggregator,
CLinearSolver<complex64_t, float64_t>* linear_solver,
CLinearOperator<complex64_t>* linear_operator,
CLinearOperator<complex64_t, complex64_t>* linear_operator,
SGVector<float64_t> vector,
complex64_t weight)
: CIndependentJob(aggregator)
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/mathematics/logdet/DenseMatrixExactLog.cpp
Expand Up @@ -36,7 +36,7 @@ CDenseMatrixExactLog::CDenseMatrixExactLog()
}

CDenseMatrixExactLog::CDenseMatrixExactLog(
CDenseMatrixOperator<float64_t>* op,
CDenseMatrixOperator<float64_t, float64_t>* op,
CIndependentComputationEngine* engine)
: COperatorFunction<float64_t>(
(CLinearOperator<float64_t>*)op, engine, OF_LOG)
Expand Down
4 changes: 2 additions & 2 deletions src/shogun/mathematics/logdet/DirectEigenSolver.cpp
Expand Up @@ -26,8 +26,8 @@ CDirectEigenSolver::CDirectEigenSolver()
}

CDirectEigenSolver::CDirectEigenSolver(
CDenseMatrixOperator<float64_t>* linear_operator)
: CEigenSolver((CLinearOperator<float64_t>*)linear_operator)
CDenseMatrixOperator<float64_t, float64_t>* linear_operator)
: CEigenSolver((CLinearOperator<float64_t, float64_t>*)linear_operator)
{
SG_GCDEBUG("%s created (%p)\n", this->get_name(), this)
}
Expand Down
Expand Up @@ -21,10 +21,10 @@ template <class T, class ST> class CLinearOperator;
/**
* @brief abstract template base for CG based solvers to the solution of
* shifted linear systems of the form \f$(A+\sigma)x=b\f$ for several values
* of \$f\sigma\f$ simultaneously, using only as many matrix-vector operations
* of \f$\sigma\f$ simultaneously, using only as many matrix-vector operations
* as the solution of a single system requires. This class adds another
* interface to the basic iterative linear solver that takes the shifts,
* \$f\sigma\f$, and also weights, \f$\alpha\f$, and returns the summation
* \f$\sigma\f$, and also weights, \f$\alpha\f$, and returns the summation
* \f$\sum_{i} \alpha_{i}x_{i}\f$, where \f$x_{i}\f$ is the solution of the
* system \f$(A+\sigma_{i})x_{i}=b\f$.
*
Expand Down Expand Up @@ -78,8 +78,8 @@ template<class T, class ST=T> class CIterativeShiftedLinearFamilySolver : public
* -\zeta^{\sigma}_{n}+\zeta^{\sigma}_{n-1}\beta_{n-1}(1-\sigma\beta_{n}}\f$
* [see Jergerlehner, eq 2.44]
*
* @param zeta_sh_old \f$\zeta^{\sigma}_{n-1} shifted params
* @param zeta_sh_cur \f$\zeta^{\sigma}_{n} shifted params
* @param zeta_sh_old \f$\zeta^{\sigma}_{n-1}\f$ shifted params
* @param zeta_sh_cur \f$\zeta^{\sigma}_{n}\f$ shifted params
* @param shifts \f$\sigma\f$ shifts
* @param beta_old \f$\beta_{n-1}\f$, non-shifted
* @param beta_cur \f$\beta_{n}\f$, non-shifted
Expand All @@ -94,8 +94,8 @@ template<class T, class ST=T> class CIterativeShiftedLinearFamilySolver : public
* compute \f$\beta^{\sigma}_{n}\f$ as \f$\beta_{n}\frac{\zeta^{\sigma}_{n+1}}
* {\zeta^{\sigma}_{n}}\f$
*
* @param zeta_sh_new \f$\zeta^{\sigma}_{n+1} shifted params
* @param zeta_sh_cur \f$\zeta^{\sigma}_{n} shifted params
* @param zeta_sh_new \f$\zeta^{\sigma}_{n+1}\f$ shifted params
* @param zeta_sh_cur \f$\zeta^{\sigma}_{n}\f$ shifted params
* @param beta_cur \f$\beta_{n}\f$, non-shifted
* @param beta_sh \f$\beta^{\sigma}_{n}\f$, to be computed
*/
Expand All @@ -106,8 +106,8 @@ template<class T, class ST=T> class CIterativeShiftedLinearFamilySolver : public
* compute \f$alpha^{\sigma}_{n}\f$ as \f$\alpha_{n}\frac{\zeta^{\sigma}
* _{n}\beta^{\sigma}_{n-1}}{\zeta^{\sigma}_{n-1}\beta_{n-1}}\f$
*
* @param zeta_sh_cur \f$\zeta^{\sigma}_{n} shifted params
* @param zeta_sh_old \f$\zeta^{\sigma}_{n-1} shifted params
* @param zeta_sh_cur \f$\zeta^{\sigma}_{n}\f$ shifted params
* @param zeta_sh_old \f$\zeta^{\sigma}_{n-1}\f$ shifted params
* @param beta_sh \f$\beta^{\sigma}_{n}\f$, shifted params
* @param beta \f$\beta_{n}\f$, non-shifted
* @param alpha \f$\alpha_{n}\f$, non-shifted
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/mathematics/logdet/IterativeSolverIterator.h
Expand Up @@ -113,7 +113,7 @@ typedef Matrix<T, Dynamic, 1> VectorXt;
/** maximum iteration limit */
const int64_t m_max_iteration_limit;

/* tolerence of the iterative solver */
/** tolerence of the iterative solver */
const float64_t m_tolerence;

/** true if converged successfully, false otherwise */
Expand Down
Expand Up @@ -32,7 +32,7 @@ CLogRationalApproximationIndividual::CLogRationalApproximationIndividual()
}

CLogRationalApproximationIndividual::CLogRationalApproximationIndividual(
CDenseMatrixOperator<float64_t>* linear_operator,
CDenseMatrixOperator<float64_t, float64_t>* linear_operator,
CIndependentComputationEngine* computation_engine,
CEigenSolver* eigen_solver,
CLinearSolver<complex64_t, float64_t>* linear_solver,
Expand Down

0 comments on commit 7456300

Please sign in to comment.