|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r60316 - in sandbox/statistics/detail/assign: boost/assign/auto_size libs/assign/doc libs/assign/example libs/assign/test
From: erwann.rogard_at_[hidden]
Date: 2010-03-07 12:30:19
Author: e_r
Date: 2010-03-07 12:30:17 EST (Sun, 07 Mar 2010)
New Revision: 60316
URL: http://svn.boost.org/trac/boost/changeset/60316
Log:
m
Added:
sandbox/statistics/detail/assign/boost/assign/auto_size/ref_csv.hpp
- copied, changed from r60165, /sandbox/statistics/detail/assign/boost/assign/auto_size/ref_list_of_csv.hpp
Removed:
sandbox/statistics/detail/assign/boost/assign/auto_size/ref_list_of_csv.hpp
Text files modified:
sandbox/statistics/detail/assign/boost/assign/auto_size/ref_csv.hpp | 12 ++++++------
sandbox/statistics/detail/assign/boost/assign/auto_size/ref_rebind_list_of_csv.hpp | 12 ++++++------
sandbox/statistics/detail/assign/libs/assign/doc/speed.txt | 12 ++++++------
sandbox/statistics/detail/assign/libs/assign/doc/speed2.txt | 30 +++++++++++++++---------------
sandbox/statistics/detail/assign/libs/assign/example/ref_list_of.cpp | 16 ++++++++--------
sandbox/statistics/detail/assign/libs/assign/test/speed.cpp | 26 +++++++++++++-------------
sandbox/statistics/detail/assign/libs/assign/test/speed2.cpp | 22 +++++++++++-----------
7 files changed, 65 insertions(+), 65 deletions(-)
Copied: sandbox/statistics/detail/assign/boost/assign/auto_size/ref_csv.hpp (from r60165, /sandbox/statistics/detail/assign/boost/assign/auto_size/ref_list_of_csv.hpp)
==============================================================================
--- /sandbox/statistics/detail/assign/boost/assign/auto_size/ref_list_of_csv.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/ref_csv.hpp 2010-03-07 12:30:17 EST (Sun, 07 Mar 2010)
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
-// assign::ref_list_of_csv.hpp //
+// assign::ref_csv.hpp //
// //
// (C) Copyright 2010 Erwann Rogard //
// Use, modification and distribution are subject to the //
@@ -10,14 +10,14 @@
#define BOOST_ASSIGN_AUTO_SIZE_REF_LIST_OF_CSV_ER_2010_HPP
// Usage:
-// ref_list_of_csv(a,b,c);
-// cref_list_of_csv(a,b,c);
-// ref_list_of_csv<P>(a,b,c);
-// cref_list_of_csv<P>(a,b,c);
+// ref_csv(a,b,c);
+// cref_csv(a,b,c);
+// ref_csv<P>(a,b,c);
+// cref_csv<P>(a,b,c);
#define BOOST_ASSIGN_CSV_ref boost::assign::detail::auto_size::ref_copy
#include <boost/assign/auto_size/detail/csv.hpp>
-BOOST_ASSIGN_CSV(ref_list_of_csv)
+BOOST_ASSIGN_CSV(ref_csv)
#undef BOOST_ASSIGN_CSV_ref
#endif
Deleted: sandbox/statistics/detail/assign/boost/assign/auto_size/ref_list_of_csv.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/ref_list_of_csv.hpp 2010-03-07 12:30:17 EST (Sun, 07 Mar 2010)
+++ (empty file)
@@ -1,23 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// assign::ref_list_of_csv.hpp //
-// //
-// (C) Copyright 2010 Erwann Rogard //
-// Use, modification and distribution are subject to the //
-// Boost Software License, Version 1.0. (See accompanying file //
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
-//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_AUTO_SIZE_REF_LIST_OF_CSV_ER_2010_HPP
-#define BOOST_ASSIGN_AUTO_SIZE_REF_LIST_OF_CSV_ER_2010_HPP
-
-// Usage:
-// ref_list_of_csv(a,b,c);
-// cref_list_of_csv(a,b,c);
-// ref_list_of_csv<P>(a,b,c);
-// cref_list_of_csv<P>(a,b,c);
-
-#define BOOST_ASSIGN_CSV_ref boost::assign::detail::auto_size::ref_copy
-#include <boost/assign/auto_size/detail/csv.hpp>
-BOOST_ASSIGN_CSV(ref_list_of_csv)
-#undef BOOST_ASSIGN_CSV_ref
-
-#endif
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/ref_rebind_list_of_csv.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/ref_rebind_list_of_csv.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/ref_rebind_list_of_csv.hpp 2010-03-07 12:30:17 EST (Sun, 07 Mar 2010)
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
-// assign::ref_rebind_list_of_csv.hpp //
+// assign::ref_rebind_csv.hpp //
// //
// (C) Copyright 2010 Erwann Rogard //
// Use, modification and distribution are subject to the //
@@ -10,14 +10,14 @@
#define BOOST_ASSIGN_AUTO_SIZE_REF_REBIND_LIST_OF_CSV_ER_2010_HPP
// Usage:
-// ref_rebind_list_of_csv(a,b,c);
-// cref_rebind_list_of_csv(a,b,c);
-// ref_rebind_list_of_csv<P>(a,b,c);
-// cref_rebind_list_of_csv<P>(a,b,c);
+// ref_rebind_csv(a,b,c);
+// cref_rebind_csv(a,b,c);
+// ref_rebind_csv<P>(a,b,c);
+// cref_rebind_csv<P>(a,b,c);
#define BOOST_ASSIGN_CSV_ref boost::assign::detail::auto_size::ref_rebind
#include <boost/assign/auto_size/detail/csv.hpp>
-BOOST_ASSIGN_CSV(ref_rebind_list_of_csv)
+BOOST_ASSIGN_CSV(ref_rebind_csv)
#undef BOOST_ASSIGN_CSV_ref
#endif
Modified: sandbox/statistics/detail/assign/libs/assign/doc/speed.txt
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/doc/speed.txt (original)
+++ sandbox/statistics/detail/assign/libs/assign/doc/speed.txt 2010-03-07 12:30:17 EST (Sun, 07 Mar 2010)
@@ -6,7 +6,7 @@
cref_list_of(1) => 0.00 s
-cref_list_of_csv(1) => 0.00 s
+cref_csv(1) => 0.00 s
cref_list_of<>(1) => 0.00 s
@@ -15,7 +15,7 @@
cref_list_of(3) => 0.01 s
-cref_list_of_csv(3) => 0.01 s
+cref_csv(3) => 0.01 s
cref_list_of<>(3) => 0.00 s
@@ -24,7 +24,7 @@
cref_list_of(10) => 0.02 s
-cref_list_of_csv(10) => 0.05 s
+cref_csv(10) => 0.05 s
cref_list_of<>(10) => 0.01 s
@@ -33,7 +33,7 @@
cref_list_of(30) => 0.07 s
-cref_list_of_csv(30) => 0.14 s
+cref_csv(30) => 0.14 s
cref_list_of<>(30) => 0.04 s
@@ -42,7 +42,7 @@
cref_list_of(80) => 0.22 s
-cref_list_of_csv(80) => 0.39 s
+cref_csv(80) => 0.39 s
cref_list_of<>(80) => 0.06 s
@@ -51,7 +51,7 @@
cref_list_of(160) => 0.45 s
-cref_list_of_csv(160) => 0.82 s
+cref_csv(160) => 0.82 s
cref_list_of<>(160) => 0.12 s
Modified: sandbox/statistics/detail/assign/libs/assign/doc/speed2.txt
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/doc/speed2.txt (original)
+++ sandbox/statistics/detail/assign/libs/assign/doc/speed2.txt 2010-03-07 12:30:17 EST (Sun, 07 Mar 2010)
@@ -6,27 +6,27 @@
Mac OS Leopard 10.6 - x86_64 - Release mode - gcc 4.2
cref_list_of(1) => 0.15 s
-cref_list_of_csv(1) => 0.33 s
+cref_csv(1) => 0.33 s
cref_list_of<>(1) => 0.00 s
list_of(1) => 131.03 s
cref_list_of(3) => 0.54 s
-cref_list_of_csv(3) => 1.45 s
+cref_csv(3) => 1.45 s
cref_list_of<>(3) => 0.37 s
list_of(3) => 342.12 s
cref_list_of(10) => 2.01 s
-cref_list_of_csv(10) => 3.53 s
+cref_csv(10) => 3.53 s
cref_list_of<>(10) => 1.05 s
list_of(10) => 878.79 s
cref_list_of(30) => 7.15 s
-cref_list_of_csv(30) => 9.63 s
+cref_csv(30) => 9.63 s
cref_list_of<>(30) => 4.16 s
list_of(30) => 2475.13 s
cref_list_of(90) => 25.68 s
-cref_list_of_csv(90) => 28.22 s
+cref_csv(90) => 28.22 s
cref_list_of<>(90) => 7.19 s
list_of(90) => 7284.27 s
@@ -34,53 +34,53 @@
Win7-32 V6.1.7100 - Dev-C++ 5.0 beta 9.2 - Mingw/GCC 3.4.2 - Best optim
cref_list_of(1) => 0.80 s
-cref_list_of_csv(1) => 1.97 s
+cref_csv(1) => 1.97 s
cref_list_of<>(1) => 0.42 s
list_of(1) => 371.00 s
cref_list_of(3) => 2.21 s
-cref_list_of_csv(3) => 4.25 s
+cref_csv(3) => 4.25 s
cref_list_of<>(3) => 0.99 s
list_of(3) => 852.00 s
cref_list_of(10) => 6.51 s
-cref_list_of_csv(10) => 11.90 s
+cref_csv(10) => 11.90 s
cref_list_of<>(10) => 3.92 s
list_of(10) => 931.79 s
cref_list_of(30) => 19.53 s
-cref_list_of_csv(30) => 46.90 s
+cref_csv(30) => 46.90 s
cref_list_of<>(30) => 10.63 s
list_of(30) => 2504.00 s
cref_list_of(90) => 58.01 s
-cref_list_of_csv(90) => 161.99 s
+cref_csv(90) => 161.99 s
cref_list_of<>(90) => 34.38 s
list_of(90) => 8372.00 s
Win7-32 V6.1.7100 - Visual Studio 2010 - Release mode
cref_list_of(1) => 0.59 s
-cref_list_of_csv(1) => 0.04 s
+cref_csv(1) => 0.04 s
cref_list_of<>(1) => 0.00 s
list_of(1) => 2964.00 s
cref_list_of(3) => 1.27 s
-cref_list_of_csv(3) => 0.05 s
+cref_csv(3) => 0.05 s
cref_list_of<>(3) => 0.21 s
list_of(3) => 5158.00 s
cref_list_of(10) => 3.80 s
-cref_list_of_csv(10) => 0.04 s
+cref_csv(10) => 0.04 s
cref_list_of<>(10) => 0.50 s
list_of(10) => 16914.79 s
cref_list_of(30) => 11.28 s
-cref_list_of_csv(30) => 9.41 s
+cref_csv(30) => 9.41 s
cref_list_of<>(30) => 1.45 s
list_of(30) => 57972.00 s
cref_list_of(90) => 33.97 s
-cref_list_of_csv(90) => 31.40 s
+cref_csv(90) => 31.40 s
cref_list_of<>(90) => 4.16 s
list_of(90) =>242709.00 s
Modified: sandbox/statistics/detail/assign/libs/assign/example/ref_list_of.cpp
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/example/ref_list_of.cpp (original)
+++ sandbox/statistics/detail/assign/libs/assign/example/ref_list_of.cpp 2010-03-07 12:30:17 EST (Sun, 07 Mar 2010)
@@ -12,8 +12,8 @@
#include <boost/typeof/typeof.hpp>
#include <boost/assign/auto_size/detail/has_static_size.hpp> // temporary
#include <boost/assign/auto_size/ref_list_of.hpp> // temporary
-#include <boost/assign/auto_size/ref_list_of_csv.hpp>
-#include <boost/assign/auto_size/ref_rebind_list_of_csv.hpp>
+#include <boost/assign/auto_size/ref_csv.hpp>
+#include <boost/assign/auto_size/ref_rebind_csv.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/range/algorithm/max_element.hpp>
@@ -54,7 +54,7 @@
{
ints.clear();
- ints = cref_list_of_csv(a,b,3);
+ ints = cref_csv(a,b,3);
BOOST_ASSERT(boost::size(ints) == 3);
BOOST_ASSERT(ints[0] == a);
BOOST_ASSERT(ints[1] == b);
@@ -63,13 +63,13 @@
}
{
array.assign(-1);
- array = cref_list_of_csv(a,b,3);
+ array = cref_csv(a,b,3);
BOOST_ASSERT(array[0] == a);
BOOST_ASSERT(array[1] == b);
BOOST_ASSERT(array[2] == c);
}
{
- BOOST_AUTO(tmp,ref_list_of_csv(a,b,c));
+ BOOST_AUTO(tmp,ref_csv(a,b,c));
tmp.assign(0);
BOOST_ASSERT(a == 0);
BOOST_ASSERT(b == 0);
@@ -77,7 +77,7 @@
}
}
{
- // ref_rebind_list_of_csv
+ // ref_rebind_csv
{
int a=1, b=2, c=3;
@@ -87,7 +87,7 @@
BOOST_AUTO(
max,
*boost::max_element(
- ref_rebind_list_of_csv(a,b,c)
+ ref_rebind_csv(a,b,c)
)
);
max = d;
@@ -96,7 +96,7 @@
}
ints.clear();
- BOOST_AUTO(tmp,cref_rebind_list_of_csv(a,b,c));
+ BOOST_AUTO(tmp,cref_rebind_csv(a,b,c));
{
ints = tmp;
BOOST_ASSERT(ints[0] == a);
Modified: sandbox/statistics/detail/assign/libs/assign/test/speed.cpp
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/test/speed.cpp (original)
+++ sandbox/statistics/detail/assign/libs/assign/test/speed.cpp 2010-03-07 12:30:17 EST (Sun, 07 Mar 2010)
@@ -11,7 +11,7 @@
#include <boost/assign/list_of.hpp>
#include <boost/assign/auto_size/ref_list_of.hpp>
#define BOOST_ASSIGN_CSV_SIZE 160
-#include <boost/assign/auto_size/ref_list_of_csv.hpp>
+#include <boost/assign/auto_size/ref_csv.hpp>
#undef BOOST_ASSIGN_CSV_SIZE
#include <libs/assign/test/speed_common.h>
#include <libs/assign/test/speed.h>
@@ -52,12 +52,12 @@
os << "ERROR\n";
}
}
- os << "cref_list_of_csv(" << N << ") => ";
+ os << "cref_csv(" << N << ") => ";
{
timer_ timer;
for(int i = 0; i < n; ++i)
{
- BOOST_AUTO(rng, boost::assign::cref_list_of_csv(v[0]));
+ BOOST_AUTO(rng, boost::assign::cref_csv(v[0]));
int sz = (int)rng.size();
if(sz != N)
os << "ERROR\n";
@@ -100,12 +100,12 @@
os << "ERROR\n";
}
}
- os << "cref_list_of_csv(" << N << ") => ";
+ os << "cref_csv(" << N << ") => ";
{
timer_ timer;
for(int i = 0; i < n; ++i)
{
- BOOST_AUTO(rng, boost::assign::cref_list_of_csv(v[0],v[1],v[2]));
+ BOOST_AUTO(rng, boost::assign::cref_csv(v[0],v[1],v[2]));
int sz = (int)rng.size();
if(sz != N)
os << "ERROR\n";
@@ -149,12 +149,12 @@
os << "ERROR\n";
}
}
- os << "cref_list_of_csv(" << N << ") => ";
+ os << "cref_csv(" << N << ") => ";
{
timer_ timer;
for(int i = 0; i < n; ++i)
{
- BOOST_AUTO(rng, boost::assign::cref_list_of_csv(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7],v[8],v[9]));
+ BOOST_AUTO(rng, boost::assign::cref_csv(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7],v[8],v[9]));
int sz = (int)rng.size();
if(sz != N)
os << "ERROR\n";
@@ -199,12 +199,12 @@
os << "ERROR\n";
}
}
- os << "cref_list_of_csv(" << N << ") => ";
+ os << "cref_csv(" << N << ") => ";
{
timer_ timer;
for(int i = 0; i < n; ++i)
{
- BOOST_AUTO(rng, boost::assign::cref_list_of_csv(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7],v[8],v[9]
+ BOOST_AUTO(rng, boost::assign::cref_csv(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7],v[8],v[9]
,v[10],v[11],v[12],v[13],v[14],v[15],v[16],v[17],v[18],v[19]
,v[20],v[21],v[22],v[23],v[24],v[25],v[26],v[27],v[28],v[29]));
int sz = (int)rng.size();
@@ -260,12 +260,12 @@
os << "ERROR\n";
}
}
- os << "cref_list_of_csv(" << N << ") => ";
+ os << "cref_csv(" << N << ") => ";
{
timer_ timer;
for(int i = 0; i < n; ++i)
{
- BOOST_AUTO(rng, boost::assign::cref_list_of_csv(
+ BOOST_AUTO(rng, boost::assign::cref_csv(
v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8], v[9]
,v[10],v[11],v[12],v[13],v[14],v[15],v[16],v[17],v[18],v[19]
,v[20],v[21],v[22],v[23],v[24],v[25],v[26],v[27],v[28],v[29]
@@ -346,12 +346,12 @@
os << "ERROR\n";
}
}
- os << "cref_list_of_csv(" << N << ") => ";
+ os << "cref_csv(" << N << ") => ";
{
timer_ timer;
for(int i = 0; i < n; ++i)
{
- BOOST_AUTO(rng, boost::assign::cref_list_of_csv(
+ BOOST_AUTO(rng, boost::assign::cref_csv(
v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8], v[9]
,v[10],v[11],v[12],v[13],v[14],v[15],v[16],v[17],v[18],v[19]
,v[20],v[21],v[22],v[23],v[24],v[25],v[26],v[27],v[28],v[29]
Modified: sandbox/statistics/detail/assign/libs/assign/test/speed2.cpp
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/test/speed2.cpp (original)
+++ sandbox/statistics/detail/assign/libs/assign/test/speed2.cpp 2010-03-07 12:30:17 EST (Sun, 07 Mar 2010)
@@ -12,7 +12,7 @@
#include <boost/assign/auto_size/ref_list_of.hpp>
#define BOOST_ASSIGN_CSV_SIZE 90
-#include <boost/assign/auto_size/ref_list_of_csv.hpp>
+#include <boost/assign/auto_size/ref_csv.hpp>
#undef BOOST_ASSIGN_CSV_SIZE
#include <libs/assign/test/speed_common.h>
@@ -136,12 +136,12 @@
}
os << timer.elapsed() << " s" << std::endl;;
}
- os << "cref_list_of_csv(" << N << ") => ";
+ os << "cref_csv(" << N << ") => ";
{
timer_ timer;
for(int i = 0; i < n; ++i)
{
- BOOST_AUTO(rng, boost::assign::cref_list_of_csv(a00));
+ BOOST_AUTO(rng, boost::assign::cref_csv(a00));
int sz = (int)rng.size();
if(sz != N)
os << "ERROR\n";
@@ -187,12 +187,12 @@
}
os << timer.elapsed() << " s" << std::endl;;
}
- os << "cref_list_of_csv(" << N << ") => ";
+ os << "cref_csv(" << N << ") => ";
{
timer_ timer;
for(int i = 0; i < n; ++i)
{
- BOOST_AUTO(rng, boost::assign::cref_list_of_csv(a00,a01,a02));
+ BOOST_AUTO(rng, boost::assign::cref_csv(a00,a01,a02));
int sz = (int)rng.size();
if(sz != N)
os << "ERROR\n";
@@ -240,12 +240,12 @@
}
os << timer.elapsed() << " s" << std::endl;;
}
- os << "cref_list_of_csv(" << N << ") => ";
+ os << "cref_csv(" << N << ") => ";
{
timer_ timer;
for(int idx = 0; idx < n; ++idx)
{
- BOOST_AUTO(rng, boost::assign::cref_list_of_csv(
+ BOOST_AUTO(rng, boost::assign::cref_csv(
a00,a01,a02,a03,a04
,a05,a06,a07,a08,a09));
int sz = (int)rng.size();
@@ -301,12 +301,12 @@
}
os << timer.elapsed() << " s" << std::endl;;
}
- os << "cref_list_of_csv(" << N << ") => ";
+ os << "cref_csv(" << N << ") => ";
{
timer_ timer;
for(int idx = 0; idx < n; ++idx)
{
- BOOST_AUTO(rng, boost::assign::cref_list_of_csv(
+ BOOST_AUTO(rng, boost::assign::cref_csv(
a00,a01,a02,a03,a04
,a05,a06,a07,a08,a09
,a10,a11,a12,a13,a14
@@ -386,12 +386,12 @@
}
os << timer.elapsed() << " s" << std::endl;;
}
- os << "cref_list_of_csv(" << N << ") => ";
+ os << "cref_csv(" << N << ") => ";
{
timer_ timer;
for(int idx = 0; idx < n; ++idx)
{
- BOOST_AUTO(rng, boost::assign::cref_list_of_csv(
+ BOOST_AUTO(rng, boost::assign::cref_csv(
a00,a01,a02,a03,a04
,a05,a06,a07,a08,a09
,a10,a11,a12,a13,a14
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk