Skip to content

D
dlib
Commit 6de07db2 authored by Davis King's avatar Davis King
Browse files
Options

Refactored the + and - operators for the dlib::vector object so that they always compile 

when used with mixed matrix and vector objects.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403098
parent 5ae0c51c
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 80 deletions
dlib/geometry/vector.h
View file @ 6de07db2
......@@ -488,37 +488,6 @@ namespace dlib
// ---------------------------------------
template <typename U, long N>
typename vc_rebind_promote<T,U,3>::type operator + (
const vector<U,N>& rhs
) const
{
typedef vector<typename promote<T,U>::type,3> ret_type;
return ret_type(x()+rhs.x(), y()+rhs.y(), z()+rhs.z());
}
// ---------------------------------------
vector operator + (
const vector& rhs
) const
{
return vector(x()+rhs.x(), y()+rhs.y(), z()+rhs.z());
}
// ---------------------------------------
template <typename U, long N>
typename vc_rebind_promote<T,U,3>::type operator - (
const vector<U,N>& rhs
) const
{
typedef vector<typename promote<T,U>::type,3> ret_type;
return ret_type(x()-rhs.x(), y()-rhs.y(), z()-rhs.z());
}
// ---------------------------------------
vector operator - (
) const
{
......@@ -527,15 +496,6 @@ namespace dlib
// ---------------------------------------
vector operator - (
const vector& rhs
) const
{
return vector(x()-rhs.x(), y()-rhs.y(), z()-rhs.z());
}
// ---------------------------------------
template <typename U>
typename vc_rebind_promote<T,U,3>::type operator / (
const U& val
......@@ -852,26 +812,6 @@ namespace dlib
// ---------------------------------------
vector operator + (
const vector& rhs
) const
{
return vector(x()+rhs.x(), y()+rhs.y());
}
// ---------------------------------------
template <typename U, long N>
typename vc_rebind_promote<T,U,N>::type operator + (
const vector<U,N>& rhs
) const
{
typedef vector<typename promote<T,U>::type,N> ret_type;
return ret_type(*this) + ret_type(rhs);
}
// ---------------------------------------
vector operator - (
) const
{
......@@ -880,26 +820,6 @@ namespace dlib
// ---------------------------------------
vector operator - (
const vector& rhs
) const
{
return vector(x()-rhs.x(), y()-rhs.y());
}
// ---------------------------------------
template <typename U, long N>
typename vc_rebind_promote<T,U,N>::type operator - (
const vector<U,N>& rhs
) const
{
typedef vector<typename promote<T,U>::type,N> ret_type;
return ret_type(*this) - ret_type(rhs);
}
// ---------------------------------------
template <typename U>
typename vc_rebind_promote<T,U,2>::type operator / (
const U& val
......@@ -980,6 +900,105 @@ namespace dlib
// ----------------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------------
template <typename T, typename U>
inline const typename vc_rebind_promote<T,U,2>::type operator+ (
const vector<T,2>& lhs,
const vector<U,2>& rhs
)
{
typedef typename vc_rebind_promote<T,U,2>::type ret_type;
return ret_type(lhs.x()+rhs.x(), lhs.y()+rhs.y());
}
// ----------------------------------------------------------------------------------------
template <typename T, typename U>
inline const typename vc_rebind_promote<T,U,3>::type operator+ (
const vector<T,3>& lhs,
const vector<U,3>& rhs
)
{
typedef typename vc_rebind_promote<T,U,3>::type ret_type;
return ret_type(lhs.x()+rhs.x(), lhs.y()+rhs.y(), lhs.z()+rhs.z());
}
// ----------------------------------------------------------------------------------------
template <typename T, typename U>
inline const typename vc_rebind_promote<T,U,3>::type operator+ (
const vector<T,2>& lhs,
const vector<U,3>& rhs
)
{
typedef typename vc_rebind_promote<T,U,3>::type ret_type;
return ret_type(lhs.x()+rhs.x(), lhs.y()+rhs.y(), rhs.z());
}
// ----------------------------------------------------------------------------------------
template <typename T, typename U>
inline const typename vc_rebind_promote<T,U,3>::type operator+ (
const vector<T,3>& lhs,
const vector<U,2>& rhs
)
{
typedef typename vc_rebind_promote<T,U,3>::type ret_type;
return ret_type(lhs.x()+rhs.x(), lhs.y()+rhs.y(), lhs.z());
}
// ----------------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------------
template <typename T, typename U>
inline const typename vc_rebind_promote<T,U,2>::type operator- (
const vector<T,2>& lhs,
const vector<U,2>& rhs
)
{
typedef typename vc_rebind_promote<T,U,2>::type ret_type;
return ret_type(lhs.x()-rhs.x(), lhs.y()-rhs.y());
}
// ----------------------------------------------------------------------------------------
template <typename T, typename U>
inline const typename vc_rebind_promote<T,U,3>::type operator- (
const vector<T,3>& lhs,
const vector<U,3>& rhs
)
{
typedef typename vc_rebind_promote<T,U,3>::type ret_type;
return ret_type(lhs.x()-rhs.x(), lhs.y()-rhs.y(), lhs.z()-rhs.z());
}
// ----------------------------------------------------------------------------------------
template <typename T, typename U>
inline const typename vc_rebind_promote<T,U,3>::type operator- (
const vector<T,2>& lhs,
const vector<U,3>& rhs
)
{
typedef typename vc_rebind_promote<T,U,3>::type ret_type;
return ret_type(lhs.x()-rhs.x(), lhs.y()-rhs.y(), -rhs.z());
}
// ----------------------------------------------------------------------------------------
template <typename T, typename U>
inline const typename vc_rebind_promote<T,U,3>::type operator- (
const vector<T,3>& lhs,
const vector<U,2>& rhs
)
{
typedef typename vc_rebind_promote<T,U,3>::type ret_type;
return ret_type(lhs.x()-rhs.x(), lhs.y()-rhs.y(), lhs.z());
}
// ----------------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------------
template <typename T, typename U>
inline typename disable_if<is_matrix<U>, const typename vc_rebind_promote<T,U,2>::type >::type operator* (
......
dlib/test/geometry.cpp
View file @ 6de07db2
......@@ -9,6 +9,7 @@
#include <ctime>
#include <dlib/string.h>
#include <dlib/matrix.h>
#include <dlib/rand.h>
#include "tester.h"
......@@ -324,6 +325,26 @@ namespace
DLIB_TEST(rect.right() == 0);
DLIB_TEST(rect.bottom() == 0);
}
{
std::vector< dlib::vector<double> > a;
dlib::vector<double> v;
dlib::rand::float_1a rnd;
for (int i = 0; i < 10; ++i)
{
v.x() = rnd.get_random_double();
v.y() = rnd.get_random_double();
v.z() = rnd.get_random_double();
a.push_back(v);
}
// This test is just to make sure the covariance function can compile when used
// on a dlib::vector. The actual test doesn't matter.
DLIB_TEST(sum(covariance(vector_to_matrix(a))) < 10);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment