Fix naming convention of Percent

This commit is contained in:
Patrick Niklaus
2016-04-29 00:46:59 +02:00
parent 83482afa02
commit d12a95b4ef
5 changed files with 16 additions and 17 deletions
+2 -2
View File
@@ -561,7 +561,7 @@ class GraphContractor
number_of_contracted_nodes += end_independent_nodes_idx - begin_independent_nodes_idx;
remaining_nodes.resize(begin_independent_nodes_idx);
p.printStatus(number_of_contracted_nodes);
p.PrintStatus(number_of_contracted_nodes);
++current_level;
}
@@ -627,7 +627,7 @@ class GraphContractor
Edge new_edge;
for (const auto node : util::irange(0u, number_of_nodes))
{
p.printStatus(node);
p.PrintStatus(node);
for (auto edge : contractor_graph->GetAdjacentEdgeRange(node))
{
const NodeID target = contractor_graph->GetTarget(edge);
+9 -9
View File
@@ -12,10 +12,10 @@ namespace util
class Percent
{
public:
explicit Percent(unsigned max_value, unsigned step = 5) { reinit(max_value, step); }
explicit Percent(unsigned max_value, unsigned step = 5) { Reinit(max_value, step); }
// Reinitializes
void reinit(unsigned max_value, unsigned step = 5)
void Reinit(unsigned max_value, unsigned step = 5)
{
m_max_value = max_value;
m_current_value = 0;
@@ -26,27 +26,27 @@ class Percent
}
// If there has been significant progress, display it.
void printStatus(unsigned current_value)
void PrintStatus(unsigned current_value)
{
if (current_value >= m_next_threshold)
{
m_next_threshold += m_percent_interval;
printPercent(current_value / static_cast<double>(m_max_value) * 100.);
PrintPercent(current_value / static_cast<double>(m_max_value) * 100.);
}
if (current_value + 1 == m_max_value)
std::cout << " 100%" << std::endl;
}
void printIncrement()
void PrintIncrement()
{
++m_current_value;
printStatus(m_current_value);
PrintStatus(m_current_value);
}
void printAddition(const unsigned addition)
void PrintAddition(const unsigned addition)
{
m_current_value += addition;
printStatus(m_current_value);
PrintStatus(m_current_value);
}
private:
@@ -58,7 +58,7 @@ class Percent
unsigned m_step;
// Displays progress.
void printPercent(double percent)
void PrintPercent(double percent)
{
while (percent >= m_last_percent + m_step)
{