File tree Expand file tree Collapse file tree 3 files changed +9
-8
lines changed Expand file tree Collapse file tree 3 files changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -22,29 +22,29 @@ class TBuffer;
22
22
23
23
namespace ROOT {
24
24
namespace Experimental {
25
+
26
+ // / Variant of all supported axis types.
27
+ using RAxisVariant = std::variant<RRegularAxis, RVariableBinAxis>;
28
+
25
29
namespace Internal {
26
30
27
31
/* *
28
32
Bin configurations for all dimensions of a histogram.
29
33
*/
30
34
class RAxes final {
31
- public:
32
- using AxisVariant = std::variant<RRegularAxis, RVariableBinAxis>;
33
-
34
- private:
35
- std::vector<AxisVariant> fAxes ;
35
+ std::vector<RAxisVariant> fAxes ;
36
36
37
37
public:
38
38
// / \param[in] axes the axis objects, must have size > 0
39
- explicit RAxes (std::vector<AxisVariant > axes) : fAxes(std::move(axes))
39
+ explicit RAxes (std::vector<RAxisVariant > axes) : fAxes(std::move(axes))
40
40
{
41
41
if (fAxes .empty ()) {
42
42
throw std::invalid_argument (" must have at least 1 axis object" );
43
43
}
44
44
}
45
45
46
46
std::size_t GetNDimensions () const { return fAxes .size (); }
47
- const std::vector<AxisVariant > &Get () const { return fAxes ; }
47
+ const std::vector<RAxisVariant > &Get () const { return fAxes ; }
48
48
49
49
friend bool operator ==(const RAxes &lhs, const RAxes &rhs) { return lhs.fAxes == rhs.fAxes ; }
50
50
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ TEST(RAxes, Constructor)
27
27
EXPECT_TRUE (std::get_if<RRegularAxis>(&v[0 ]) != nullptr );
28
28
EXPECT_TRUE (std::get_if<RVariableBinAxis>(&v[1 ]) != nullptr );
29
29
30
- std::vector<RAxes::AxisVariant > newAxes{variableBinAxis, regularAxis};
30
+ std::vector<RAxisVariant > newAxes{variableBinAxis, regularAxis};
31
31
axes = RAxes (newAxes);
32
32
EXPECT_EQ (axes.GetNDimensions (), 2 );
33
33
Original file line number Diff line number Diff line change 9
9
10
10
#include " gtest/gtest.h"
11
11
12
+ using ROOT::Experimental::RAxisVariant;
12
13
using ROOT::Experimental::RBinIndex;
13
14
using ROOT::Experimental::RBinIndexRange;
14
15
using ROOT::Experimental::RRegularAxis;
You can’t perform that action at this time.
0 commit comments