From befaff140ab7a986e45c3e4d73ab5ed17eab3e8d Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 5 Sep 2011 15:07:38 +0200 Subject: [PATCH] cmath functions are in namespace std. --- deployment.cpp | 11 ++++++----- loba_bulk.cpp | 4 ++-- main.cpp | 2 +- process.cpp | 2 +- statistics.h | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/deployment.cpp b/deployment.cpp index 264224c..f34c3a9 100644 --- a/deployment.cpp +++ b/deployment.cpp @@ -70,16 +70,17 @@ void deployment_generator::distribute_load() unsigned i; for (i = 0 ; i < hosts.size() - 1; ++i) { if (residue < 0.0) - iload = floor(loads[i]); + iload = std::floor(loads[i]); else if (residue > 0.0) - iload = ceil(loads[i]); + iload = std::ceil(loads[i]); else // residue == 0.0 - iload = round(loads[i]); + iload = std::round(loads[i]); residue += (loads[i] - iload); loads[i] = iload; } // abs(round(...)) to avoid rounding errors, or a value of -0 - iload = abs(round(loads[i] + residue)); // i == hosts.size() - 1 + // Note: i == hosts.size() - 1 + iload = std::abs(std::round(loads[i] + residue)); loads[i] = iload; // final sanity check xbt_assert(opt::auto_depl::load == @@ -181,7 +182,7 @@ void deployment_torus::generate() b = c; } unsigned width = b; - // here width == ceil(sqrt(size)) + // here width == std::ceil(std::sqrt(size)) unsigned first_on_last_line = (size() - 1) - (size() - 1) % width; XBT_DEBUG("torus size = %zu ; width = %u ; height = %zu ; foll = %u", diff --git a/loba_bulk.cpp b/loba_bulk.cpp index 96f3539..de9c099 100644 --- a/loba_bulk.cpp +++ b/loba_bulk.cpp @@ -54,11 +54,11 @@ void loba_bulk::load_balance() if (NbNwMinLoad && myLoad != 0.0) { for (unsigned i = 0; i < NbNeighbours; i++) { if (pneigh[i]->get_load() == minLoad) { - S[i] = floor(alpha * (myLoad - minLoad)); + S[i] = std::floor(alpha * (myLoad - minLoad)); myS += S[i]; } else { if (pneigh[i]->get_load() < myLoad) { - S[i] = floor(alpha * (myLoad - pneigh[i]->get_load())); + S[i] = std::floor(alpha * (myLoad - pneigh[i]->get_load())); myS += S[i]; } } diff --git a/main.cpp b/main.cpp index 71eefb9..478d1e8 100644 --- a/main.cpp +++ b/main.cpp @@ -252,7 +252,7 @@ int main(int argc, char* argv[]) } else if (opt::auto_depl::load < 0.0) opt::auto_depl::load = -opt::auto_depl::load * opt::auto_depl::nhosts; - double iload = trunc(opt::auto_depl::load); + double iload = std::trunc(opt::auto_depl::load); if (opt::integer_transfer && opt::auto_depl::load != iload) { XBT_WARN("Total load %g is not an integer. Truncate it.", opt::auto_depl::load); diff --git a/process.cpp b/process.cpp index 04c08c0..0f7380c 100644 --- a/process.cpp +++ b/process.cpp @@ -37,7 +37,7 @@ process::process(int argc, char* argv[]) if (argc < 2 || !(std::istringstream(argv[1]) >> real_load)) throw std::invalid_argument("bad or missing initial load parameter"); - double iload = trunc(real_load); + double iload = std::trunc(real_load); if (opt::integer_transfer && real_load != iload) { XBT_WARN("Initial load %g is not an integer. Truncate it.", real_load); diff --git a/statistics.h b/statistics.h index 7e3fb2e..28aa913 100644 --- a/statistics.h +++ b/statistics.h @@ -25,7 +25,7 @@ public: double get_sum() const { return sum; } double get_mean() const { return mean; } double get_variance() const { return sqdiff_sum / count; } - double get_stddev() const { return sqrt(get_variance()); } + double get_stddev() const { return std::sqrt(get_variance()); } private: int count; -- 2.39.5