diff options
| author | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-04-07 16:58:55 +0200 |
|---|---|---|
| committer | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-04-07 16:58:55 +0200 |
| commit | 715245dc7042ac0dca4fea94031d7c6de8058033 (patch) | |
| tree | 3a7ff0b88f2e113a08aef663d2487edec0b5f67f /dpmert/lo_test.cc | |
| parent | 89211ab30937672d84a54fac8fa435805499e38d (diff) | |
| parent | 6001b81eba37985d2e7dea6e6ebb488b787789a6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'dpmert/lo_test.cc')
| -rw-r--r-- | dpmert/lo_test.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/dpmert/lo_test.cc b/dpmert/lo_test.cc index d9b909b8..5d90aabb 100644 --- a/dpmert/lo_test.cc +++ b/dpmert/lo_test.cc @@ -19,7 +19,6 @@ #include "line_optimizer.h" using namespace std; -using boost::shared_ptr; class OptTest : public testing::Test { protected: @@ -44,12 +43,12 @@ TEST_F(OptTest, TestCheckNaN) { } TEST_F(OptTest,TestConvexHull) { - shared_ptr<MERTPoint> a1(new MERTPoint(-1, 0)); - shared_ptr<MERTPoint> b1(new MERTPoint(1, 0)); - shared_ptr<MERTPoint> a2(new MERTPoint(-1, 1)); - shared_ptr<MERTPoint> b2(new MERTPoint(1, -1)); - vector<shared_ptr<MERTPoint> > sa; sa.push_back(a1); sa.push_back(b1); - vector<shared_ptr<MERTPoint> > sb; sb.push_back(a2); sb.push_back(b2); + boost::shared_ptr<MERTPoint> a1(new MERTPoint(-1, 0)); + boost::shared_ptr<MERTPoint> b1(new MERTPoint(1, 0)); + boost::shared_ptr<MERTPoint> a2(new MERTPoint(-1, 1)); + boost::shared_ptr<MERTPoint> b2(new MERTPoint(1, -1)); + vector<boost::shared_ptr<MERTPoint> > sa; sa.push_back(a1); sa.push_back(b1); + vector<boost::shared_ptr<MERTPoint> > sb; sb.push_back(a2); sb.push_back(b2); ConvexHull a(sa); cerr << a << endl; ConvexHull b(sb); |