A
lgorithmique
N
umérique
D
istribuée
Private GIT Repository
projects
/
loba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Print {min,max} times of convergence on a single line.
[loba.git]
/
deployment.cpp
diff --git
a/deployment.cpp
b/deployment.cpp
index 264224cb0cea2f83d4ab8ab831f217ae626f5831..bbb47e5392a1b55d58d5bb16e1e4a31e9b9df2cd 100644
(file)
--- a/
deployment.cpp
+++ b/
deployment.cpp
@@
-57,9
+57,13
@@
void deployment_generator::distribute_load()
set_load(0, opt::auto_depl::load);
return;
}
set_load(0, opt::auto_depl::load);
return;
}
- srand48(opt::auto_depl::random_seed);
std::vector<double> loads(hosts.size());
std::vector<double> loads(hosts.size());
- std::generate(loads.begin(), loads.end(), drand48);
+ if (opt::auto_depl::random_seed != 1) {
+ srand48(opt::auto_depl::random_seed);
+ std::generate(loads.begin(), loads.end(), drand48);
+ } else {
+ std::fill(loads.begin(), loads.end(), 1.0);
+ }
double factor = opt::auto_depl::load /
std::accumulate(loads.begin(), loads.end(), 0.0);
std::transform(loads.begin(), loads.end(), loads.begin(),
double factor = opt::auto_depl::load /
std::accumulate(loads.begin(), loads.end(), 0.0);
std::transform(loads.begin(), loads.end(), loads.begin(),
@@
-70,16
+74,17
@@
void deployment_generator::distribute_load()
unsigned i;
for (i = 0 ; i < hosts.size() - 1; ++i) {
if (residue < 0.0)
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)
else if (residue > 0.0)
- iload = ceil(loads[i]);
+ iload =
std::
ceil(loads[i]);
else // residue == 0.0
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
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 ==
loads[i] = iload;
// final sanity check
xbt_assert(opt::auto_depl::load ==
@@
-181,7
+186,7
@@
void deployment_torus::generate()
b = c;
}
unsigned width = b;
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",
unsigned first_on_last_line = (size() - 1) - (size() - 1) % width;
XBT_DEBUG("torus size = %zu ; width = %u ; height = %zu ; foll = %u",