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

fix signed/unsigned warnings

release/4.3a0
cbeall3 2014-10-14 17:00:03 -04:00
parent fcc49bd22a
commit 799beec7e2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/slam/dataset.cpp
View File

@ -163,7 +163,7 @@ static SharedNoiseModel readNoiseModel(ifstream& is, bool smart,
} }
/* ************************************************************************* */ /* ************************************************************************* */
GraphAndValues load2D(const string& filename, SharedNoiseModel model, int maxID, GraphAndValues load2D(const string& filename, SharedNoiseModel model, Key maxID,
bool addNoise, bool smart, NoiseFormat noiseFormat, bool addNoise, bool smart, NoiseFormat noiseFormat,
KernelFunctionType kernelFunctionType) { KernelFunctionType kernelFunctionType) {
@ -211,7 +211,7 @@ GraphAndValues load2D(const string& filename, SharedNoiseModel model, int maxID,
} }
// Parse the pose constraints // Parse the pose constraints
int id1, id2; Key id1, id2;
bool haveLandmark = false; bool haveLandmark = false;
while (!is.eof()) { while (!is.eof()) {
if (!(is >> tag)) if (!(is >> tag))

2
gtsam/slam/dataset.h
View File

@ -94,7 +94,7 @@ GTSAM_EXPORT GraphAndValues load2D(
* @return graph and initial values * @return graph and initial values
*/ */
GTSAM_EXPORT GraphAndValues load2D(const std::string& filename, GTSAM_EXPORT GraphAndValues load2D(const std::string& filename,
SharedNoiseModel model = SharedNoiseModel(), int maxID = 0, bool addNoise = SharedNoiseModel model = SharedNoiseModel(), Key maxID = 0, bool addNoise =
false, bool smart = true, NoiseFormat noiseFormat = NoiseFormatGRAPH, // false, bool smart = true, NoiseFormat noiseFormat = NoiseFormatGRAPH, //
KernelFunctionType kernelFunctionType = KernelFunctionTypeNONE); KernelFunctionType kernelFunctionType = KernelFunctionTypeNONE);