Separating

Author: taehyounpark

examples/example-hello_world.cxx

@@ -30,9 +30,8 @@ int main() {
   auto sel =
       df.weight(w)
           .filter(column::expression(
-                      [](std::vector<double> const &v) { return v.size(); }),
-                  v)
-          .filter(column::expression([](double x) { return x > 100.0; }), x);
+              [](std::vector<double> const &v) { return v.size(); }))(v)
+          .filter(column::expression([](double x) { return x > 100.0; }))(x);
 
   auto h_x0_w = df.make(query::plan<h1d>(linax(20, 0.0, 200.0)))
                     .fill(v0)

include/queryosity/column_computation.h

@@ -37,7 +37,7 @@ class computation {
       evaluator<equation<std::decay_t<Ret>(std::decay_t<Args>...)>>>;
 
   template <typename Def, typename... Cols>
-  auto evaluate(evaluator<Def> &calc, Cols const &...cols) -> Def *;
+  auto evaluate(evaluator<Def> const&calc, Cols const &...cols) -> Def *;
 
 protected:
   template <typename Col> auto add_column(std::unique_ptr<Col> col) -> Col *;
@@ -95,9 +95,9 @@ auto queryosity::column::computation::equate(std::function<Ret(Args...)> fn)
 }
 
 template <typename Def, typename... Cols>
-auto queryosity::column::computation::evaluate(evaluator<Def> &calc,
+auto queryosity::column::computation::evaluate(evaluator<Def> const &calc,
                                                Cols const &...cols) -> Def * {
-  auto defn = calc._evaluate(cols...);
+  auto defn = calc.evaluate(cols...);
   return this->add_column(std::move(defn));
 }
 

include/queryosity/column_evaluator.h

@@ -18,28 +18,26 @@ template <typename T> class column::evaluator {
   ~evaluator() = default;
 
   template <typename... Vals>
-  std::unique_ptr<T> _evaluate(view<Vals> const &...cols) const;
+  std::unique_ptr<T> evaluate(view<Vals> const &...cols) const;
 
 protected:
-  std::function<std::unique_ptr<T>()> m_make_unique;
+  std::function<std::unique_ptr<T>()> m_make_unique_column;
 };
 
 } // namespace queryosity
 
 template <typename T>
 template <typename... Args>
 queryosity::column::evaluator<T>::evaluator(Args const &...args)
-    : m_make_unique(std::bind(
+    : m_make_unique_column(std::bind(
           [](Args const &...args) { return std::make_unique<T>(args...); },
           args...)) {}
 
 template <typename T>
 template <typename... Vals>
-std::unique_ptr<T> queryosity::column::evaluator<T>::_evaluate(
+std::unique_ptr<T> queryosity::column::evaluator<T>::evaluate(
     view<Vals> const &...columns) const {
-  auto defn = m_make_unique();
-
+  auto defn = m_make_unique_column();
   defn->set_arguments(columns...);
-
   return defn;
 }