generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-19 13:02:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'redboltz/add_integer_to_float_conv'

Browse Source
This commit is contained in:
Nobuyuki Kubota 2014-02-28 15:53:05 +09:00
commit 98c5767372
2 changed files with 78 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/msgpack/type/float.hpp
View File

@ -29,8 +29,18 @@ namespace msgpack {
inline float& operator>> (object o, float& v) inline float& operator>> (object o, float& v)
{ {
if(o.type != type::DOUBLE) { throw type_error(); } if(o.type == type::DOUBLE) {
v = (float)o.via.dec; v = (float)o.via.dec;
}
else if (o.type == type::POSITIVE_INTEGER) {
v = (float)o.via.u64;
}
else if (o.type == type::NEGATIVE_INTEGER) {
v = (float)o.via.i64;
}
else {
throw type_error();
}
return v; return v;
} }
@ -44,8 +54,18 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const float& v)
inline double& operator>> (object o, double& v) inline double& operator>> (object o, double& v)
{ {
if(o.type != type::DOUBLE) { throw type_error(); } if(o.type == type::DOUBLE) {
v = o.via.dec; v = o.via.dec;
}
else if (o.type == type::POSITIVE_INTEGER) {
v = (double)o.via.u64;
}
else if (o.type == type::NEGATIVE_INTEGER) {
v = (double)o.via.i64;
}
else {
throw type_error();
}
return v; return v;
} }

54
test/msgpack_test.cpp
View File

@ -7,6 +7,7 @@
#include <deque> #include <deque>
#include <set> #include <set>
#include <list> #include <list>
#include <type_traits>
#include <gtest/gtest.h> #include <gtest/gtest.h>
@ -178,6 +179,59 @@ TEST(MSGPACK, simple_buffer_float)
} }
} }
namespace {
template<typename F, typename I>
struct TypePair {
typedef F float_type;
typedef I integer_type;
};
} // namespace
template <typename T>
class IntegerToFloatingPointTest : public testing::Test {
};
TYPED_TEST_CASE_P(IntegerToFloatingPointTest);
TYPED_TEST_P(IntegerToFloatingPointTest, simple_buffer)
{
typedef typename TypeParam::float_type float_type;
typedef typename TypeParam::integer_type integer_type;
vector<integer_type> v;
v.push_back(0);
v.push_back(1);
if (is_signed<integer_type>::value) v.push_back(-1);
else v.push_back(2);
v.push_back(numeric_limits<integer_type>::min());
v.push_back(numeric_limits<integer_type>::max());
for (unsigned int i = 0; i < kLoop; i++) {
v.push_back(rand());
}
for (unsigned int i = 0; i < v.size() ; i++) {
msgpack::sbuffer sbuf;
integer_type val1 = v[i];
msgpack::pack(sbuf, val1);
msgpack::zone z;
msgpack::object obj;
msgpack::unpack_return ret =
msgpack::unpack(sbuf.data(), sbuf.size(), NULL, &z, &obj);
EXPECT_EQ(msgpack::UNPACK_SUCCESS, ret);
float_type val2;
obj.convert(&val2);
EXPECT_TRUE(fabs(val2 - val1) <= kEPS);
}
}
REGISTER_TYPED_TEST_CASE_P(IntegerToFloatingPointTest,
simple_buffer);
typedef testing::Types<TypePair<float, signed long long>,
TypePair<float, unsigned long long>,
TypePair<double, signed long long>,
TypePair<double, unsigned long long> > IntegerToFloatingPointTestTypes;
INSTANTIATE_TYPED_TEST_CASE_P(IntegerToFloatingPointTestInstance,
IntegerToFloatingPointTest,
IntegerToFloatingPointTestTypes);
TEST(MSGPACK, simple_buffer_double) TEST(MSGPACK, simple_buffer_double)
{ {
vector<double> v; vector<double> v;