Subject: [Boost-commit] svn:boost r60951 - in sandbox/statistics/non_parametric/boost/statistics/detail/non_parametric: empirical_distribution kolmogorov_smirnov
From: erwann.rogard_at_[hidden]
Date: 2010-03-30 11:57:09
Author: e_r
Date: 2010-03-30 11:57:09 EDT (Tue, 30 Mar 2010)
New Revision: 60951
URL: http://svn.boost.org/trac/boost/changeset/60951
Log:
m
Text files modified:
sandbox/statistics/non_parametric/boost/statistics/detail/non_parametric/empirical_distribution/frequency.hpp | 10 +++++-----
sandbox/statistics/non_parametric/boost/statistics/detail/non_parametric/empirical_distribution/ordered_sample.hpp | 31 +++++++++++++++----------------
sandbox/statistics/non_parametric/boost/statistics/detail/non_parametric/kolmogorov_smirnov/statistic.hpp | 2 +-
3 files changed, 21 insertions(+), 22 deletions(-)
Modified: sandbox/statistics/non_parametric/boost/statistics/detail/non_parametric/empirical_distribution/frequency.hpp
==============================================================================
--- sandbox/statistics/non_parametric/boost/statistics/detail/non_parametric/empirical_distribution/frequency.hpp (original)
+++ sandbox/statistics/non_parametric/boost/statistics/detail/non_parametric/empirical_distribution/frequency.hpp 2010-03-30 11:57:09 EDT (Tue, 30 Mar 2010)
@@ -67,7 +67,7 @@
size_ n = boost::accumulators::extract_result<tag_n_>( acc );
return static_cast<T1>(i)/static_cast<T1>(n);
}
- };
+ };
}
@@ -95,12 +95,12 @@
template<bool Cum,typename T1,typename AccSet>
struct frequency{
- typedef boost::statistics::detail
+ typedef boost::statistics::detail
::empirical_distribution::tag::frequency<Cum,T1> tag_;
- typedef typename boost::accumulators
+ typedef typename boost::accumulators
::detail::template extractor_result<AccSet,tag_>::type type;
- };
+ };
}
namespace extract
@@ -118,7 +118,7 @@
acc,
(boost::accumulators::sample = x)
);
- }
+ }
}
Modified: sandbox/statistics/non_parametric/boost/statistics/detail/non_parametric/empirical_distribution/ordered_sample.hpp
==============================================================================
--- sandbox/statistics/non_parametric/boost/statistics/detail/non_parametric/empirical_distribution/ordered_sample.hpp (original)
+++ sandbox/statistics/non_parametric/boost/statistics/detail/non_parametric/empirical_distribution/ordered_sample.hpp 2010-03-30 11:57:09 EDT (Tue, 30 Mar 2010)
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// accumulator::statistics::empirical_distribution::ordered_sample.hpp //
+// accumulator::statistics::empirical_distribution::ordered_sample.hpp //
// //
// Copyright 2010 Erwann Rogard. Distributed under the Boost //
// Software License, Version 1.0. (See accompanying file //
@@ -27,13 +27,12 @@
namespace impl{
- // Associates sample values (type T) with their number of occurences in
+ // Associates sample values (type T) with their number of occurences in
// the sample
- template<typename T>
- class ordered_sample
- : public boost::accumulators::accumulator_base{
- typedef std::less<T> comp_;
- typedef std::size_t size_;
+ template<typename T>
+ class ordered_sample : public boost::accumulators::accumulator_base{
+ typedef std::less<T> comp_;
+ typedef std::size_t size_;
typedef boost::accumulators::dont_care dont_care_;
typedef std::map<T,size_,comp_> map_;
@@ -41,24 +40,24 @@
// See accumulator_set for convention naming sample_type
typedef T sample_type;
- typedef size_ size_type;
+ typedef size_ size_type;
- // non-const because map::operator[](key) returns a non-const
- typedef map_& result_type;
+ // non-const because map::operator[](key) returns a non-const
+ typedef map_& result_type;
- ordered_sample(dont_care_){}
+ ordered_sample(dont_care_){}
- template<typename Args>
- void operator()(const Args& args){
+ template<typename Args>
+ void operator()(const Args& args){
++(this->freq[
static_cast<T>(
- args[boost::accumulators::sample]
- )
+ args[boost::accumulators::sample]
+ )
]
);
}
- // Returns the entire distribution, represented by a map
+ // Returns the entire distribution, represented by a map
result_type result(dont_care_)const{
return (this->freq);
}
Modified: sandbox/statistics/non_parametric/boost/statistics/detail/non_parametric/kolmogorov_smirnov/statistic.hpp
==============================================================================
--- sandbox/statistics/non_parametric/boost/statistics/detail/non_parametric/kolmogorov_smirnov/statistic.hpp (original)
+++ sandbox/statistics/non_parametric/boost/statistics/detail/non_parametric/kolmogorov_smirnov/statistic.hpp 2010-03-30 11:57:09 EDT (Tue, 30 Mar 2010)
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// kolmogorov_smirnov::statistic.hpp //
+// kolmogorov_smirnov::statistic.hpp //
// //
// Copyright 2010 Erwann Rogard. Distributed under the Boost //
// Software License, Version 1.0. (See accompanying file //