cerc-io/solidity
10
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] Phaser: Reimplement << and >> operators using serializeChoice() and deserializeChoice()

Browse Source
This commit is contained in:
Kamil Śliwak 2020-02-26 16:20:44 +01:00
parent deaf1d0c6f
commit 98fcba8ef3
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/yulPhaser/Phaser.cpp
View File

@ -18,6 +18,7 @@
#include <tools/yulPhaser/Phaser.h> #include <tools/yulPhaser/Phaser.h>
#include <tools/yulPhaser/AlgorithmRunner.h> #include <tools/yulPhaser/AlgorithmRunner.h>
#include <tools/yulPhaser/Common.h>
#include <tools/yulPhaser/Exceptions.h> #include <tools/yulPhaser/Exceptions.h>
#include <tools/yulPhaser/FitnessMetrics.h> #include <tools/yulPhaser/FitnessMetrics.h>
#include <tools/yulPhaser/GeneticAlgorithms.h> #include <tools/yulPhaser/GeneticAlgorithms.h>
@ -27,6 +28,7 @@
#include <liblangutil/CharStream.h> #include <liblangutil/CharStream.h>
#include <libsolutil/Assertions.h> #include <libsolutil/Assertions.h>
#include <libsolutil/CommonData.h>
#include <libsolutil/CommonIO.h> #include <libsolutil/CommonIO.h>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
@ -41,32 +43,20 @@ using namespace solidity::phaser;
namespace po = boost::program_options; namespace po = boost::program_options;
istream& phaser::operator>>(istream& _inputStream, Algorithm& _algorithm) namespace
{ {
string value;
_inputStream >> value;
if (value == "random") map<Algorithm, string> const AlgorithmToStringMap =
_algorithm = Algorithm::Random; {
else if (value == "GEWEP") {Algorithm::Random, "random"},
_algorithm = Algorithm::GEWEP; {Algorithm::GEWEP, "GEWEP"},
else };
_inputStream.setstate(ios_base::failbit); map<string, Algorithm> const StringToAlgorithmMap = invertMap(AlgorithmToStringMap);
return _inputStream;
} }
ostream& phaser::operator<<(ostream& _outputStream, Algorithm _algorithm) istream& phaser::operator>>(istream& _inputStream, Algorithm& _algorithm) { return deserializeChoice(_inputStream, _algorithm, StringToAlgorithmMap); }
{ ostream& phaser::operator<<(ostream& _outputStream, Algorithm _algorithm) { return serializeChoice(_outputStream, _algorithm, AlgorithmToStringMap); }
if (_algorithm == Algorithm::Random)
_outputStream << "random";
else if (_algorithm == Algorithm::GEWEP)
_outputStream << "GEWEP";
else
_outputStream.setstate(ios_base::failbit);
return _outputStream;
}
GeneticAlgorithmFactory::Options GeneticAlgorithmFactory::Options::fromCommandLine(po::variables_map const& _arguments) GeneticAlgorithmFactory::Options GeneticAlgorithmFactory::Options::fromCommandLine(po::variables_map const& _arguments)
{ {