add a dummy spcg interface for now...
parent
e9b93fe007
commit
fd79b455e3
|
@ -55,6 +55,14 @@ namespace gtsam {
|
||||||
throw runtime_error("optimizeMultiFrontal: not implemented");
|
throw runtime_error("optimizeMultiFrontal: not implemented");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The multifrontal solver
|
||||||
|
*/
|
||||||
|
template<class G, class T>
|
||||||
|
T optimizeSPCG(const G& graph, const T& initialEstimate, const NonlinearOptimizationParameters& parameters) {
|
||||||
|
throw runtime_error("optimizeSPCG: not implemented");
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* optimization that returns the values
|
* optimization that returns the values
|
||||||
*/
|
*/
|
||||||
|
@ -66,7 +74,10 @@ namespace gtsam {
|
||||||
return optimizeElimination<G,T>(graph, initialEstimate, parameters);
|
return optimizeElimination<G,T>(graph, initialEstimate, parameters);
|
||||||
case MULTIFRONTAL:
|
case MULTIFRONTAL:
|
||||||
return optimizeMultiFrontal<G,T>(graph, initialEstimate, parameters);
|
return optimizeMultiFrontal<G,T>(graph, initialEstimate, parameters);
|
||||||
|
case SPCG:
|
||||||
|
return optimizeSPCG<G,T>(graph, initialEstimate, parameters) ;
|
||||||
}
|
}
|
||||||
|
throw runtime_error("optimizeSPCG: undefined solver");
|
||||||
}
|
}
|
||||||
|
|
||||||
} //namespace gtsam
|
} //namespace gtsam
|
||||||
|
|
|
@ -36,7 +36,8 @@ namespace gtsam {
|
||||||
*/
|
*/
|
||||||
enum LinearSolver{
|
enum LinearSolver{
|
||||||
ELIMINATION, // Elimination
|
ELIMINATION, // Elimination
|
||||||
MULTIFRONTAL // Multi-frontal
|
MULTIFRONTAL, // Multi-frontal
|
||||||
|
SPCG, // Subgraph Preconditioned Conjugate Gradient
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue