Correct Yond-Dian's name

release/4.3a0
Sungtae An 2014-12-08 18:03:40 -05:00
parent 47396871a3
commit c5b4d731cc
5 changed files with 13 additions and 17 deletions

View File

@ -2,7 +2,7 @@
* ConjugateGradientSolver.cpp * ConjugateGradientSolver.cpp
* *
* Created on: Jun 4, 2014 * Created on: Jun 4, 2014
* Author: ydjian * Author: Yong-Dian Jian
*/ */
#include <gtsam/linear/ConjugateGradientSolver.h> #include <gtsam/linear/ConjugateGradientSolver.h>

View File

@ -12,8 +12,8 @@
/** /**
* @file ConjugateGradientSolver.h * @file ConjugateGradientSolver.h
* @brief Implementation of Conjugate Gradient solver for a linear system * @brief Implementation of Conjugate Gradient solver for a linear system
* @author Yong-Dian Jian
* @author Sungtae An * @author Sungtae An
* @author ydjian
* @date Nov 6, 2014 * @date Nov 6, 2014
**/ **/

View File

@ -2,21 +2,14 @@
* PCGSolver.cpp * PCGSolver.cpp
* *
* Created on: Feb 14, 2012 * Created on: Feb 14, 2012
* Author: ydjian * Author: Yong-Dian Jian
* Author: Sungtae An * Author: Sungtae An
*/ */
#include <gtsam/linear/GaussianFactorGraph.h> #include <gtsam/linear/GaussianFactorGraph.h>
//#include <gtsam/inference/FactorGraph-inst.h>
//#include <gtsam/linear/FactorGraphUtil-inl.h>
//#include <gtsam/linear/JacobianFactorGraph.h>
//#include <gtsam/linear/LSPCGSolver.h>
#include <gtsam/linear/PCGSolver.h> #include <gtsam/linear/PCGSolver.h>
#include <gtsam/linear/Preconditioner.h> #include <gtsam/linear/Preconditioner.h>
//#include <gtsam/linear/SuiteSparseUtil.h>
//#include <gtsam/linear/ConjugateGradientMethod-inl.h>
//#include <gsp2/gtsam-interface-sbm.h>
//#include <ydjian/tool/ThreadSafeTimer.h>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <iostream> #include <iostream>
#include <stdexcept> #include <stdexcept>

View File

@ -2,7 +2,8 @@
* Preconditioner.cpp * Preconditioner.cpp
* *
* Created on: Jun 2, 2014 * Created on: Jun 2, 2014
* Author: ydjian * Author: Yong-Dian Jian
* Author: Sungtae An
*/ */
#include <gtsam/inference/FactorGraph-inst.h> #include <gtsam/inference/FactorGraph-inst.h>

View File

@ -2,7 +2,8 @@
* Preconditioner.h * Preconditioner.h
* *
* Created on: Jun 2, 2014 * Created on: Jun 2, 2014
* Author: ydjian * Author: Yong-Dian Jian
* Author: Sungtae An
*/ */
#pragma once #pragma once
@ -57,7 +58,8 @@ struct GTSAM_EXPORT PreconditionerParameters {
}; };
/* PCG aims to solve the problem: A x = b by reparametrizing it as /* PCG aims to solve the problem: A x = b by reparametrizing it as
* S^t A S y = S^t b or M A x = M b, where A \approx S S, or A \approx M * L^{-1} A L^{-T} y = L^{-1} b or M^{-1} A x = M^{-1} b,
* where A \approx L L^{T}, or A \approx M
* The goal of this class is to provide a general interface to all preconditioners */ * The goal of this class is to provide a general interface to all preconditioners */
class GTSAM_EXPORT Preconditioner { class GTSAM_EXPORT Preconditioner {
public: public:
@ -70,15 +72,15 @@ public:
/* Computation Interfaces */ /* Computation Interfaces */
/* implement x = S^{-1} y */ /* implement x = L^{-1} y */
virtual void solve(const Vector& y, Vector &x) const = 0; virtual void solve(const Vector& y, Vector &x) const = 0;
// virtual void solve(const VectorValues& y, VectorValues &x) const = 0; // virtual void solve(const VectorValues& y, VectorValues &x) const = 0;
/* implement x = S^{-T} y */ /* implement x = L^{-T} y */
virtual void transposeSolve(const Vector& y, Vector& x) const = 0; virtual void transposeSolve(const Vector& y, Vector& x) const = 0;
// virtual void transposeSolve(const VectorValues& y, VectorValues &x) const = 0; // virtual void transposeSolve(const VectorValues& y, VectorValues &x) const = 0;
// /* implement x = S^{-1} S^{-T} y */ // /* implement x = L^{-1} L^{-T} y */
// virtual void fullSolve(const Vector& y, Vector &x) const = 0; // virtual void fullSolve(const Vector& y, Vector &x) const = 0;
// virtual void fullSolve(const VectorValues& y, VectorValues &x) const = 0; // virtual void fullSolve(const VectorValues& y, VectorValues &x) const = 0;