diff --git a/.cproject b/.cproject index 2616f38a8..de77b5ece 100644 --- a/.cproject +++ b/.cproject @@ -375,6 +375,14 @@ true true + + make + -j2 + testGaussianFactor.run + true + true + true + make -j2 @@ -401,7 +409,6 @@ make - tests/testBayesTree.run true false @@ -409,7 +416,6 @@ make - testBinaryBayesNet.run true false @@ -457,7 +463,6 @@ make - testSymbolicBayesNet.run true false @@ -465,7 +470,6 @@ make - tests/testSymbolicFactor.run true false @@ -473,7 +477,6 @@ make - testSymbolicFactorGraph.run true false @@ -489,20 +492,11 @@ make - tests/testBayesTree true false true - - make - -j2 - testGaussianFactor.run - true - true - true - make -j2 @@ -529,6 +523,7 @@ make + testGraph.run true false @@ -600,6 +595,7 @@ make + testInference.run true false @@ -607,6 +603,7 @@ make + testGaussianFactor.run true false @@ -614,6 +611,7 @@ make + testJunctionTree.run true false @@ -621,6 +619,7 @@ make + testSymbolicBayesNet.run true false @@ -628,6 +627,7 @@ make + testSymbolicFactorGraph.run true false @@ -721,15 +721,7 @@ true true - - make - -j2 - all - true - true - true - - + make -j2 check @@ -737,14 +729,6 @@ true true - - make - -j2 - clean - true - true - true - make -j2 @@ -785,15 +769,15 @@ true true - + make -j2 - tests/testSimulated2D.run + all true true true - + make -j2 check @@ -801,6 +785,14 @@ true true + + make + -j2 + clean + true + true + true + make -j2 @@ -913,10 +905,10 @@ true true - + make -j2 - testTupleValues.run + testTupleConfig.run true true true @@ -1115,7 +1107,6 @@ make - testErrors.run true false @@ -1515,6 +1506,7 @@ make + testSimulated2DOriented.run true false @@ -1554,6 +1546,7 @@ make + testSimulated2D.run true false @@ -1561,6 +1554,7 @@ make + testSimulated3D.run true false @@ -1718,10 +1712,10 @@ true true - + make -j2 - SLAMSelfContained.run + CameraResectioning true true true @@ -1742,6 +1736,54 @@ true true + + make + -j2 + easyPoint2KalmanFilter.run + true + true + true + + + make + -j2 + elaboratePoint2KalmanFilter.run + true + true + true + + + make + -j2 + PlanarSLAMSelfContained_advanced.run + true + true + true + + + make + -j2 + Pose2SLAMExample_advanced.run + true + true + true + + + make + -j2 + Pose2SLAMExample_easy.run + true + true + true + + + make + -j2 + Pose2SLAMwSPCG_easy.run + true + true + true + make -j2 @@ -1752,6 +1794,7 @@ make + tests/testGaussianISAM2 true false @@ -1773,46 +1816,6 @@ true true - - make - -j2 - install - true - true - true - - - make - -j2 - clean - true - true - true - - - make - -j2 - check - true - true - true - - - make - -j2 - all - true - true - true - - - make - -j2 - dist - true - true - true - make -j2 @@ -1909,6 +1912,54 @@ true true + + make + -j2 + install + true + true + true + + + make + -j2 + clean + true + true + true + + + make + -j2 + check + true + true + true + + + make + -j2 + all + true + true + true + + + make + -j2 + dist + true + true + true + + + make + -j2 + check + true + true + true + make -j2 @@ -1949,22 +2000,6 @@ true true - - make - -j2 - check - true - true - true - - - make - -j2 - install - true - true - true - diff --git a/[config.h].in b/[config.h].in new file mode 100644 index 000000000..e69de29bb diff --git a/examples/vSLAMexample/Data/calib.txt b/examples/Data/calib.txt similarity index 100% rename from examples/vSLAMexample/Data/calib.txt rename to examples/Data/calib.txt diff --git a/examples/vSLAMexample/Data/landmarks.txt b/examples/Data/landmarks.txt similarity index 100% rename from examples/vSLAMexample/Data/landmarks.txt rename to examples/Data/landmarks.txt diff --git a/examples/vSLAMexample/Data/measurements.txt b/examples/Data/measurements.txt similarity index 100% rename from examples/vSLAMexample/Data/measurements.txt rename to examples/Data/measurements.txt diff --git a/examples/vSLAMexample/Data/measurementsISAM.txt b/examples/Data/measurementsISAM.txt similarity index 100% rename from examples/vSLAMexample/Data/measurementsISAM.txt rename to examples/Data/measurementsISAM.txt diff --git a/examples/vSLAMexample/Data/poses.txt b/examples/Data/poses.txt similarity index 100% rename from examples/vSLAMexample/Data/poses.txt rename to examples/Data/poses.txt diff --git a/examples/vSLAMexample/Data/posesISAM.txt b/examples/Data/posesISAM.txt similarity index 100% rename from examples/vSLAMexample/Data/posesISAM.txt rename to examples/Data/posesISAM.txt diff --git a/examples/vSLAMexample/Data/ttpy10.feat b/examples/Data/ttpy10.feat similarity index 100% rename from examples/vSLAMexample/Data/ttpy10.feat rename to examples/Data/ttpy10.feat diff --git a/examples/vSLAMexample/Data/ttpy10.pose b/examples/Data/ttpy10.pose similarity index 100% rename from examples/vSLAMexample/Data/ttpy10.pose rename to examples/Data/ttpy10.pose diff --git a/examples/vSLAMexample/Data/ttpy100.feat b/examples/Data/ttpy100.feat similarity index 100% rename from examples/vSLAMexample/Data/ttpy100.feat rename to examples/Data/ttpy100.feat diff --git a/examples/vSLAMexample/Data/ttpy100.pose b/examples/Data/ttpy100.pose similarity index 100% rename from examples/vSLAMexample/Data/ttpy100.pose rename to examples/Data/ttpy100.pose diff --git a/examples/vSLAMexample/Data/ttpy20.feat b/examples/Data/ttpy20.feat similarity index 100% rename from examples/vSLAMexample/Data/ttpy20.feat rename to examples/Data/ttpy20.feat diff --git a/examples/vSLAMexample/Data/ttpy20.pose b/examples/Data/ttpy20.pose similarity index 100% rename from examples/vSLAMexample/Data/ttpy20.pose rename to examples/Data/ttpy20.pose diff --git a/examples/vSLAMexample/Data/ttpy30.feat b/examples/Data/ttpy30.feat similarity index 100% rename from examples/vSLAMexample/Data/ttpy30.feat rename to examples/Data/ttpy30.feat diff --git a/examples/vSLAMexample/Data/ttpy30.pose b/examples/Data/ttpy30.pose similarity index 100% rename from examples/vSLAMexample/Data/ttpy30.pose rename to examples/Data/ttpy30.pose diff --git a/examples/vSLAMexample/Data/ttpy40.feat b/examples/Data/ttpy40.feat similarity index 100% rename from examples/vSLAMexample/Data/ttpy40.feat rename to examples/Data/ttpy40.feat diff --git a/examples/vSLAMexample/Data/ttpy40.pose b/examples/Data/ttpy40.pose similarity index 100% rename from examples/vSLAMexample/Data/ttpy40.pose rename to examples/Data/ttpy40.pose diff --git a/examples/vSLAMexample/Data/ttpy50.feat b/examples/Data/ttpy50.feat similarity index 100% rename from examples/vSLAMexample/Data/ttpy50.feat rename to examples/Data/ttpy50.feat diff --git a/examples/vSLAMexample/Data/ttpy50.pose b/examples/Data/ttpy50.pose similarity index 100% rename from examples/vSLAMexample/Data/ttpy50.pose rename to examples/Data/ttpy50.pose diff --git a/examples/vSLAMexample/Data/ttpy60.feat b/examples/Data/ttpy60.feat similarity index 100% rename from examples/vSLAMexample/Data/ttpy60.feat rename to examples/Data/ttpy60.feat diff --git a/examples/vSLAMexample/Data/ttpy60.pose b/examples/Data/ttpy60.pose similarity index 100% rename from examples/vSLAMexample/Data/ttpy60.pose rename to examples/Data/ttpy60.pose diff --git a/examples/vSLAMexample/Data/ttpy70.feat b/examples/Data/ttpy70.feat similarity index 100% rename from examples/vSLAMexample/Data/ttpy70.feat rename to examples/Data/ttpy70.feat diff --git a/examples/vSLAMexample/Data/ttpy70.pose b/examples/Data/ttpy70.pose similarity index 100% rename from examples/vSLAMexample/Data/ttpy70.pose rename to examples/Data/ttpy70.pose diff --git a/examples/vSLAMexample/Data/ttpy80.feat b/examples/Data/ttpy80.feat similarity index 100% rename from examples/vSLAMexample/Data/ttpy80.feat rename to examples/Data/ttpy80.feat diff --git a/examples/vSLAMexample/Data/ttpy80.pose b/examples/Data/ttpy80.pose similarity index 100% rename from examples/vSLAMexample/Data/ttpy80.pose rename to examples/Data/ttpy80.pose diff --git a/examples/vSLAMexample/Data/ttpy90.feat b/examples/Data/ttpy90.feat similarity index 100% rename from examples/vSLAMexample/Data/ttpy90.feat rename to examples/Data/ttpy90.feat diff --git a/examples/vSLAMexample/Data/ttpy90.pose b/examples/Data/ttpy90.pose similarity index 100% rename from examples/vSLAMexample/Data/ttpy90.pose rename to examples/Data/ttpy90.pose diff --git a/examples/Makefile.am b/examples/Makefile.am index 3c94ea39a..ee8f0db18 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -20,6 +20,7 @@ noinst_PROGRAMS += Pose2SLAMwSPCG_easy # Solves a simple Pose2 SLAM examp noinst_PROGRAMS += Pose2SLAMwSPCG_advanced # Solves a simple Pose2 SLAM example with easy SPCG solver noinst_PROGRAMS += elaboratePoint2KalmanFilter # simple linear Kalman filter on a moving 2D point, but done using factor graphs noinst_PROGRAMS += easyPoint2KalmanFilter # uses the cool generic templated Kalman filter class to do the same +noinst_PROGRAMS += CameraResectioning SUBDIRS = vSLAMexample # visual SLAM examples with 3D point landmarks and 6D camera poses #---------------------------------------------------------------------------------------------------- # rules to build local programs @@ -35,5 +36,5 @@ AM_DEFAULT_SOURCE_EXT = .cpp # rule to run executable with valgrind %.valgrind: % $(LDADD) - valgrind ./$^ + valgrind ./% #---------------------------------------------------------------------------------------------------- diff --git a/examples/vSLAMexample/Makefile.am b/examples/vSLAMexample/Makefile.am index 120030991..f4056bd99 100644 --- a/examples/vSLAMexample/Makefile.am +++ b/examples/vSLAMexample/Makefile.am @@ -35,7 +35,7 @@ AM_DEFAULT_SOURCE_EXT = .cpp # rule to run an executable %.run: % $(LDADD) - ./$^ + ./% # rule to run executable with valgrind %.valgrind: % $(LDADD) diff --git a/examples/vSLAMexample/vISAMexample.cpp b/examples/vSLAMexample/vISAMexample.cpp index dd67d3566..1e5040509 100644 --- a/examples/vSLAMexample/vISAMexample.cpp +++ b/examples/vSLAMexample/vISAMexample.cpp @@ -115,8 +115,8 @@ int main(int argc, char* argv[]) { cout << "Usage: vISAMexample " << endl << endl; cout << "\tPlease specify , which contains calibration file, initial\n" "\tlandmarks, initial poses, and feature data." << endl; - cout << "\tSample folder is in $gtsam_source_folder$/examples/vSLAMexample/Data/" << endl << endl; - cout << "Example usage: vISAMexample '$gtsam_source_folder$/examples/vSLAMexample/Data/'" << endl; + cout << "\tSample folder is in $gtsam_source_folder$/examples/Data/" << endl << endl; + cout << "Example usage: vISAMexample '$gtsam_source_folder$/examples/Data/'" << endl; exit(0); } diff --git a/examples/vSLAMexample/vSFMexample.cpp b/examples/vSLAMexample/vSFMexample.cpp index b7ac7310c..8027fa571 100644 --- a/examples/vSLAMexample/vSFMexample.cpp +++ b/examples/vSLAMexample/vSFMexample.cpp @@ -124,8 +124,8 @@ int main(int argc, char* argv[]) { cout << "Usage: vSFMexample " << endl << endl; cout << "\tPlease specify , which contains calibration file, initial\n" "\tlandmarks, initial poses, and feature data." << endl; - cout << "\tSample folder is in $gtsam_source_folder$/examples/vSLAMexample/Data" << endl << endl; - cout << "Example usage: vSFMexample '$gtsam_source_folder$/examples/vSLAMexample/Data'" << endl; + cout << "\tSample folder is in $gtsam_source_folder$/examples/Data" << endl << endl; + cout << "Example usage: vSFMexample '$gtsam_source_folder$/examples/Data'" << endl; exit(0); }