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

const return value does not make sense for anything but references

release/4.3a0
Frank Dellaert 2009-08-25 02:36:30 +00:00
parent b8a5501670
commit 6e35e34ee4
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cpp/LinearFactorGraph.cpp
View File

@ -165,15 +165,14 @@ void LinearFactorGraph::combine(const LinearFactorGraph &lfg){
/** combine two factor graphs */ /** combine two factor graphs */
/* ************************************************************************* */ /* ************************************************************************* */
const LinearFactorGraph LinearFactorGraph::combine2(const LinearFactorGraph& lfg1, LinearFactorGraph LinearFactorGraph::combine2(const LinearFactorGraph& lfg1,
const LinearFactorGraph& lfg2) { const LinearFactorGraph& lfg2) {
// create new linear factor graph // create new linear factor graph equal to the first one
LinearFactorGraph fg; LinearFactorGraph fg = lfg1;
// set the first linear factor graph
fg = lfg1;
// add the second factors in the graph // add the second factors in the graph
for(const_iterator factor=lfg2.factors.begin(); factor!=lfg2.factors.end(); factor++){ for (const_iterator factor = lfg2.factors.begin(); factor
!= lfg2.factors.end(); factor++) {
fg.push_back(*factor); fg.push_back(*factor);
} }

6
cpp/LinearFactorGraph.h
View File

@ -93,13 +93,13 @@ namespace gtsam {
FGConfig optimize(const Ordering& ordering); FGConfig optimize(const Ordering& ordering);
/** /**
* combine two factor graphs * static function that combines two factor graphs
* @param const &lfg1 Linear factor graph * @param const &lfg1 Linear factor graph
* @param const &lfg2 Linear factor graph * @param const &lfg2 Linear factor graph
* @return a new combined factor graph * @return a new combined factor graph
*/ */
static const LinearFactorGraph combine2(const LinearFactorGraph& lfg1, static LinearFactorGraph combine2(const LinearFactorGraph& lfg1,
const LinearFactorGraph& lfg2 ) ; const LinearFactorGraph& lfg2);
/** /**
* combine two factor graphs * combine two factor graphs