From 33cdd30173b923677d38a53d9e07a04b90029537 Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Tue, 15 May 2012 01:01:31 +0000 Subject: [PATCH] Fixed link and load errors in example, added exception (rather than segfault) if file not found. --- gtsam_unstable/discrete/CMakeLists.txt | 4 ++-- gtsam_unstable/discrete/Scheduler.cpp | 4 ++++ gtsam_unstable/discrete/examples/schedulingExample.cpp | 2 +- gtsam_unstable/discrete/examples/schedulingQuals12.cpp | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gtsam_unstable/discrete/CMakeLists.txt b/gtsam_unstable/discrete/CMakeLists.txt index 73f10f1f0..b10503359 100644 --- a/gtsam_unstable/discrete/CMakeLists.txt +++ b/gtsam_unstable/discrete/CMakeLists.txt @@ -24,8 +24,8 @@ gtsam_add_subdir_tests(discrete_unstable "${discrete_local_libs}" "${discrete_fu # add examples foreach(example schedulingExample schedulingQuals12) add_executable(${example} "examples/${example}.cpp") - add_dependencies(${example} gtsam-static) - target_link_libraries(${example} gtsam-static) + add_dependencies(${example} gtsam-static gtsam_unstable-static) + target_link_libraries(${example} gtsam-static gtsam_unstable-static) add_custom_target(${example}.run ${EXECUTABLE_OUTPUT_PATH}${example} ${ARGN}) endforeach(example) diff --git a/gtsam_unstable/discrete/Scheduler.cpp b/gtsam_unstable/discrete/Scheduler.cpp index a586e7f33..6b4a19e76 100644 --- a/gtsam_unstable/discrete/Scheduler.cpp +++ b/gtsam_unstable/discrete/Scheduler.cpp @@ -29,6 +29,10 @@ namespace gtsam { // open file ifstream is(filename.c_str()); + if (!is) { + cerr << "Scheduler: could not open file " << filename << endl; + throw runtime_error("Scheduler: could not open file " + filename); + } string line; // buffer diff --git a/gtsam_unstable/discrete/examples/schedulingExample.cpp b/gtsam_unstable/discrete/examples/schedulingExample.cpp index 6ad2478ec..485f0ea1c 100644 --- a/gtsam_unstable/discrete/examples/schedulingExample.cpp +++ b/gtsam_unstable/discrete/examples/schedulingExample.cpp @@ -53,7 +53,7 @@ void addStudent(Scheduler& s, size_t i) { } /* ************************************************************************* */ Scheduler largeExample(size_t nrStudents = 7) { - string path("/Users/dellaert/borg/gtsam/gtsam/discrete/examples/"); + string path("../../../gtsam_unstable/discrete/examples/"); Scheduler s(nrStudents, path + "Doodle.csv"); s.addArea("Harvey Lipkin", "Mechanics"); diff --git a/gtsam_unstable/discrete/examples/schedulingQuals12.cpp b/gtsam_unstable/discrete/examples/schedulingQuals12.cpp index 32bb8ebb2..d0fa041c9 100644 --- a/gtsam_unstable/discrete/examples/schedulingQuals12.cpp +++ b/gtsam_unstable/discrete/examples/schedulingQuals12.cpp @@ -65,7 +65,7 @@ void addStudent(Scheduler& s, size_t i) { /* ************************************************************************* */ Scheduler largeExample(size_t nrStudents = NRSTUDENTS) { - string path("/Users/dellaert/borg/gtsam/gtsam/discrete/examples/"); + string path("../../../gtsam_unstable/discrete/examples/"); Scheduler s(nrStudents, path + "Doodle2012.csv"); s.addArea("Harvey Lipkin", "Mechanics");