kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Serializing and deserializing double at transit section

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2017-10-03 15:34:20 +03:00 • committed by Vladimir Byko-Ianko
parent 30977d4f79
commit 43260b6cc2
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
generator/transit_generator.hpp
View file

@ -21,18 +21,12 @@ public:
DeserializerFromJson(json_struct_t * node) : m_node(node) {}
template<typename T>
typename std::enable_if<std::is_integral<T>::value || std::is_enum<T>::value>::type
typename std::enable_if<std::is_integral<T>::value || std::is_enum<T>::value || std::is_same<T, double >::value>::type
operator()(T & t, char const * name = nullptr)
{
GetField(t, name);
}
template<typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type operator()(T & t, char const * name = nullptr)
{
NOTIMPLEMENTED();
}
void operator()(std::string & s, char const * name = nullptr) { GetField(s, name); }
void operator()(m2::PointD & p, char const * name = nullptr);

1
routing_common/routing_common_tests/transit_test.cpp
View file

@ -59,4 +59,3 @@ UNIT_TEST(Transit_StopSerialization)
}
}
} // namespace

19
routing_common/transit_serdes.hpp
View file

@ -24,6 +24,11 @@ namespace routing
{
namespace transit
{
// Note. For the time being double at transit section is used only for saving weight of edges (in seconds).
// Let us assume that it takes less than 10^7 seconds (115 days) to get from one station to a neighboring one.
double constexpr kMinDoubleAtTransit = 0.0;
double constexpr kMaxDoubleAtTransit = 10000000.0;
template <typename Sink>
class Serializer
{
@ -37,10 +42,11 @@ public:
WriteToSink(m_sink, t);
}
template<typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type operator()(T const & t, char const * /* name */ = nullptr)
void operator()(double d, char const * name = nullptr)
{
NOTIMPLEMENTED();
CHECK_GREATER_OR_EQUAL(d, 0, ());
CHECK_LESS_OR_EQUAL(d, kMaxDoubleAtTransit, ());
(*this)(DoubleToUint32(d, kMinDoubleAtTransit, kMaxDoubleAtTransit, POINT_COORD_BITS), name);
}
void operator()(std::string const & s, char const * /* name */ = nullptr)
@ -87,10 +93,11 @@ public:
ReadPrimitiveFromSource(m_source, t);
}
template<typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type operator()(T & t, char const * name = nullptr)
double operator()(double & d, char const * name = nullptr)
{
NOTIMPLEMENTED();
uint32_t ui;
(*this)(ui, name);
d = Uint32ToDouble(ui, kMinDoubleAtTransit, kMaxDoubleAtTransit, POINT_COORD_BITS);
}
void operator()(std::string & s, char const * /* name */ = nullptr)