From 5e00b57e02a435cb752502d11bc50b306aa97f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sat, 22 Feb 2020 00:01:06 +0100
Subject: [PATCH] [yul-phaser] Add --population option

---
 tools/yulPhaser/Phaser.cpp | 23 ++++++++++++++++++++++-
 tools/yulPhaser/Phaser.h   |  5 +++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/tools/yulPhaser/Phaser.cpp b/tools/yulPhaser/Phaser.cpp
index 768088e49..8c5fcbc26 100644
--- a/tools/yulPhaser/Phaser.cpp
+++ b/tools/yulPhaser/Phaser.cpp
@@ -114,6 +114,9 @@ unique_ptr<FitnessMetric> FitnessMetricFactory::build(
 PopulationFactory::Options PopulationFactory::Options::fromCommandLine(po::variables_map const& _arguments)
 {
 	return {
+		_arguments.count("population") > 0 ?
+			_arguments["population"].as<vector<string>>() :
+			vector<string>{},
 		_arguments.count("random-population") > 0 ?
 			_arguments["random-population"].as<vector<size_t>>() :
 			vector<size_t>{},
@@ -125,7 +128,7 @@ Population PopulationFactory::build(
 	shared_ptr<FitnessMetric> _fitnessMetric
 )
 {
-	Population population(_fitnessMetric, vector<Chromosome>{});
+	Population population = buildFromStrings(_options.population, _fitnessMetric);
 
 	size_t combinedSize = 0;
 	for (size_t populationSize: _options.randomPopulation)
@@ -139,6 +142,17 @@ Population PopulationFactory::build(
 	return population;
 }
 
+Population PopulationFactory::buildFromStrings(
+	vector<string> const& _geneSequences,
+	shared_ptr<FitnessMetric> _fitnessMetric
+)
+{
+	vector<Chromosome> chromosomes;
+	for (string const& geneSequence: _geneSequences)
+		chromosomes.emplace_back(geneSequence);
+
+	return Population(move(_fitnessMetric), move(chromosomes));
+}
 
 Population PopulationFactory::buildRandom(
 	size_t _populationSize,
@@ -235,6 +249,13 @@ Phaser::CommandLineDescription Phaser::buildCommandLineDescription()
 
 	po::options_description populationDescription("POPULATION", lineLength, minDescriptionLength);
 	populationDescription.add_options()
+		(
+			"population",
+			po::value<vector<string>>()->multitoken()->value_name("<CHROMOSOMES>"),
+			"List of chromosomes to be included in the initial population. "
+			"You can specify multiple values separated with spaces or invoke the option multiple times "
+			"and all the values will be included."
+		)
 		(
 			"random-population",
 			po::value<vector<size_t>>()->value_name("<SIZE>"),
diff --git a/tools/yulPhaser/Phaser.h b/tools/yulPhaser/Phaser.h
index 4df0109f7..a12ccd87a 100644
--- a/tools/yulPhaser/Phaser.h
+++ b/tools/yulPhaser/Phaser.h
@@ -106,6 +106,7 @@ public:
 
 	struct Options
 	{
+		std::vector<std::string> population;
 		std::vector<size_t> randomPopulation;
 
 		static Options fromCommandLine(boost::program_options::variables_map const& _arguments);
@@ -115,6 +116,10 @@ public:
 		Options const& _options,
 		std::shared_ptr<FitnessMetric> _fitnessMetric
 	);
+	static Population buildFromStrings(
+		std::vector<std::string> const& _geneSequences,
+		std::shared_ptr<FitnessMetric> _fitnessMetric
+	);
 	static Population buildRandom(
 		size_t _populationSize,
 		std::shared_ptr<FitnessMetric> _fitnessMetric