Added back feature names

This commit is contained in:
Johan Manders 2015-11-03 21:26:11 +01:00
parent 96f221e0d0
commit f9e1b2b7b7

View File

@ -139,11 +139,7 @@ def c_array(ctype, values):
def _maybe_from_pandas(data, label, feature_names, feature_types): def _maybe_from_pandas(data, label, feature_names, feature_types):
""" Extract internal data from pd.DataFrame """ Extract internal data from pd.DataFrame """
If data is Pandas DataFrame, feature_names passed through will be ignored and
overwritten by the column names of the Pandas DataFrame.
"""
try: try:
import pandas as pd import pandas as pd
except ImportError: except ImportError:
@ -170,6 +166,7 @@ def _maybe_from_pandas(data, label, feature_names, feature_types):
else: else:
label = label.values.astype('float') label = label.values.astype('float')
if feature_names is None:
feature_names = data.columns.format() feature_names = data.columns.format()
if feature_types is None: if feature_types is None:
@ -216,7 +213,6 @@ class DMatrix(object):
Whether print messages during construction Whether print messages during construction
feature_names : list, optional feature_names : list, optional
Set names for features. Set names for features.
When data is a Pandas DataFrame, feature_names will be ignored.
feature_types : list, optional feature_types : list, optional
Set types for features. Set types for features.
""" """