nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

maths: allow differing arg typs in round_up

Browse Source
This commit is contained in:
Danny Robson 2014-08-01 20:44:58 +10:00
parent 51b119f0fc
commit 935b1fe2e9
4 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -79,6 +79,7 @@ UTIL_FILES = \
log.ipp \ log.ipp \
maths.cpp \ maths.cpp \
maths.hpp \ maths.hpp \
maths.ipp \
maths/matrix.cpp \ maths/matrix.cpp \
maths/matrix.hpp \ maths/matrix.hpp \
maths/polynomial.ipp\ maths/polynomial.ipp\

9
maths.cpp
View File

@ -95,15 +95,6 @@ almost_equal (const double &a, const double &b)
{ return ieee_double::almost_equal (a, b); } { return ieee_double::almost_equal (a, b); }
//-----------------------------------------------------------------------------
template <typename T>
typename std::enable_if<std::is_integral<T>::value, T>::type
round_up (T value, T align) {
CHECK_HARD (align > 1);
return (value + align - 1) / align;
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
template <typename T> template <typename T>
T T

9
maths.hpp
View File

@ -40,9 +40,9 @@ double
rootsquare (T a, T b) pure; rootsquare (T a, T b) pure;
template <typename T> template <typename T, typename U>
T typename std::common_type<T, U>::type
round_up (T value, T align) pure; round_up (T value, U align) pure;
template <typename T> template <typename T>
@ -173,4 +173,7 @@ max (const T &a , const T &b , const Args &...args )
template <typename T> template <typename T>
int sign (T val); int sign (T val);
#include "maths.ipp"
#endif // __MATHS_HPP #endif // __MATHS_HPP

36
maths.ipp Normal file
View File

@ -0,0 +1,36 @@
/*
* This file is part of libgim.
*
* libgim is free software: you can redistribute it and/or modify it under the
* terms of the GNU General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later
* version.
*
* libgim is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License
* along with libgim. If not, see <http://www.gnu.org/licenses/>.
*
* Copyright 2014 Danny Robson <danny@nerdcruft.net>
*/
#ifndef __UTIL_MATHS_IPP
#define __UTIL_MATHS_IPP
#else
#error "Include only once"
#endif
#include <type_traits>
//-----------------------------------------------------------------------------
template <typename T, typename U>
typename std::common_type<T,U>::type
round_up (T value, U align) {
static_assert (std::is_integral<T>::value, "round_up requires integral types");
static_assert (std::is_integral<U>::value, "round_up requires integral types");
return divup (value, align) * align;
}