cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[yul-phaser] AlgorithmRunner: Print elapsed time after each round

Browse Source
This commit is contained in:
Kamil Śliwak 2020-02-27 02:08:40 +01:00
parent c875b3d944
commit 47c3b558f2
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/yulPhaser/AlgorithmRunner.cpp
View File

@ -69,7 +69,7 @@ class AlgorithmRunnerFixture
{ {
protected: protected:
// NOTE: Regexes here should not contain spaces because we strip them before matching // NOTE: Regexes here should not contain spaces because we strip them before matching
regex RoundSummaryRegex{R"(-+ROUND\d+-+)"}; regex RoundSummaryRegex{R"(-+ROUND\d+\[round:[0-9.]+s,total:[0-9.]+s\]-+)"};
regex InitialPopulationHeaderRegex{"-+INITIALPOPULATION-+"}; regex InitialPopulationHeaderRegex{"-+INITIALPOPULATION-+"};
string individualPattern(Individual const& individual) const string individualPattern(Individual const& individual) const

14
tools/yulPhaser/AlgorithmRunner.cpp
View File

@ -34,27 +34,37 @@ void AlgorithmRunner::run(GeneticAlgorithm& _algorithm)
printInitialPopulation(); printInitialPopulation();
cacheClear(); cacheClear();
chrono::steady_clock::time_point totalTimeStart = std::chrono::steady_clock::now();
for (size_t round = 0; !m_options.maxRounds.has_value() || round < m_options.maxRounds.value(); ++round) for (size_t round = 0; !m_options.maxRounds.has_value() || round < m_options.maxRounds.value(); ++round)
{ {
chrono::steady_clock::time_point roundTimeStart = std::chrono::steady_clock::now();
cacheStartRound(round + 1); cacheStartRound(round + 1);
m_population = _algorithm.runNextRound(m_population); m_population = _algorithm.runNextRound(m_population);
randomiseDuplicates(); randomiseDuplicates();
printRoundSummary(round); printRoundSummary(round, roundTimeStart, totalTimeStart);
populationAutosave(); populationAutosave();
} }
} }
void AlgorithmRunner::printRoundSummary( void AlgorithmRunner::printRoundSummary(
size_t _round size_t _round,
chrono::steady_clock::time_point _roundTimeStart,
chrono::steady_clock::time_point _totalTimeStart
) const ) const
{ {
if (!m_options.showOnlyTopChromosome) if (!m_options.showOnlyTopChromosome)
{ {
if (m_options.showRoundInfo) if (m_options.showRoundInfo)
{ {
chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
auto roundTime = chrono::duration_cast<chrono::milliseconds>(now - _roundTimeStart).count();
auto totalTime = chrono::duration_cast<chrono::milliseconds>(now - _totalTimeStart).count();
m_outputStream << "---------- ROUND " << _round + 1; m_outputStream << "---------- ROUND " << _round + 1;
m_outputStream << " [round: " << fixed << setprecision(1) << roundTime / 1000.0 << " s,";
m_outputStream << " total: " << fixed << setprecision(1) << totalTime / 1000.0 << " s]";
m_outputStream << " ----------" << endl; m_outputStream << " ----------" << endl;
} }
else if (m_population.individuals().size() > 0) else if (m_population.individuals().size() > 0)

4
tools/yulPhaser/AlgorithmRunner.h
View File

@ -71,7 +71,9 @@ public:
private: private:
void printRoundSummary( void printRoundSummary(
size_t _round size_t _round,
std::chrono::steady_clock::time_point _roundTimeStart,
std::chrono::steady_clock::time_point _totalTimeStart
) const; ) const;
void printInitialPopulation() const; void printInitialPopulation() const;
void populationAutosave() const; void populationAutosave() const;