From 8aeb038dddfa7e58c844ad96afdfa63f83e9aba7 Mon Sep 17 00:00:00 2001
From: "tqchen@graphlab.com" <tqchen@graphlab.com>
Date: Wed, 27 Aug 2014 19:12:13 -0700
Subject: [PATCH] seems ok, need review destructors

---
 Makefile                    | 4 ++--
 wrapper/xgboost_wrapper.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index ed0ce6b22..5a4f70fef 100644
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,9 @@ BIN = xgboost
 OBJ = updater.o gbm.o io.o
 SLIB = wrapper/libxgboostwrapper.so 
 #RLIB = wrapper/libxgboostR.so 
-.PHONY: clean all R python
+.PHONY: clean all R python 
 
-all: $(BIN) $(OBJ)
+all: $(BIN) $(OBJ) $(SLIB)
 #python: wrapper/libxgboostwrapper.so
 #xgboost: src/xgboost_main.cpp src/io/io.cpp src/data.h src/tree/*.h src/tree/*.hpp src/gbm/*.h src/gbm/*.hpp src/utils/*.h src/learner/*.h src/learner/*.hpp 
 
diff --git a/wrapper/xgboost_wrapper.cpp b/wrapper/xgboost_wrapper.cpp
index be19a57a0..a81d3f34c 100644
--- a/wrapper/xgboost_wrapper.cpp
+++ b/wrapper/xgboost_wrapper.cpp
@@ -16,7 +16,7 @@ using namespace xgboost::io;
 namespace xgboost {
 namespace wrapper {
 // booster wrapper class
-class Booster: public learner::BoostLearner<FMatrixS> {
+class Booster: public learner::BoostLearner {
  public:
   explicit Booster(const std::vector<DataMatrix*>& mats) {
     this->silent = 1;
@@ -37,7 +37,7 @@ class Booster: public learner::BoostLearner<FMatrixS> {
     for (bst_omp_uint j = 0; j < ndata; ++j) {
       gpair_[j] = bst_gpair(grad[j], hess[j]);
     }
-    gbm_->DoBoost(train.fmat, train.info.info, &gpair_);
+    gbm_->DoBoost(train.fmat(), train.info.info, &gpair_);
   }
   inline void CheckInitModel(void) {
     if (!init_model) {
@@ -45,7 +45,7 @@ class Booster: public learner::BoostLearner<FMatrixS> {
     }
   }
   inline void LoadModel(const char *fname) {
-    learner::BoostLearner<FMatrixS>::LoadModel(fname);
+    learner::BoostLearner::LoadModel(fname);
     this->init_model = true;
   }
   inline const char** GetModelDump(const utils::FeatMap& fmap, bool with_stats, bst_ulong *len) {
@@ -135,7 +135,7 @@ extern "C"{
     ret.info.info.num_row = len;
     ret.info.info.num_col = src.info.num_col();
 
-    utils::IIterator<RowBatch> *iter = src.fmat.RowIterator();
+    utils::IIterator<RowBatch> *iter = src.fmat()->RowIterator();
     iter->BeforeFirst();
     utils::Assert(iter->Next(), "slice");
     const RowBatch &batch = iter->Value();