Merge pull request dmlc#3 from headupinclouds/pr.must.return.value

Rturn value in {GBLinear,GBTree}::DumpModel() even on assert(false)
headupinclouds · Sep 25, 2016 · 831ef30 · 831ef30
2 parents c92ac40 + 1b10312
commit 831ef30
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/gbm/gblinear-inl.hpp b/src/gbm/gblinear-inl.hpp
@@ -181,6 +181,7 @@ class GBLinear : public IGradBooster {
     utils::Error("gblinear does not support predict leaf index");
   }
   virtual std::vector<std::string> DumpModel(const utils::FeatMap& fmap, int option) {
+    std::vector<std::string> v;      
 #if XGBOOST_DO_LEAN
     assert(false);
 #else      
@@ -195,10 +196,9 @@ class GBLinear : public IGradBooster {
         fo << model[i][j] << std::endl;
       }
     }
-    std::vector<std::string> v;
     v.push_back(fo.str());
+#endif    
     return v;
-#endif
   }
 
  protected:

diff --git a/src/gbm/gbtree-inl.hpp b/src/gbm/gbtree-inl.hpp
@@ -258,15 +258,15 @@ class GBTree : public IGradBooster {
 #endif
   }
   virtual std::vector<std::string> DumpModel(const utils::FeatMap& fmap, int option) {
+    std::vector<std::string> dump;
 #if XGBOOST_DO_LEAN
     assert(false);
-#else
-    std::vector<std::string> dump;
+#else    
     for (size_t i = 0; i < trees.size(); i++) {
       dump.push_back(trees[i]->DumpModel(fmap, option&1));
     }
+#endif    
     return dump;
-#endif
   }
 
  protected: