cerc-io/solidity
11
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] Add --metric-aggregator option

Browse Source
This commit is contained in:
Kamil Śliwak
2020-03-18 16:28:16 +01:00
parent bc46323bed
commit d86652cb96
3 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/yulPhaser/Phaser.cpp
+31 -1
View File
@@ -60,12 +60,23 @@ map<MetricChoice, string> MetricChoiceToStringMap =
};
map<string, MetricChoice> const StringToMetricChoiceMap = invertMap(MetricChoiceToStringMap);
map<MetricAggregatorChoice, string> const MetricAggregatorChoiceToStringMap =
{
{MetricAggregatorChoice::Average, "average"},
{MetricAggregatorChoice::Sum, "sum"},
{MetricAggregatorChoice::Maximum, "maximum"},
{MetricAggregatorChoice::Minimum, "minimum"},
};
map<string, MetricAggregatorChoice> const StringToMetricAggregatorChoiceMap = invertMap(MetricAggregatorChoiceToStringMap);
}
istream& phaser::operator>>(istream& _inputStream, Algorithm& _algorithm) { return deserializeChoice(_inputStream, _algorithm, StringToAlgorithmMap); }
ostream& phaser::operator<<(ostream& _outputStream, Algorithm _algorithm) { return serializeChoice(_outputStream, _algorithm, AlgorithmToStringMap); }
istream& phaser::operator>>(istream& _inputStream, MetricChoice& _metric) { return deserializeChoice(_inputStream, _metric, StringToMetricChoiceMap); }
ostream& phaser::operator<<(ostream& _outputStream, MetricChoice _metric) { return serializeChoice(_outputStream, _metric, MetricChoiceToStringMap); }
istream& phaser::operator>>(istream& _inputStream, MetricAggregatorChoice& _aggregator) { return deserializeChoice(_inputStream, _aggregator, StringToMetricAggregatorChoiceMap); }
ostream& phaser::operator<<(ostream& _outputStream, MetricAggregatorChoice _aggregator) { return serializeChoice(_outputStream, _aggregator, MetricAggregatorChoiceToStringMap); }
GeneticAlgorithmFactory::Options GeneticAlgorithmFactory::Options::fromCommandLine(po::variables_map const& _arguments)
{
@@ -139,6 +150,7 @@ FitnessMetricFactory::Options FitnessMetricFactory::Options::fromCommandLine(po:
{
return {
_arguments["metric"].as<MetricChoice>(),
_arguments["metric-aggregator"].as<MetricAggregatorChoice>(),
_arguments["relative-metric-scale"].as<size_t>(),
_arguments["chromosome-repetitions"].as<size_t>(),
};
@@ -178,7 +190,19 @@ unique_ptr<FitnessMetric> FitnessMetricFactory::build(
assertThrow(false, solidity::util::Exception, "Invalid MetricChoice value.");
}
return make_unique<FitnessMetricAverage>(move(metrics));
switch (_options.metricAggregator)
{
case MetricAggregatorChoice::Average:
return make_unique<FitnessMetricAverage>(move(metrics));
case MetricAggregatorChoice::Sum:
return make_unique<FitnessMetricSum>(move(metrics));
case MetricAggregatorChoice::Maximum:
return make_unique<FitnessMetricMaximum>(move(metrics));
case MetricAggregatorChoice::Minimum:
return make_unique<FitnessMetricMinimum>(move(metrics));
default:
assertThrow(false, solidity::util::Exception, "Invalid MetricAggregatorChoice value.");
}
}
PopulationFactory::Options PopulationFactory::Options::fromCommandLine(po::variables_map const& _arguments)
@@ -442,6 +466,12 @@ Phaser::CommandLineDescription Phaser::buildCommandLineDescription()
po::value<MetricChoice>()->value_name("<NAME>")->default_value(MetricChoice::CodeSize),
"Metric used to evaluate the fitness of a chromosome."
)
(
"metric-aggregator",
po::value<MetricAggregatorChoice>()->value_name("<NAME>")->default_value(MetricAggregatorChoice::Average),
"Operator used to combine multiple fitness metric obtained by evaluating a chromosome "
"separately for each input program."
)
(
"relative-metric-scale",
po::value<size_t>()->value_name("<EXPONENT>")->default_value(3),