apaam/mlpack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3357 from rcurtin/safe-neg-inf

Browse Source 
Try to work around Visual Studio unary unsigned minus bug
This commit is contained in:
Ryan Curtin
2023-01-12 09:37:33 -05:00
committed by GitHub
parent 44a2ce8aa6 45394e01c6
commit ea07515434
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mlpack/core/data/load_numeric_csv.hpp
+26 -4
View File
@@ -14,8 +14,31 @@
#include "load_csv.hpp"
namespace mlpack{
namespace data{
namespace mlpack {
namespace data {
/**
* A safe function to get negative or positive infinity, which avoids unary
* minus on an unsigned type. This works around a Visual Studio warning.
*/
template<typename eT>
inline eT SafeNegInf(
const bool neg,
const typename std::enable_if<std::is_unsigned<eT>::value>::type* = 0)
{
// For an unsigned type, we cannot return negative infinity, so instead return
// 0.
return neg ? 0 : std::numeric_limits<eT>::infinity();
}
template<typename eT>
inline eT SafeNegInf(
const bool neg,
const typename std::enable_if<!std::is_unsigned<eT>::value>::type* = 0)
{
return neg ? -(std::numeric_limits<eT>::infinity()) :
std::numeric_limits<eT>::infinity();
}
template<typename eT>
bool LoadCSV::ConvertToken(eT& val,
@@ -49,8 +72,7 @@ bool LoadCSV::ConvertToken(eT& val,
((sigB == 'n') || (sigB == 'N')) &&
((sigC == 'f') || (sigC == 'F')))
{
val = neg ? -(std::numeric_limits<eT>
::infinity()) : std::numeric_limits<eT>::infinity();
val = SafeNegInf<eT>(neg);
return true;
}
else if (((sigA == 'n') || (sigA == 'N')) &&