From 5a031ef2ee8d4d3cb35d543f21ed2f2ecbb304f9 Mon Sep 17 00:00:00 2001 From: Kirill Mishchenko Date: Mon, 17 Jul 2017 08:13:30 +0500 Subject: [PATCH] Use double for the validationSize parameter --- src/mlpack/core/cv/simple_cv.hpp | 10 +++++----- src/mlpack/core/cv/simple_cv_impl.hpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/mlpack/core/cv/simple_cv.hpp b/src/mlpack/core/cv/simple_cv.hpp index d69185db39..c8d47c18cc 100644 --- a/src/mlpack/core/cv/simple_cv.hpp +++ b/src/mlpack/core/cv/simple_cv.hpp @@ -53,7 +53,7 @@ class SimpleCV : * constructors for reference). */ template - SimpleCV(const float validationSize, const CVBaseArgs&... args); + SimpleCV(const double validationSize, const CVBaseArgs&... args); /** * Train on the training set and assess performance on the validation set by @@ -101,7 +101,7 @@ class SimpleCV : template::value == 2>::type> - void Init(const float validationSize, const DataArgsTupleT& dataArgsTuple); + void Init(const double validationSize, const DataArgsTupleT& dataArgsTuple); /** * Initialize with weights. @@ -110,17 +110,17 @@ class SimpleCV : typename = typename std::enable_if< std::tuple_size::value == 3>::type, typename = void> - void Init(const float validationSize, const DataArgsTupleT& dataArgsTuple); + void Init(const double validationSize, const DataArgsTupleT& dataArgsTuple); /** * Initialize training and validation sets. */ - void InitTrainingAndValidationSets(const float validationSize); + void InitTrainingAndValidationSets(const double validationSize); /** * Calculate the number of training points and assert it is legitimate. */ - size_t CalculateAndAssertNumberOfTrainingPoints(const float validationSize); + size_t CalculateAndAssertNumberOfTrainingPoints(const double validationSize); /** * Train and run evaluation in the case of non-weighted learning. diff --git a/src/mlpack/core/cv/simple_cv_impl.hpp b/src/mlpack/core/cv/simple_cv_impl.hpp index ca49728740..99cecb23f1 100644 --- a/src/mlpack/core/cv/simple_cv_impl.hpp +++ b/src/mlpack/core/cv/simple_cv_impl.hpp @@ -27,7 +27,7 @@ SimpleCV::SimpleCV(const float validationSize, + WeightsType>::SimpleCV(const double validationSize, const CVBaseArgs&... args) : Base(args...) { @@ -78,7 +78,7 @@ void SimpleCV::Init(const float validationSize, + WeightsType>::Init(const double validationSize, const DataArgsTupleT& dataArgsTuple) { xs = std::get<0>(dataArgsTuple); @@ -101,7 +101,7 @@ void SimpleCV::Init(const float validationSize, + WeightsType>::Init(const double validationSize, const DataArgsTupleT& dataArgsTuple) { xs = std::get<0>(dataArgsTuple); @@ -125,7 +125,7 @@ void SimpleCV::InitTrainingAndValidationSets( - const float validationSize) + const double validationSize) { size_t numberOfTrainingPoints = CalculateAndAssertNumberOfTrainingPoints( validationSize); @@ -147,7 +147,7 @@ size_t SimpleCV::CalculateAndAssertNumberOfTrainingPoints( - const float validationSize) + const double validationSize) { if (validationSize < 0.0F || validationSize > 1.0F) throw std::invalid_argument("SimpleCV: the validationSize parameter should "