From 0c36231ea3dd2b292d5bdec483427bf9210b5fcb Mon Sep 17 00:00:00 2001
From: antinucleon <antinucleon@gmail.com>
Date: Wed, 3 Sep 2014 12:57:05 -0600
Subject: [PATCH 1/2] chg

---
 wrapper/xgboost.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/wrapper/xgboost.py b/wrapper/xgboost.py
index 6dadaf613..e09c6da8c 100644
--- a/wrapper/xgboost.py
+++ b/wrapper/xgboost.py
@@ -437,18 +437,18 @@ def mknfold(dall, nfold, param, seed, evals=[], fpreproc = None):
     """
     mk nfold list of cvpack from randidx
     """
-    np.random.seed(seed)    
-    randidx = np.random.permutation(dall.num_rows()) 
+    np.random.seed(seed)
+    randidx = np.random.permutation(dall.num_row())
     kstep = len(randidx) / nfold
     idset = [randidx[ (i*kstep) : min(len(randidx),(i+1)*kstep) ] for i in range(nfold)]
     ret = []
     for k in range(nfold):
         dtrain = dall.slice(np.concatenate([idset[i] for i in range(nfold) if k != i]))
-        dtest = all.slice(idxset[k])
+        dtest = dall.slice(idset[k])
         # run preprocessing on the data set if needed
         if fpreproc is not None:
             dtrain, dtest, tparam = fpreproc(dtrain, dtest, param.copy())
-        plst = tparam.items() + [('eval_metric', itm) for itm in evals]
+        plst = param.items() + [('eval_metric', itm) for itm in evals]
         ret.append(CVPack(dtrain, dtest, plst))
     return ret
 
@@ -483,14 +483,14 @@ def cv(params, dtrain, num_boost_round = 10, nfold=3, eval_metric = [], \
                              num of round to be boosted
             nfold: int
                    folds to do cv
-            evals: list or 
+            evals: list or
                    list of items to be evaluated
             obj:
             feval:
-            fpreproc: preprocessing function that takes dtrain, dtest, 
+            fpreproc: preprocessing function that takes dtrain, dtest,
                       param and return transformed version of dtrain, dtest, param
     """
-    cvfolds = mknfold(dtrain, nfold, params, 0, eval_metrics, fpreproc)
+    cvfolds = mknfold(dtrain, nfold, params, 0, eval_metric, fpreproc)
     for i in range(num_boost_round):
         for f in cvfolds:
             f.update(i, obj)

From 3192bf82d861dd55cef8a2c0e8cd71e104cf90e3 Mon Sep 17 00:00:00 2001
From: Tianqi Chen <tqchen@users.noreply.github.com>
Date: Wed, 3 Sep 2014 12:15:57 -0700
Subject: [PATCH 2/2] Update xgboost.py

---
 wrapper/xgboost.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wrapper/xgboost.py b/wrapper/xgboost.py
index e09c6da8c..5b4eee6b8 100644
--- a/wrapper/xgboost.py
+++ b/wrapper/xgboost.py
@@ -448,7 +448,7 @@ def mknfold(dall, nfold, param, seed, evals=[], fpreproc = None):
         # run preprocessing on the data set if needed
         if fpreproc is not None:
             dtrain, dtest, tparam = fpreproc(dtrain, dtest, param.copy())
-        plst = param.items() + [('eval_metric', itm) for itm in evals]
+        plst = tparam.items() + [('eval_metric', itm) for itm in evals]
         ret.append(CVPack(dtrain, dtest, plst))
     return ret