Skip to content

Commit 56a8c77

Browse files
valeriy42valeriy42
committed
formatting
1 parent fab3ad9 commit 56a8c77

11 files changed

+153
-108
lines changed

‎include/model/CBucketGatherer.h

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,18 @@ class MODEL_EXPORT CBucketGatherer {
131131
using TMetricCategoryVec = std::vector<model_t::EMetricCategory>;
132132
using TTimeVec = std::vector<core_t::TTime>;
133133
using TTimeVecCItr = TTimeVec::const_iterator;
134-
using TOptionalResourceMonitorCRef = std::optional<std::reference_wrapper<const CResourceMonitor>>;
134+
using TOptionalResourceMonitorCRef =
135+
std::optional<std::reference_wrapper<const CResourceMonitor>>;
135136

136137
struct SBucketGathererInitData {
137138
static SBucketGathererInitData emptyData() {
138-
return {.s_SummaryCountFieldName="", .s_PersonFieldName="", .s_AttributeFieldName="", .s_ValueFieldName="", .s_InfluenceFieldNames={}, .s_StartTime=0, .s_SampleOverrideCount=0};
139+
return {.s_SummaryCountFieldName = "",
140+
.s_PersonFieldName = "",
141+
.s_AttributeFieldName = "",
142+
.s_ValueFieldName = "",
143+
.s_InfluenceFieldNames = {},
144+
.s_StartTime = 0,
145+
.s_SampleOverrideCount = 0};
139146
}
140147
const std::string& s_SummaryCountFieldName;
141148
const std::string& s_PersonFieldName;

‎lib/model/CCountingModelFactory.cc

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,15 @@ CCountingModelFactory::makeModel(const SModelInitializationData& initData,
6161

6262
CDataGatherer*
6363
CCountingModelFactory::makeDataGatherer(const SGathererInitializationData& initData) const {
64-
const CBucketGatherer::SBucketGathererInitData bucketGathererInitData{m_SummaryCountFieldName,
65-
m_PersonFieldName,
66-
EMPTY_STRING,
67-
EMPTY_STRING,
68-
{},
69-
initData.s_StartTime,
70-
0,
71-
this->resourceMonitor()};
64+
const CBucketGatherer::SBucketGathererInitData bucketGathererInitData{
65+
m_SummaryCountFieldName,
66+
m_PersonFieldName,
67+
EMPTY_STRING,
68+
EMPTY_STRING,
69+
{},
70+
initData.s_StartTime,
71+
0,
72+
this->resourceMonitor()};
7273
return new CDataGatherer(model_t::E_EventRate, m_SummaryMode,
7374
this->modelParams(), initData.s_PartitionFieldValue,
7475
this->searchKey(), m_Features, bucketGathererInitData);

‎lib/model/CEventRateModelFactory.cc

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ CEventRateModelFactory::makeDataGatherer(const SGathererInitializationData& init
100100
m_InfluenceFieldNames,
101101
initData.s_StartTime,
102102
initData.s_SampleOverrideCount,
103-
this->resourceMonitor()};
103+
this->resourceMonitor()};
104104
return new CDataGatherer(model_t::E_EventRate, m_SummaryMode,
105105
this->modelParams(), initData.s_PartitionFieldValue,
106106
this->searchKey(), m_Features, bucketGathererInitData);
@@ -110,7 +110,14 @@ CDataGatherer*
110110
CEventRateModelFactory::makeDataGatherer(const std::string& partitionFieldValue,
111111
core::CStateRestoreTraverser& traverser) const {
112112
CBucketGatherer::SBucketGathererInitData bucketGathererInitData{
113-
m_SummaryCountFieldName, m_PersonFieldName, EMPTY_STRING, m_ValueFieldName, m_InfluenceFieldNames, 0, 0, this->resourceMonitor()};
113+
m_SummaryCountFieldName,
114+
m_PersonFieldName,
115+
EMPTY_STRING,
116+
m_ValueFieldName,
117+
m_InfluenceFieldNames,
118+
0,
119+
0,
120+
this->resourceMonitor()};
114121
return new CDataGatherer(model_t::E_EventRate, m_SummaryMode,
115122
this->modelParams(), partitionFieldValue,
116123
this->searchKey(), bucketGathererInitData, traverser);

‎lib/model/CEventRatePopulationModelFactory.cc

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -94,31 +94,31 @@ CEventRatePopulationModelFactory::makeModel(const SModelInitializationData& init
9494
CDataGatherer*
9595
CEventRatePopulationModelFactory::makeDataGatherer(const SGathererInitializationData& initData) const {
9696
CBucketGatherer::SBucketGathererInitData const bucketGathererInitData{
97-
.s_SummaryCountFieldName=m_SummaryCountFieldName,
98-
.s_PersonFieldName=m_PersonFieldName,
99-
.s_AttributeFieldName=m_AttributeFieldName,
100-
.s_ValueFieldName=m_ValueFieldName,
101-
.s_InfluenceFieldNames=m_InfluenceFieldNames,
102-
.s_StartTime=initData.s_StartTime,
103-
.s_SampleOverrideCount=0,
104-
this->resourceMonitor()};
97+
.s_SummaryCountFieldName = m_SummaryCountFieldName,
98+
.s_PersonFieldName = m_PersonFieldName,
99+
.s_AttributeFieldName = m_AttributeFieldName,
100+
.s_ValueFieldName = m_ValueFieldName,
101+
.s_InfluenceFieldNames = m_InfluenceFieldNames,
102+
.s_StartTime = initData.s_StartTime,
103+
.s_SampleOverrideCount = 0,
104+
this->resourceMonitor()};
105105
return new CDataGatherer(model_t::E_PopulationEventRate, m_SummaryMode,
106-
this->modelParams(),
107-
initData.s_PartitionFieldValue,
106+
this->modelParams(), initData.s_PartitionFieldValue,
108107
this->searchKey(), m_Features, bucketGathererInitData);
109108
}
110109

111110
CDataGatherer*
112111
CEventRatePopulationModelFactory::makeDataGatherer(const std::string& partitionFieldValue,
113112
core::CStateRestoreTraverser& traverser) const {
114113
CBucketGatherer::SBucketGathererInitData const bucketGathererInitData{
115-
.s_SummaryCountFieldName=m_SummaryCountFieldName,
116-
.s_PersonFieldName=m_PersonFieldName,
117-
.s_AttributeFieldName=m_AttributeFieldName,
118-
.s_ValueFieldName=m_ValueFieldName,
119-
.s_InfluenceFieldNames=m_InfluenceFieldNames,
120-
.s_StartTime=0,
121-
.s_SampleOverrideCount=0, this->resourceMonitor()};
114+
.s_SummaryCountFieldName = m_SummaryCountFieldName,
115+
.s_PersonFieldName = m_PersonFieldName,
116+
.s_AttributeFieldName = m_AttributeFieldName,
117+
.s_ValueFieldName = m_ValueFieldName,
118+
.s_InfluenceFieldNames = m_InfluenceFieldNames,
119+
.s_StartTime = 0,
120+
.s_SampleOverrideCount = 0,
121+
this->resourceMonitor()};
122122
return new CDataGatherer(model_t::E_PopulationEventRate, m_SummaryMode,
123123
this->modelParams(), partitionFieldValue,
124124
this->searchKey(), bucketGathererInitData, traverser);

‎lib/model/CMetricModelFactory.cc

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ CMetricModelFactory::makeDataGatherer(const SGathererInitializationData& initDat
100100
m_InfluenceFieldNames,
101101
initData.s_StartTime,
102102
initData.s_SampleOverrideCount,
103-
this->resourceMonitor()};
103+
this->resourceMonitor()};
104104
return new CDataGatherer(model_t::E_Metric, m_SummaryMode, this->modelParams(),
105105
initData.s_PartitionFieldValue, this->searchKey(),
106106
m_Features, bucketGathererInitData);
@@ -110,7 +110,14 @@ CDataGatherer*
110110
CMetricModelFactory::makeDataGatherer(const std::string& partitionFieldValue,
111111
core::CStateRestoreTraverser& traverser) const {
112112
CBucketGatherer::SBucketGathererInitData bucketGathererInitData{
113-
m_SummaryCountFieldName, m_PersonFieldName, EMPTY_STRING, m_ValueFieldName, m_InfluenceFieldNames, 0, 0, this->resourceMonitor()};
113+
m_SummaryCountFieldName,
114+
m_PersonFieldName,
115+
EMPTY_STRING,
116+
m_ValueFieldName,
117+
m_InfluenceFieldNames,
118+
0,
119+
0,
120+
this->resourceMonitor()};
114121
return new CDataGatherer(model_t::E_Metric, m_SummaryMode,
115122
this->modelParams(), partitionFieldValue,
116123
this->searchKey(), bucketGathererInitData, traverser);

‎lib/model/CMetricPopulationModelFactory.cc

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ CMetricPopulationModelFactory::makeModel(const SModelInitializationData& initDat
9393
CDataGatherer*
9494
CMetricPopulationModelFactory::makeDataGatherer(const SGathererInitializationData& initData) const {
9595
CBucketGatherer::SBucketGathererInitData bucketGathererInitData{
96-
m_SummaryCountFieldName, m_PersonFieldName,
97-
m_AttributeFieldName, m_ValueFieldName,
98-
m_InfluenceFieldNames, initData.s_StartTime,
99-
initData.s_SampleOverrideCount,this->resourceMonitor()};
96+
m_SummaryCountFieldName, m_PersonFieldName,
97+
m_AttributeFieldName, m_ValueFieldName,
98+
m_InfluenceFieldNames, initData.s_StartTime,
99+
initData.s_SampleOverrideCount, this->resourceMonitor()};
100100
return new CDataGatherer(model_t::E_PopulationMetric, m_SummaryMode,
101101
this->modelParams(), initData.s_PartitionFieldValue,
102102
this->searchKey(), m_Features, bucketGathererInitData);
@@ -106,11 +106,17 @@ CDataGatherer*
106106
CMetricPopulationModelFactory::makeDataGatherer(const std::string& partitionFieldValue,
107107
core::CStateRestoreTraverser& traverser) const {
108108
CBucketGatherer::SBucketGathererInitData bucketGathererInitData{
109-
m_SummaryCountFieldName, m_PersonFieldName, m_AttributeFieldName, m_ValueFieldName,
110-
m_InfluenceFieldNames, 0, 0, this->resourceMonitor()};
109+
m_SummaryCountFieldName,
110+
m_PersonFieldName,
111+
m_AttributeFieldName,
112+
m_ValueFieldName,
113+
m_InfluenceFieldNames,
114+
0,
115+
0,
116+
this->resourceMonitor()};
111117
return new CDataGatherer(model_t::E_PopulationMetric, m_SummaryMode,
112-
this->modelParams(),
113-
partitionFieldValue, this->searchKey(), bucketGathererInitData, traverser);
118+
this->modelParams(), partitionFieldValue,
119+
this->searchKey(), bucketGathererInitData, traverser);
114120
}
115121

116122
CMetricPopulationModelFactory::TPriorPtr

0 commit comments

Comments
 (0)