Skip to content

Commit 74eb66c

Browse files
taehyounparktaehyounpark
committed
Format
1 parent 7dda2d2 commit 74eb66c

File tree

2 files changed

+58
-24
lines changed

2 files changed

+58
-24
lines changed

‎include/queryosity/dataflow.h

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -245,13 +245,13 @@ class dataflow {
245245
auto
246246
vary(column::expression<Fn> const &expr,
247247
std::map<std::string,
248-
typename column::expression<Fn>::function_type> const &vars) ->
249-
varied<todo<column::evaluator<column::equation_t<Fn>>>>;
248+
typename column::expression<Fn>::function_type> const &vars)
249+
-> varied<todo<column::evaluator<column::equation_t<Fn>>>>;
250250

251251
template <typename Def>
252252
auto vary(column::definition<Def> const &defn,
253-
std::map<std::string, column::definition<Def>> const &vars) ->
254-
varied<todo<column::evaluator<Def>>>;
253+
std::map<std::string, column::definition<Def>> const &vars)
254+
-> varied<todo<column::evaluator<Def>>>;
255255

256256
/* "public" API for Python layer */
257257

@@ -262,6 +262,12 @@ class dataflow {
262262
template <typename Val>
263263
auto _assign(Val const &val) -> lazy<column::valued<Val>>;
264264

265+
template <typename Col>
266+
auto _cut(lazy<Col> const &column) -> lazy<selection::node>;
267+
268+
template <typename Lzy>
269+
auto _cut(varied<Lzy> const &column) -> varied<lazy<selection::node>>;
270+
265271
template <typename Def, typename... Args> auto _define(Args &&...args);
266272
template <typename Def>
267273
auto _define(column::definition<Def> const &defn)
@@ -488,7 +494,8 @@ auto queryosity::dataflow::weight(lazy<Col> const &col)
488494
return this->_apply<selection::weight>(col);
489495
}
490496

491-
template <typename Lzy> auto queryosity::dataflow::filter(varied<Lzy> const &col) {
497+
template <typename Lzy>
498+
auto queryosity::dataflow::filter(varied<Lzy> const &col) {
492499
using varied_type = varied<lazy<selection::node>>;
493500
varied_type syst(this->filter(col.nominal()));
494501
for (auto const &var_name : col.get_variation_names()) {
@@ -497,7 +504,8 @@ template <typename Lzy> auto queryosity::dataflow::filter(varied<Lzy> const &col
497504
return syst;
498505
}
499506

500-
template <typename Lzy> auto queryosity::dataflow::weight(varied<Lzy> const &col) {
507+
template <typename Lzy>
508+
auto queryosity::dataflow::weight(varied<Lzy> const &col) {
501509
using varied_type = varied<lazy<selection::node>>;
502510
varied_type syst(this->weight(col.nominal()));
503511
for (auto const &var_name : col.get_variation_names()) {
@@ -615,8 +623,8 @@ inline void queryosity::dataflow::reset() { m_analyzed = false; }
615623

616624
template <typename Val>
617625
auto queryosity::dataflow::vary(column::constant<Val> const &cnst,
618-
std::map<std::string, Val> vars) ->
619-
varied<lazy<column::valued<Val>>> {
626+
std::map<std::string, Val> vars)
627+
-> varied<lazy<column::valued<Val>>> {
620628
auto nom = this->define(cnst);
621629
using varied_type = varied<lazy<column::valued<Val>>>;
622630
varied_type syst(std::move(nom));
@@ -630,8 +638,7 @@ template <typename Fn>
630638
auto queryosity::dataflow::vary(
631639
column::expression<Fn> const &expr,
632640
std::map<std::string, typename column::expression<Fn>::function_type> const
633-
&vars) ->
634-
varied<todo<column::evaluator<column::equation_t<Fn>>>> {
641+
&vars) -> varied<todo<column::evaluator<column::equation_t<Fn>>>> {
635642
auto nom = this->_equate(expr);
636643
using varied_type = varied<decltype(nom)>;
637644
using function_type = typename column::expression<Fn>::function_type;
@@ -645,8 +652,8 @@ auto queryosity::dataflow::vary(
645652
template <typename Def>
646653
auto queryosity::dataflow::vary(
647654
column::definition<Def> const &defn,
648-
std::map<std::string, column::definition<Def>> const &vars) ->
649-
varied<todo<column::evaluator<Def>>> {
655+
std::map<std::string, column::definition<Def>> const &vars)
656+
-> varied<todo<column::evaluator<Def>>> {
650657
auto nom = this->_define(defn);
651658
using varied_type = varied<decltype(nom)>;
652659
varied_type syst(std::move(nom));
@@ -675,6 +682,16 @@ auto queryosity::dataflow::_assign(Val const &val)
675682
return lzy;
676683
}
677684

685+
template <typename Col>
686+
auto queryosity::dataflow::_cut(lazy<Col> const &col) -> lazy<selection::node> {
687+
return this->filter(col);
688+
}
689+
690+
template <typename Lzy>
691+
auto queryosity::dataflow::_cut(varied<Lzy> const &col) -> varied<lazy<selection::node>> {
692+
return this->filter(col);
693+
}
694+
678695
template <typename To, typename Col>
679696
auto queryosity::dataflow::_convert(lazy<Col> const &col)
680697
-> lazy<column::conversion<To, column::value_t<Col>>> {

‎queryosity.h

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2316,13 +2316,13 @@ class dataflow {
23162316
auto
23172317
vary(column::expression<Fn> const &expr,
23182318
std::map<std::string,
2319-
typename column::expression<Fn>::function_type> const &vars) ->
2320-
varied<todo<column::evaluator<column::equation_t<Fn>>>>;
2319+
typename column::expression<Fn>::function_type> const &vars)
2320+
-> varied<todo<column::evaluator<column::equation_t<Fn>>>>;
23212321

23222322
template <typename Def>
23232323
auto vary(column::definition<Def> const &defn,
2324-
std::map<std::string, column::definition<Def>> const &vars) ->
2325-
varied<todo<column::evaluator<Def>>>;
2324+
std::map<std::string, column::definition<Def>> const &vars)
2325+
-> varied<todo<column::evaluator<Def>>>;
23262326

23272327
/* "public" API for Python layer */
23282328

@@ -2333,6 +2333,12 @@ class dataflow {
23332333
template <typename Val>
23342334
auto _assign(Val const &val) -> lazy<column::valued<Val>>;
23352335

2336+
template <typename Col>
2337+
auto _cut(lazy<Col> const &column) -> lazy<selection::node>;
2338+
2339+
template <typename Lzy>
2340+
auto _cut(varied<Lzy> const &column) -> varied<lazy<selection::node>>;
2341+
23362342
template <typename Def, typename... Args> auto _define(Args &&...args);
23372343
template <typename Def>
23382344
auto _define(column::definition<Def> const &defn)
@@ -4148,7 +4154,8 @@ auto queryosity::dataflow::weight(lazy<Col> const &col)
41484154
return this->_apply<selection::weight>(col);
41494155
}
41504156

4151-
template <typename Lzy> auto queryosity::dataflow::filter(varied<Lzy> const &col) {
4157+
template <typename Lzy>
4158+
auto queryosity::dataflow::filter(varied<Lzy> const &col) {
41524159
using varied_type = varied<lazy<selection::node>>;
41534160
varied_type syst(this->filter(col.nominal()));
41544161
for (auto const &var_name : col.get_variation_names()) {
@@ -4157,7 +4164,8 @@ template <typename Lzy> auto queryosity::dataflow::filter(varied<Lzy> const &col
41574164
return syst;
41584165
}
41594166

4160-
template <typename Lzy> auto queryosity::dataflow::weight(varied<Lzy> const &col) {
4167+
template <typename Lzy>
4168+
auto queryosity::dataflow::weight(varied<Lzy> const &col) {
41614169
using varied_type = varied<lazy<selection::node>>;
41624170
varied_type syst(this->weight(col.nominal()));
41634171
for (auto const &var_name : col.get_variation_names()) {
@@ -4275,8 +4283,8 @@ inline void queryosity::dataflow::reset() { m_analyzed = false; }
42754283

42764284
template <typename Val>
42774285
auto queryosity::dataflow::vary(column::constant<Val> const &cnst,
4278-
std::map<std::string, Val> vars) ->
4279-
varied<lazy<column::valued<Val>>> {
4286+
std::map<std::string, Val> vars)
4287+
-> varied<lazy<column::valued<Val>>> {
42804288
auto nom = this->define(cnst);
42814289
using varied_type = varied<lazy<column::valued<Val>>>;
42824290
varied_type syst(std::move(nom));
@@ -4290,8 +4298,7 @@ template <typename Fn>
42904298
auto queryosity::dataflow::vary(
42914299
column::expression<Fn> const &expr,
42924300
std::map<std::string, typename column::expression<Fn>::function_type> const
4293-
&vars) ->
4294-
varied<todo<column::evaluator<column::equation_t<Fn>>>> {
4301+
&vars) -> varied<todo<column::evaluator<column::equation_t<Fn>>>> {
42954302
auto nom = this->_equate(expr);
42964303
using varied_type = varied<decltype(nom)>;
42974304
using function_type = typename column::expression<Fn>::function_type;
@@ -4305,8 +4312,8 @@ auto queryosity::dataflow::vary(
43054312
template <typename Def>
43064313
auto queryosity::dataflow::vary(
43074314
column::definition<Def> const &defn,
4308-
std::map<std::string, column::definition<Def>> const &vars) ->
4309-
varied<todo<column::evaluator<Def>>> {
4315+
std::map<std::string, column::definition<Def>> const &vars)
4316+
-> varied<todo<column::evaluator<Def>>> {
43104317
auto nom = this->_define(defn);
43114318
using varied_type = varied<decltype(nom)>;
43124319
varied_type syst(std::move(nom));
@@ -4335,6 +4342,16 @@ auto queryosity::dataflow::_assign(Val const &val)
43354342
return lzy;
43364343
}
43374344

4345+
template <typename Col>
4346+
auto queryosity::dataflow::_cut(lazy<Col> const &col) -> lazy<selection::node> {
4347+
return this->filter(col);
4348+
}
4349+
4350+
template <typename Lzy>
4351+
auto queryosity::dataflow::_cut(varied<Lzy> const &col) -> varied<lazy<selection::node>> {
4352+
return this->filter(col);
4353+
}
4354+
43384355
template <typename To, typename Col>
43394356
auto queryosity::dataflow::_convert(lazy<Col> const &col)
43404357
-> lazy<column::conversion<To, column::value_t<Col>>> {

0 commit comments

Comments
 (0)