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

added possibility to read initialization from file in ProjectionFactorCreator

release/4.3a0
Luca Carlone 2013-10-15 19:16:38 +00:00
parent 575e5b1693
commit c27f4f6bcb
2 changed files with 54 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gtsam_unstable/slam/GenericProjectionFactorsCreator.h
View File

@ -81,7 +81,8 @@ namespace gtsam {
}
void add(Key landmarkKey,
Key poseKey, Point2 measurement,
Key poseKey,
Point2 measurement,
const SharedNoiseModel& model,
const boost::shared_ptr<CALIBRATION>& K,
NonlinearFactorGraph &graph) {
@ -117,8 +118,8 @@ namespace gtsam {
}
}
void update(NonlinearFactorGraph &graph, gtsam::Values::shared_ptr inputValues, gtsam::Values::shared_ptr outputValues) {
addTriangulatedLandmarks(graph, inputValues, outputValues);
void update(NonlinearFactorGraph &graph, gtsam::Values::shared_ptr inputValues, gtsam::Values::shared_ptr outputValues, bool doTriangualatePoints = true) {
addTriangulatedLandmarks(graph, inputValues, outputValues, doTriangualatePoints);
updateOrdering(graph);
}
@ -155,10 +156,15 @@ namespace gtsam {
}
void addTriangulatedLandmarks(NonlinearFactorGraph &graph, gtsam::Values::shared_ptr loadedValues,
gtsam::Values::shared_ptr graphValues) {
gtsam::Values::shared_ptr graphValues, bool doTriangualatePoints) {
bool debug = false;
if(doTriangualatePoints)
std::cout << "Triangulating 3D points" << std::endl;
else
std::cout << "Reading initial guess for 3D points from file" << std::endl;
std::vector<boost::shared_ptr<ProjectionFactor> > projectionFactorVector;
std::vector<boost::shared_ptr<ProjectionFactor> >::iterator vfit;
Point3 point;
@ -174,27 +180,28 @@ namespace gtsam {
int numProjectionFactors = 0;
int numProjectionFactorsAdded = 0;
int numFailures = 0;
for (pfit = projectionFactors.begin(); pfit != projectionFactors.end(); pfit++) {
for (pfit = projectionFactors.begin(); pfit != projectionFactors.end(); pfit++) { // for each landmark!
projectionFactorVector = (*pfit).second;
projectionFactorVector = (*pfit).second; // all factors connected to a given landmark
std::vector<Pose3> cameraPoses;
std::vector<Point2> measured;
// Iterate through projection factors
for (vfit = projectionFactorVector.begin(); vfit != projectionFactorVector.end(); vfit++) {
for (vfit = projectionFactorVector.begin(); vfit != projectionFactorVector.end(); vfit++) { // for each factors connected to the landmark
numProjectionFactors++;
if (debug) std::cout << "ProjectionFactor: " << std::endl;
if (debug) (*vfit)->print("ProjectionFactor");
// Iterate through poses
cameraPoses.push_back( loadedValues->at<Pose3>((*vfit)->key1() ) );
measured.push_back( (*vfit)->measured() );
cameraPoses.push_back( loadedValues->at<Pose3>((*vfit)->key1() ) ); // get poses connected to the landmark
measured.push_back( (*vfit)->measured() ); // get measurements of the landmark
}
// Triangulate landmark based on set of poses and measurements
if (debug) std::cout << "Triangulating: " << std::endl;
if (doTriangualatePoints){
// std::cout << "Triangulating points " << std::endl;
try {
point = triangulatePoint3(cameraPoses, measured, *K_);
if (debug) std::cout << "Triangulation succeeded: " << point << std::endl;
@ -218,29 +225,40 @@ namespace gtsam {
numFailures++;
continue;
}
}else{ // we read 3D points from file
if (loadedValues->exists<Point3>((*pfit).first)){ // (*pfit).first) is the key of the landmark
// point
}else{
std::cout << "Trying to read non existing point from file " << std::endl;
}
}
// Add projection factors and pose values
for (vfit = projectionFactorVector.begin(); vfit != projectionFactorVector.end(); vfit++) {
for (vfit = projectionFactorVector.begin(); vfit != projectionFactorVector.end(); vfit++) { // for each proj factor connected to the landmark
numProjectionFactorsAdded++;
if (debug) std::cout << "Adding factor " << std::endl;
if (debug) (*vfit)->print("Projection Factor");
graph.push_back( (*vfit) );
graph.push_back( (*vfit) ); // add factor to the graph
if (!graphValues->exists<Pose3>( (*vfit)->key1()) && loadedValues->exists<Pose3>((*vfit)->key1())) {
graphValues->insert((*vfit)->key1(), loadedValues->at<Pose3>((*vfit)->key1()));
cameraPoseKeys.push_back( (*vfit)->key1() );
cameraPoseKeys.push_back( (*vfit)->key1() ); // add camera poses, if necessary
// std::cout << "Added camera value " << std::endl;
}
}
// Add landmark value
if (debug) std::cout << "Adding value " << std::endl;
graphValues->insert( projectionFactorVector[0]->key2(), point); // add point;
graphValues->insert( projectionFactorVector[0]->key2(), point); // add point
// std::cout << "Added point value " << std::endl;
landmarkKeys.push_back( projectionFactorVector[0]->key2() );
}
if (1||debug) std::cout << " # PROJECTION FACTORS CALCULATED: " << numProjectionFactors;
if (1||debug) std::cout << " # PROJECTION FACTORS ADDED: " << numProjectionFactorsAdded;
if (1||debug) std::cout << " # FAILURES: " << numFailures;
if (1||debug) std::cout << " # FAILURES: " << numFailures << std::endl;
}
const SharedNoiseModel noise_; ///< noise model used

4
gtsam_unstable/slam/SmartProjectionHessianFactor.h
View File

@ -318,7 +318,7 @@ namespace gtsam {
if (retriangulate) {
// We triangulate the 3D position of the landmark
try {
state_->point = triangulatePoint3(cameraPoses, measured_, *K_all_.at(0), rankTolerance);
state_->point = triangulatePoint3(cameraPoses, measured_, K_all_, rankTolerance);
state_->degenerate = false;
state_->cheiralityException = false;
} catch( TriangulationUnderconstrainedException& e) {
@ -491,7 +491,7 @@ namespace gtsam {
if (retriangulate) {
// We triangulate the 3D position of the landmark
try {
state_->point = triangulatePoint3(cameraPoses, measured_, *K_all_.at(0), rankTolerance);
state_->point = triangulatePoint3(cameraPoses, measured_, K_all_, rankTolerance);
state_->degenerate = false;
state_->cheiralityException = false;
} catch( TriangulationUnderconstrainedException& e) {