Merge branch 'master' into rel-0.7

h2oai · Nov 20, 2018 · 3ae4bb3 · 3ae4bb3
2 parents 6c93504 + ed297dc
commit 3ae4bb3
Show file tree

Hide file tree

Showing 16 changed files with 859 additions and 202 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -59,7 +59,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
     extracted).
 - HTML rendering of Frames inside a Jupyter notebook.
 - set-theoretic functions: `union`, `intersect`, `setdiff` and `symdiff`.
+- support for multi-column keys.
 - ability to join Frames on multiple columns.
+- In Jupyter notebook columns now have visual indicators of their types.
+  The logical types are color-coded, and the size of each element is
+  given by the number of dots (#1428).
 
 #### Changed
 - `names` argument in `Frame()` constructor can no longer be a string --

diff --git a/c/datatablemodule.cc b/c/datatablemodule.cc
@@ -13,7 +13,7 @@
 #include "csv/writer.h"
 #include "expr/py_expr.h"
 #include "extras/aggregator.h"
-#include "extras/ftrl.h"
+#include "extras/py_ftrl.h"
 #include "frame/py_frame.h"
 #include "options.h"
 #include "py_column.h"
@@ -199,7 +199,6 @@ void DatatableModule::init_methods() {
   add(METHODv(expr_unaryop));
   add(METHOD0(is_debug_mode));
   add(METHOD0(has_omp_support));
-  init_methods_ftrl();
   init_methods_aggregate();
   init_methods_str();
   init_methods_options();
@@ -234,6 +233,8 @@ PyInit__datatable()
 
   try {
     py::Frame::Type::init(m);
+    py::Ftrl::Type::init(m);
+
   } catch (const std::exception& e) {
     exception_to_python(e);
     return nullptr;

diff --git a/c/datatablemodule.h b/c/datatablemodule.h
@@ -29,7 +29,6 @@ class DatatableModule : public py::ExtModule<DatatableModule> {
 
     void init_methods();
     void init_methods_aggregate();// extra/aggergate.cc
-    void init_methods_ftrl();     // extra/ftrl.cc
     void init_methods_str();      // str/py_str.cc
     void init_methods_options();  // options.cc
     void init_methods_sets();     // set_funcs.cc

diff --git a/c/extras/aggregator.cc b/c/extras/aggregator.cc
@@ -45,9 +45,9 @@ namespace py {
 
        // dt changes in-place with a new column added to the end of it
        DataTable* dt_members = agg.aggregate(dt).release();
-       py::Frame* frame_members = py::Frame::from_datatable(dt_members);
+       py::oobj df_members = py::oobj::from_new_reference(py::Frame::from_datatable(dt_members));
 
-       return frame_members;
+       return df_members;
      }
   );
 }