clang-formatted code

This commit is contained in:
Hans Dembinski
2017-03-25 17:20:37 +01:00
parent df605e27bd
commit e2426fbdef
29 changed files with 3291 additions and 3503 deletions

View File

@@ -6,13 +6,13 @@
#include <boost/histogram/axis.hpp>
#include <boost/histogram/axis_ostream_operators.hpp>
#include <boost/python.hpp>
#include <boost/python/raw_function.hpp>
#include <boost/python/def_visitor.hpp>
#include <boost/math/constants/constants.hpp>
#include <type_traits>
#include <boost/python.hpp>
#include <boost/python/def_visitor.hpp>
#include <boost/python/raw_function.hpp>
#include <sstream>
#include <string>
#include <type_traits>
#include <vector>
namespace boost {
@@ -20,200 +20,184 @@ namespace histogram {
namespace {
python::object
variable_axis_init(python::tuple args, python::dict kwargs) {
using namespace python;
python::object variable_axis_init(python::tuple args, python::dict kwargs) {
using namespace python;
object self = args[0];
object self = args[0];
if (len(args) < 2) {
PyErr_SetString(PyExc_TypeError, "require at least two arguments");
throw_error_already_set();
if (len(args) < 2) {
PyErr_SetString(PyExc_TypeError, "require at least two arguments");
throw_error_already_set();
}
std::vector<double> v;
for (int i = 1, n = len(args); i < n; ++i) {
v.push_back(extract<double>(args[i]));
}
std::string label;
bool uoflow = true;
while (len(kwargs) > 0) {
python::tuple kv = kwargs.popitem();
std::string k = extract<std::string>(kv[0]);
object v = kv[1];
if (k == "label")
label = extract<std::string>(v);
else if (k == "uoflow")
uoflow = extract<bool>(v);
else {
std::stringstream s;
s << "keyword " << k << " not recognized";
PyErr_SetString(PyExc_KeyError, s.str().c_str());
throw_error_already_set();
}
}
std::vector<double> v;
for (int i = 1, n = len(args); i < n; ++i) {
v.push_back(extract<double>(args[i]));
}
std::string label;
bool uoflow = true;
while (len(kwargs) > 0) {
python::tuple kv = kwargs.popitem();
std::string k = extract<std::string>(kv[0]);
object v = kv[1];
if (k == "label")
label = extract<std::string>(v);
else if (k == "uoflow")
uoflow = extract<bool>(v);
else {
std::stringstream s;
s << "keyword " << k << " not recognized";
PyErr_SetString(PyExc_KeyError, s.str().c_str());
throw_error_already_set();
}
}
return self.attr("__init__")(variable_axis<>(v.begin(), v.end(), label, uoflow));
return self.attr("__init__")(
variable_axis<>(v.begin(), v.end(), label, uoflow));
}
python::object
category_axis_init(python::tuple args, python::dict kwargs) {
using namespace python;
python::object category_axis_init(python::tuple args, python::dict kwargs) {
using namespace python;
object self = args[0];
object self = args[0];
if (len(args) == 1) {
PyErr_SetString(PyExc_TypeError, "require at least one argument");
throw_error_already_set();
if (len(args) == 1) {
PyErr_SetString(PyExc_TypeError, "require at least one argument");
throw_error_already_set();
}
std::string label;
while (len(kwargs) > 0) {
python::tuple kv = kwargs.popitem();
std::string k = extract<std::string>(kv[0]);
object v = kv[1];
if (k == "label")
label = extract<std::string>(v);
else {
std::stringstream s;
s << "keyword " << k << " not recognized";
PyErr_SetString(PyExc_KeyError, s.str().c_str());
throw_error_already_set();
}
}
std::string label;
while (len(kwargs) > 0) {
python::tuple kv = kwargs.popitem();
std::string k = extract<std::string>(kv[0]);
object v = kv[1];
if (k == "label")
label = extract<std::string>(v);
else {
std::stringstream s;
s << "keyword " << k << " not recognized";
PyErr_SetString(PyExc_KeyError, s.str().c_str());
throw_error_already_set();
}
}
std::vector<std::string> c;
for (int i = 1, n = len(args); i < n; ++i)
c.push_back(extract<std::string>(args[i]));
std::vector<std::string> c;
for (int i = 1, n = len(args); i < n; ++i)
c.push_back(extract<std::string>(args[i]));
return self.attr("__init__")(category_axis(c.begin(), c.end(), label));
return self.attr("__init__")(category_axis(c.begin(), c.end(), label));
}
template <typename T>
int
axis_len(const T& t) {
return t.bins() + int(std::is_floating_point<typename T::value_type>::value);
template <typename T> int axis_len(const T &t) {
return t.bins() + int(std::is_floating_point<typename T::value_type>::value);
}
template <typename T>
python::object
axis_getitem(const T& t, int i) {
if (i == axis_len(t)) {
PyErr_SetString(PyExc_StopIteration, "no more");
python::throw_error_already_set();
}
return python::object(t[i]);
template <typename T> python::object axis_getitem(const T &t, int i) {
if (i == axis_len(t)) {
PyErr_SetString(PyExc_StopIteration, "no more");
python::throw_error_already_set();
}
return python::object(t[i]);
}
template <typename T>
std::string
axis_repr(const T& t) {
std::ostringstream os;
os << t;
return os.str();
template <typename T> std::string axis_repr(const T &t) {
std::ostringstream os;
os << t;
return os.str();
}
template <class T>
struct axis_suite : public python::def_visitor<axis_suite<T> > {
template <class Class>
static void
visit(Class& cl)
{
cl.add_property("bins", &T::bins, "Number of bins.");
cl.add_property("shape", &T::shape, "Number of bins, including possible over- and underflow bins.");
cl.add_property("label",
make_function((const std::string&(T::*)() const) &T::label,
python::return_value_policy<python::copy_const_reference>()),
(void(T::*)(const std::string&)) &T::label,
"Name or description for the axis.");
cl.def("index", &T::index,
":param float x: value"
"\n:returns: bin index for the passed value",
python::args("self", "x"));
cl.def("__len__", axis_len<T>,
":returns: number of bins for this axis",
python::arg("self"));
cl.def("__getitem__", axis_getitem<T>,
is_same<T, integer_axis>::value ?
":returns: integer mapped to passed bin index" :
is_same<T, category_axis>::value ?
":returns: category mapped to passed bin index" :
":returns: low edge of the bin",
python::args("self", "index"));
cl.def("__repr__", axis_repr<T>,
":returns: string representation of this axis",
python::arg("self"));
cl.def(python::self == python::self);
}
struct axis_suite : public python::def_visitor<axis_suite<T>> {
template <class Class> static void visit(Class &cl) {
cl.add_property("bins", &T::bins, "Number of bins.");
cl.add_property(
"shape", &T::shape,
"Number of bins, including possible over- and underflow bins.");
cl.add_property(
"label",
make_function(
(const std::string &(T::*)() const) & T::label,
python::return_value_policy<python::copy_const_reference>()),
(void (T::*)(const std::string &)) & T::label,
"Name or description for the axis.");
cl.def("index", &T::index, ":param float x: value"
"\n:returns: bin index for the passed value",
python::args("self", "x"));
cl.def("__len__", axis_len<T>, ":returns: number of bins for this axis",
python::arg("self"));
cl.def("__getitem__", axis_getitem<T>,
is_same<T, integer_axis>::value
? ":returns: integer mapped to passed bin index"
: is_same<T, category_axis>::value
? ":returns: category mapped to passed bin index"
: ":returns: low edge of the bin",
python::args("self", "index"));
cl.def("__repr__", axis_repr<T>,
":returns: string representation of this axis", python::arg("self"));
cl.def(python::self == python::self);
}
};
} // namespace
void register_axis_types()
{
void register_axis_types() {
using namespace python;
using python::arg;
docstring_options dopt(true, true, false);
class_<regular_axis<>>("regular_axis",
"An axis for real-valued data and bins of equal width."
"\nBinning is a O(1) operation.",
no_init)
.def(init<unsigned, double, double, const std::string&, bool>(
(arg("self"), arg("bin"), arg("min"), arg("max"),
arg("label") = std::string(),
arg("uoflow") = true)))
.def(axis_suite<regular_axis<>>())
;
"An axis for real-valued data and bins of equal width."
"\nBinning is a O(1) operation.",
no_init)
.def(init<unsigned, double, double, const std::string &, bool>(
(arg("self"), arg("bin"), arg("min"), arg("max"),
arg("label") = std::string(), arg("uoflow") = true)))
.def(axis_suite<regular_axis<>>());
class_<circular_axis<>>("circular_axis",
"An axis for real-valued angles."
"\nThere are no overflow/underflow bins for this axis,"
"\nsince the axis is circular and wraps around after reaching"
"\nthe perimeter value. Binning is a O(1) operation.",
no_init)
.def(init<unsigned, double, double, const std::string&>(
(arg("self"), arg("bin"), arg("phase") = 0.0,
arg("perimeter") = math::double_constants::two_pi,
arg("label") = std::string())))
.def(axis_suite<circular_axis<>>())
;
class_<circular_axis<>>(
"circular_axis",
"An axis for real-valued angles."
"\nThere are no overflow/underflow bins for this axis,"
"\nsince the axis is circular and wraps around after reaching"
"\nthe perimeter value. Binning is a O(1) operation.",
no_init)
.def(init<unsigned, double, double, const std::string &>(
(arg("self"), arg("bin"), arg("phase") = 0.0,
arg("perimeter") = math::double_constants::two_pi,
arg("label") = std::string())))
.def(axis_suite<circular_axis<>>());
class_<variable_axis<>>("variable_axis",
"An axis for real-valued data and bins of varying width."
"\nBinning is a O(log(N)) operation. If speed matters and"
"\nthe problem domain allows it, prefer a regular_axis<>.",
no_init)
.def("__init__", raw_function(variable_axis_init))
.def(init<const variable_axis<>&>())
.def(axis_suite<variable_axis<>>())
;
class_<variable_axis<>>(
"variable_axis",
"An axis for real-valued data and bins of varying width."
"\nBinning is a O(log(N)) operation. If speed matters and"
"\nthe problem domain allows it, prefer a regular_axis<>.",
no_init)
.def("__init__", raw_function(variable_axis_init))
.def(init<const variable_axis<> &>())
.def(axis_suite<variable_axis<>>());
class_<integer_axis>("integer_axis",
"An axis for a contiguous range of integers."
"\nThere are no underflow/overflow bins for this axis."
"\nBinning is a O(1) operation.",
no_init)
.def(init<int, int, const std::string&, bool>(
(arg("self"), arg("min"), arg("max"),
arg("label") = std::string(),
arg("uoflow") = true)))
.def(axis_suite<integer_axis>())
;
"An axis for a contiguous range of integers."
"\nThere are no underflow/overflow bins for this axis."
"\nBinning is a O(1) operation.",
no_init)
.def(init<int, int, const std::string &, bool>(
(arg("self"), arg("min"), arg("max"), arg("label") = std::string(),
arg("uoflow") = true)))
.def(axis_suite<integer_axis>());
class_<category_axis>("category_axis",
"An axis for enumerated categories. The axis stores the"
"\ncategory labels, and expects that they are addressed"
"\nusing an integer from 0 to n-1. There are no"
"\nunderflow/overflow bins for this axis."
"\nBinning is a O(1) operation.",
no_init)
.def("__init__", raw_function(category_axis_init))
.def(init<const category_axis&>())
.def(axis_suite<category_axis>())
;
}
"An axis for enumerated categories. The axis stores the"
"\ncategory labels, and expects that they are addressed"
"\nusing an integer from 0 to n-1. There are no"
"\nunderflow/overflow bins for this axis."
"\nBinning is a O(1) operation.",
no_init)
.def("__init__", raw_function(category_axis_init))
.def(init<const category_axis &>())
.def(axis_suite<category_axis>());
}
}
}