more tab spacing fixes

This commit is contained in:
Shane Grant 2015-05-02 21:53:30 -07:00
parent 4b1b70b302
commit 676ebf76fa

View File

@ -31,89 +31,89 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
template <class IArchive, class OArchive>
void test_valarray()
{
std::random_device rd;
std::mt19937 gen(rd());
std::random_device rd;
std::mt19937 gen(rd());
for (int ii = 0; ii<100; ++ii)
{
std::valarray<int> o_podvalarray(100);
for (auto & elem : o_podvalarray)
elem = random_value<int>(gen);
for (int ii = 0; ii<100; ++ii)
{
std::valarray<int> o_podvalarray(100);
for (auto & elem : o_podvalarray)
elem = random_value<int>(gen);
std::valarray<StructInternalSerialize> o_iservalarray(100);
for (auto & elem : o_iservalarray)
elem = StructInternalSerialize(random_value<int>(gen), random_value<int>(gen));
std::valarray<StructInternalSerialize> o_iservalarray(100);
for (auto & elem : o_iservalarray)
elem = StructInternalSerialize(random_value<int>(gen), random_value<int>(gen));
std::valarray<StructInternalSplit> o_isplvalarray(100);
for (auto & elem : o_isplvalarray)
elem = StructInternalSplit(random_value<int>(gen), random_value<int>(gen));
std::valarray<StructInternalSplit> o_isplvalarray(100);
for (auto & elem : o_isplvalarray)
elem = StructInternalSplit(random_value<int>(gen), random_value<int>(gen));
std::valarray<StructExternalSerialize> o_eservalarray(100);
for (auto & elem : o_eservalarray)
elem = StructExternalSerialize(random_value<int>(gen), random_value<int>(gen));
std::valarray<StructExternalSerialize> o_eservalarray(100);
for (auto & elem : o_eservalarray)
elem = StructExternalSerialize(random_value<int>(gen), random_value<int>(gen));
std::valarray<StructExternalSplit> o_esplvalarray(100);
for (auto & elem : o_esplvalarray)
elem = StructExternalSplit(random_value<int>(gen), random_value<int>(gen));
std::valarray<StructExternalSplit> o_esplvalarray(100);
for (auto & elem : o_esplvalarray)
elem = StructExternalSplit(random_value<int>(gen), random_value<int>(gen));
std::ostringstream os;
{
OArchive oar(os);
std::ostringstream os;
{
OArchive oar(os);
oar(o_podvalarray);
oar(o_iservalarray);
oar(o_isplvalarray);
oar(o_eservalarray);
oar(o_esplvalarray);
}
oar(o_podvalarray);
oar(o_iservalarray);
oar(o_isplvalarray);
oar(o_eservalarray);
oar(o_esplvalarray);
}
std::valarray<int> i_podvalarray;
std::valarray<StructInternalSerialize> i_iservalarray;
std::valarray<StructInternalSplit> i_isplvalarray;
std::valarray<StructExternalSerialize> i_eservalarray;
std::valarray<StructExternalSplit> i_esplvalarray;
std::valarray<int> i_podvalarray;
std::valarray<StructInternalSerialize> i_iservalarray;
std::valarray<StructInternalSplit> i_isplvalarray;
std::valarray<StructExternalSerialize> i_eservalarray;
std::valarray<StructExternalSplit> i_esplvalarray;
std::istringstream is(os.str());
{
IArchive iar(is);
std::istringstream is(os.str());
{
IArchive iar(is);
iar(i_podvalarray);
iar(i_iservalarray);
iar(i_isplvalarray);
iar(i_eservalarray);
iar(i_esplvalarray);
}
iar(i_podvalarray);
iar(i_iservalarray);
iar(i_isplvalarray);
iar(i_eservalarray);
iar(i_esplvalarray);
}
BOOST_CHECK_EQUAL(i_podvalarray.size(), o_podvalarray.size());
BOOST_CHECK_EQUAL(i_iservalarray.size(), o_iservalarray.size());
BOOST_CHECK_EQUAL(i_isplvalarray.size(), o_isplvalarray.size());
BOOST_CHECK_EQUAL(i_eservalarray.size(), o_eservalarray.size());
BOOST_CHECK_EQUAL(i_esplvalarray.size(), o_esplvalarray.size());
BOOST_CHECK_EQUAL(i_podvalarray.size(), o_podvalarray.size());
BOOST_CHECK_EQUAL(i_iservalarray.size(), o_iservalarray.size());
BOOST_CHECK_EQUAL(i_isplvalarray.size(), o_isplvalarray.size());
BOOST_CHECK_EQUAL(i_eservalarray.size(), o_eservalarray.size());
BOOST_CHECK_EQUAL(i_esplvalarray.size(), o_esplvalarray.size());
BOOST_CHECK_EQUAL_COLLECTIONS(std::begin(i_podvalarray), std::end(i_podvalarray), std::begin(o_podvalarray), std::end(o_podvalarray));
BOOST_CHECK_EQUAL_COLLECTIONS(std::begin(i_iservalarray), std::end(i_iservalarray), std::begin(o_iservalarray), std::end(o_iservalarray));
BOOST_CHECK_EQUAL_COLLECTIONS(std::begin(i_isplvalarray), std::end(i_isplvalarray), std::begin(o_isplvalarray), std::end(o_isplvalarray));
BOOST_CHECK_EQUAL_COLLECTIONS(std::begin(i_eservalarray), std::end(i_eservalarray), std::begin(o_eservalarray), std::end(o_eservalarray));
BOOST_CHECK_EQUAL_COLLECTIONS(std::begin(i_esplvalarray), std::end(i_esplvalarray), std::begin(o_esplvalarray), std::end(o_esplvalarray));
}
BOOST_CHECK_EQUAL_COLLECTIONS(std::begin(i_podvalarray), std::end(i_podvalarray), std::begin(o_podvalarray), std::end(o_podvalarray));
BOOST_CHECK_EQUAL_COLLECTIONS(std::begin(i_iservalarray), std::end(i_iservalarray), std::begin(o_iservalarray), std::end(o_iservalarray));
BOOST_CHECK_EQUAL_COLLECTIONS(std::begin(i_isplvalarray), std::end(i_isplvalarray), std::begin(o_isplvalarray), std::end(o_isplvalarray));
BOOST_CHECK_EQUAL_COLLECTIONS(std::begin(i_eservalarray), std::end(i_eservalarray), std::begin(o_eservalarray), std::end(o_eservalarray));
BOOST_CHECK_EQUAL_COLLECTIONS(std::begin(i_esplvalarray), std::end(i_esplvalarray), std::begin(o_esplvalarray), std::end(o_esplvalarray));
}
}
BOOST_AUTO_TEST_CASE(binary_valarray)
{
test_valarray<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
test_valarray<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
}
BOOST_AUTO_TEST_CASE(portable_binary_valarray)
{
test_valarray<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
test_valarray<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
}
BOOST_AUTO_TEST_CASE(xml_valarray)
{
test_valarray<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
test_valarray<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
}
BOOST_AUTO_TEST_CASE(json_valarray)
{
test_valarray<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
test_valarray<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
}