fix merge bugs.

include/LightGBM/tree.h

@@ -409,7 +409,8 @@ inline void Tree::TreeSHAP(const double *feature_values, double *phi,
 
   // internal node
   } else {
-    const int hot_index = Decision(feature_values[split_index], node);
+    const int hot_index = 
+      decision_funs[GetDecisionType(decision_type_[node], kCategoricalMask)](feature_values[split_index], threshold_[node]);
     const int cold_index = (hot_index == left_child_[node] ? right_child_[node] : left_child_[node]);
     const double w = data_count(node);
     const double hot_zero_fraction = data_count(hot_index)/w;

src/io/config.cpp

@@ -239,7 +239,7 @@ void OverallConfig::CheckParamConflict() {
   }
   // Check max_depth and num_leaves
   if (boosting_config.tree_config.max_depth > 0) {
-    int full_num_leaves = std::pow(2, boosting_config.tree_config.max_depth);
+    int full_num_leaves = static_cast<int>(std::pow(2, boosting_config.tree_config.max_depth));
     if (full_num_leaves > boosting_config.tree_config.num_leaves 
         && boosting_config.tree_config.num_leaves == kDefaultNumLeaves) {
       Log::Warning("Accuarcy may be bad since you didn't set num_leaves.");