boost_mirror/histogram
1
0
Fork 0
mirror of https://github.com/boostorg/histogram.git synced 2025-05-10 07:14:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

update copyright notice and renamed axis_iterator

Browse Source
This commit is contained in:
Hans Dembinski 2017-11-28 22:21:03 +01:00
parent f44ed7d709
commit 739625e531
32 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,4 +1,4 @@
# Copyright Hans P. Dembinski 2016-2017 # Copyright Hans Dembinski 2016-2017
# Distributed under the Boost Software License, Version 1.0. # Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) # (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)

2
doc/Jamfile.v2
View File

@ -1,4 +1,4 @@
# Copyright (c) 2016-2017 Klemens D. Morgenstern, Hans P. Dembinski # Copyright (c) 2016-2017 Klemens D. Morgenstern, Hans Dembinski
# #
# Distributed under the Boost Software License, Version 1.0. (See accompanying # Distributed under 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) # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

2
include/boost/histogram.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
include/boost/histogram/arithmetic_operators.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

4
include/boost/histogram/axis/any.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt
@ -93,7 +93,7 @@ public:
using types = typename base_type::types; using types = typename base_type::types;
using value_type = double; using value_type = double;
using bin_type = interval<double>; using bin_type = interval<double>;
using const_iterator = axis_iterator<any>; using const_iterator = iterator_over<any>;
any() = default; any() = default;
any(const any &t) = default; any(const any &t) = default;

12
include/boost/histogram/axis/axis.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt
@ -180,7 +180,7 @@ class regular : public axis_base_uoflow, Transform {
public: public:
using value_type = RealType; using value_type = RealType;
using bin_type = interval<value_type>; using bin_type = interval<value_type>;
using const_iterator = axis_iterator<regular>; using const_iterator = iterator_over<regular>;
/** Construct axis with n bins over real range [lower, upper). /** Construct axis with n bins over real range [lower, upper).
* *
@ -262,7 +262,7 @@ template <typename RealType> class circular : public axis_base {
public: public:
using value_type = RealType; using value_type = RealType;
using bin_type = interval<value_type>; using bin_type = interval<value_type>;
using const_iterator = axis_iterator<circular>; using const_iterator = iterator_over<circular>;
/** Constructor for n bins with an optional offset. /** Constructor for n bins with an optional offset.
* *
@ -326,7 +326,7 @@ template <typename RealType> class variable : public axis_base_uoflow {
public: public:
using value_type = RealType; using value_type = RealType;
using bin_type = interval<value_type>; using bin_type = interval<value_type>;
using const_iterator = axis_iterator<variable>; using const_iterator = iterator_over<variable>;
/** Construct an axis from bin edges. /** Construct an axis from bin edges.
* *
@ -416,7 +416,7 @@ template <typename IntType> class integer : public axis_base_uoflow {
public: public:
using value_type = IntType; using value_type = IntType;
using bin_type = interval<value_type>; using bin_type = interval<value_type>;
using const_iterator = axis_iterator<integer>; using const_iterator = iterator_over<integer>;
/** Construct axis over a semi-open integer interval [lower, upper). /** Construct axis over a semi-open integer interval [lower, upper).
* *
@ -487,7 +487,7 @@ template <typename T> class category : public axis_base {
public: public:
using value_type = T; using value_type = T;
using bin_type = T; using bin_type = T;
using const_iterator = axis_iterator<category<T>>; using const_iterator = iterator_over<category<T>>;
category() = default; category() = default;
category(const category &rhs) category(const category &rhs)

16
include/boost/histogram/axis/iterator.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt
@ -15,25 +15,25 @@ namespace histogram {
namespace axis { namespace axis {
template <typename Axis> template <typename Axis>
class axis_iterator class iterator_over
: public iterator_facade<axis_iterator<Axis>, : public iterator_facade<iterator_over<Axis>,
std::pair<int, typename Axis::bin_type>, std::pair<int, typename Axis::bin_type>,
random_access_traversal_tag, random_access_traversal_tag,
std::pair<int, typename Axis::bin_type>> { std::pair<int, typename Axis::bin_type>> {
public: public:
explicit axis_iterator(const Axis &axis, int idx) : axis_(axis), idx_(idx) {} explicit iterator_over(const Axis &axis, int idx) : axis_(axis), idx_(idx) {}
axis_iterator(const axis_iterator &) = default; iterator_over(const iterator_over &) = default;
axis_iterator &operator=(const axis_iterator &) = default; iterator_over &operator=(const iterator_over &) = default;
private: private:
void increment() noexcept { ++idx_; } void increment() noexcept { ++idx_; }
void decrement() noexcept { --idx_; } void decrement() noexcept { --idx_; }
void advance(int n) noexcept { idx_ += n; } void advance(int n) noexcept { idx_ += n; }
int distance_to(const axis_iterator &other) const noexcept { int distance_to(const iterator_over &other) const noexcept {
return other.idx_ - idx_; return other.idx_ - idx_;
} }
bool equal(const axis_iterator &other) const noexcept { bool equal(const iterator_over &other) const noexcept {
return idx_ == other.idx_; return idx_ == other.idx_;
} }
std::pair<int, typename Axis::bin_type> dereference() const { std::pair<int, typename Axis::bin_type> dereference() const {

2
include/boost/histogram/axis/ostream_operators.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
include/boost/histogram/detail/axis_visitor.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Demsizeki // Copyright 2015-2017 Hans Demsizeki
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
include/boost/histogram/detail/meta.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
include/boost/histogram/detail/utility.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
include/boost/histogram/dynamic_histogram.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
include/boost/histogram/interval.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
include/boost/histogram/ostream_operators.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
include/boost/histogram/serialization.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
include/boost/histogram/storage/adaptive_storage.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
include/boost/histogram/storage/array_storage.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
include/boost/histogram/storage/operators.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
src/python/axis.cpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
src/python/histogram.cpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
src/python/module.cpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
src/python/serialization_suite.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
src/python/utility.hpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
test/adaptive_storage_test.cpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
test/array_storage_test.cpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
test/axis_size.cpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
test/axis_test.cpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
test/detail_test.cpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
test/histogram_test.cpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
test/speed_cpp.cpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
test/speed_gsl.cpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt

2
test/speed_root.cpp
View File

@ -1,4 +1,4 @@
// Copyright 2015-2016 Hans Dembinski // Copyright 2015-2017 Hans Dembinski
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt // (See accompanying file LICENSE_1_0.txt