12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small change to covariance stuff

release/4.3a0
Chris Beall 2010-10-22 23:15:27 +00:00
parent c13d909343
commit a411cf9683
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/PlanarSLAMSelfContained_advanced.cpp
View File

@ -122,7 +122,7 @@ int main(int argc, char** argv) {
initial.print("initial estimate");
// optimize using Levenburg-Marquadt optimization with an ordering from colamd
// optimize using Levenberg-Marquardt optimization with an ordering from colamd
// first using sequential elimination
OptimizerSeqential::shared_values resultSequential = OptimizerSeqential::optimizeLM(graph, initial);

9
examples/Pose2SLAMExample_advanced.cpp
View File

@ -76,11 +76,12 @@ int main(int argc, char** argv) {
Values result = *optimizer_result.values();
result.print("final result");
Vector mean; Matrix covariance;
boost::tie( mean, covariance) = optimizer_result.marginalStandard(x1);
/* Get covariances */
Matrix covariance1 = optimizer_result.marginalStandard(x1);
Matrix covariance2 = optimizer_result.marginalStandard(x2);
print(mean, "Mean");
print(covariance, "Covariance");
print(covariance1, "Covariance1");
print(covariance2, "Covariance2");
return 0;
}

4
nonlinear/NonlinearOptimizer.h
View File

@ -161,8 +161,8 @@ namespace gtsam {
/**
* Return mean and covariance on a single variable
*/
std::pair<Vector, Matrix> marginalStandard(Symbol j) const {
return solver_->marginalStandard((*ordering_)[j]);
Matrix marginalStandard(Symbol j) const {
return solver_->marginalStandard((*ordering_)[j]).second;
}
/**