merge from master

include/LightGBM/c_api.h

@@ -362,10 +362,10 @@ DllExport int LGBM_BoosterGetPredict(BoosterHandle handle,
 * \param data_filename filename of data file
 * \param data_has_header data file has header or not
 * \param predict_type
-*          0:raw score
-*          1:with transform(if needed)
+*          0:normal, with transform (if needed)
+*          1:raw score
 *          2:leaf index
-* \param num_iteration number of iteration for prediction 
+* \param num_iteration number of iteration for prediction, < 0 means no limit
 * \param result_filename filename of result file
 * \return 0 when success, -1 when failure happens
 */
@@ -388,10 +388,10 @@ DllExport int LGBM_BoosterPredictForFile(BoosterHandle handle,
 * \param nelem number of nonzero elements in the matrix
 * \param num_col number of columns; when it's set to 0, then guess from data
 * \param predict_type
-*          0:raw score
-*          1:with transform(if needed)
+*          0:normal, with transform (if needed)
+*          1:raw score
 *          2:leaf index
-* \param num_iteration number of iteration for prediction
+* \param num_iteration number of iteration for prediction, < 0 means no limit
 * \param out_len len of output result
 * \param out_result used to set a pointer to array, should allocate memory before call this function
 * \return 0 when success, -1 when failure happens
@@ -419,10 +419,10 @@ DllExport int LGBM_BoosterPredictForCSR(BoosterHandle handle,
 * \param ncol number columns
 * \param is_row_major 1 for row major, 0 for column major
 * \param predict_type
-*          0:raw score
-*          1:with transform(if needed)
+*          0:normal, with transform (if needed)
+*          1:raw score
 *          2:leaf index
-* \param num_iteration number of iteration for prediction
+* \param num_iteration number of iteration for prediction, < 0 means no limit
 * \param out_len len of output result
 * \param out_result used to set a pointer to array, should allocate memory before call this function
 * \return 0 when success, -1 when failure happens
@@ -441,7 +441,7 @@ DllExport int LGBM_BoosterPredictForMat(BoosterHandle handle,
 /*!
 * \brief save model into file
 * \param handle handle
-* \param num_iteration
+* \param num_iteration, < 0 means no limit
 * \param filename file name
 * \return 0 when success, -1 when failure happens
 */