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: Use ptrdiff_t for iterator arithmetic

Browse Source
This commit is contained in:
Djordje Mijovic 2020-06-02 15:00:33 +02:00 committed by Kamil Śliwak
parent 92a9f44afa
commit a49a127627
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/yulPhaser/Mutations.cpp
View File

@ -118,7 +118,7 @@ BOOST_AUTO_TEST_CASE(geneAddition_should_be_able_to_insert_before_first_position
BOOST_TEST(mutatedChromosome.length() > chromosome.length()); BOOST_TEST(mutatedChromosome.length() > chromosome.length());
vector<string> suffix( vector<string> suffix(
mutatedChromosome.optimisationSteps().end() - chromosome.length(), mutatedChromosome.optimisationSteps().end() - static_cast<ptrdiff_t>(chromosome.length()),
mutatedChromosome.optimisationSteps().end() mutatedChromosome.optimisationSteps().end()
); );
BOOST_TEST(suffix == chromosome.optimisationSteps()); BOOST_TEST(suffix == chromosome.optimisationSteps());
@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE(geneAddition_should_be_able_to_insert_after_last_position)
vector<string> prefix( vector<string> prefix(
mutatedChromosome.optimisationSteps().begin(), mutatedChromosome.optimisationSteps().begin(),
mutatedChromosome.optimisationSteps().begin() + chromosome.length() mutatedChromosome.optimisationSteps().begin() + static_cast<ptrdiff_t>(chromosome.length())
); );
BOOST_TEST(prefix == chromosome.optimisationSteps()); BOOST_TEST(prefix == chromosome.optimisationSteps());
} }

20
tools/yulPhaser/Mutations.cpp
View File

@ -126,12 +126,12 @@ ChromosomePair fixedPointSwap(
return { return {
Chromosome( Chromosome(
vector<string>(begin1, begin1 + _crossoverPoint) + vector<string>(begin1, begin1 + static_cast<ptrdiff_t>(_crossoverPoint)) +
vector<string>(begin2 + _crossoverPoint, end2) vector<string>(begin2 + static_cast<ptrdiff_t>(_crossoverPoint), end2)
), ),
Chromosome( Chromosome(
vector<string>(begin2, begin2 + _crossoverPoint) + vector<string>(begin2, begin2 + static_cast<ptrdiff_t>(_crossoverPoint)) +
vector<string>(begin1 + _crossoverPoint, end1) vector<string>(begin1 + static_cast<ptrdiff_t>(_crossoverPoint), end1)
), ),
}; };
} }
@ -196,8 +196,8 @@ ChromosomePair fixedTwoPointSwap(
assert(_crossoverPoint2 <= _chromosome1.length()); assert(_crossoverPoint2 <= _chromosome1.length());
assert(_crossoverPoint2 <= _chromosome2.length()); assert(_crossoverPoint2 <= _chromosome2.length());
size_t lowPoint = min(_crossoverPoint1, _crossoverPoint2); auto lowPoint = static_cast<ptrdiff_t>(min(_crossoverPoint1, _crossoverPoint2));
size_t highPoint = max(_crossoverPoint1, _crossoverPoint2); auto highPoint = static_cast<ptrdiff_t>(max(_crossoverPoint1, _crossoverPoint2));
auto begin1 = _chromosome1.optimisationSteps().begin(); auto begin1 = _chromosome1.optimisationSteps().begin();
auto begin2 = _chromosome2.optimisationSteps().begin(); auto begin2 = _chromosome2.optimisationSteps().begin();
@ -282,17 +282,17 @@ ChromosomePair uniformSwap(Chromosome const& _chromosome1, Chromosome const& _ch
if (_chromosome1.length() > minLength) if (_chromosome1.length() > minLength)
{ {
if (swapTail) if (swapTail)
steps2.insert(steps2.end(), begin1 + minLength, end1); steps2.insert(steps2.end(), begin1 + static_cast<ptrdiff_t>(minLength), end1);
else else
steps1.insert(steps1.end(), begin1 + minLength, end1); steps1.insert(steps1.end(), begin1 + static_cast<ptrdiff_t>(minLength), end1);
} }
if (_chromosome2.length() > minLength) if (_chromosome2.length() > minLength)
{ {
if (swapTail) if (swapTail)
steps1.insert(steps1.end(), begin2 + minLength, end2); steps1.insert(steps1.end(), begin2 + static_cast<ptrdiff_t>(minLength), end2);
else else
steps2.insert(steps2.end(), begin2 + minLength, end2); steps2.insert(steps2.end(), begin2 + static_cast<ptrdiff_t>(minLength), end2);
} }
return {Chromosome(steps1), Chromosome(steps2)}; return {Chromosome(steps1), Chromosome(steps2)};

15
tools/yulPhaser/PairSelections.cpp
View File

@ -30,7 +30,7 @@ vector<tuple<size_t, size_t>> RandomPairSelection::materialise(size_t _poolSize)
if (_poolSize < 2) if (_poolSize < 2)
return {}; return {};
size_t count = static_cast<size_t>(round(_poolSize * m_selectionSize)); auto count = static_cast<size_t>(round(_poolSize * m_selectionSize));
vector<tuple<size_t, size_t>> selection; vector<tuple<size_t, size_t>> selection;
for (size_t i = 0; i < count; ++i) for (size_t i = 0; i < count; ++i)
@ -64,7 +64,10 @@ vector<tuple<size_t, size_t>> PairsFromRandomSubset::materialise(size_t _poolSiz
} while (selectedIndices.size() % 2 != 0); } while (selectedIndices.size() % 2 != 0);
} }
else else
selectedIndices.erase(selectedIndices.begin() + SimulationRNG::uniformInt(0, selectedIndices.size() - 1)); selectedIndices.erase(
selectedIndices.begin() +
static_cast<ptrdiff_t>(SimulationRNG::uniformInt(0, selectedIndices.size() - 1))
);
} }
assert(selectedIndices.size() % 2 == 0); assert(selectedIndices.size() % 2 == 0);
@ -73,14 +76,14 @@ vector<tuple<size_t, size_t>> PairsFromRandomSubset::materialise(size_t _poolSiz
{ {
size_t position1 = SimulationRNG::uniformInt(0, selectedIndices.size() - 1); size_t position1 = SimulationRNG::uniformInt(0, selectedIndices.size() - 1);
size_t value1 = selectedIndices[position1]; size_t value1 = selectedIndices[position1];
selectedIndices.erase(selectedIndices.begin() + position1); selectedIndices.erase(selectedIndices.begin() + static_cast<ptrdiff_t>(position1));
size_t position2 = SimulationRNG::uniformInt(0, selectedIndices.size() - 1); size_t position2 = SimulationRNG::uniformInt(0, selectedIndices.size() - 1);
size_t value2 = selectedIndices[position2]; size_t value2 = selectedIndices[position2];
selectedIndices.erase(selectedIndices.begin() + position2); selectedIndices.erase(selectedIndices.begin() + static_cast<ptrdiff_t>(position2));
selectedPairs.push_back({value1, value2}); selectedPairs.emplace_back(value1, value2);
} }
assert(selectedIndices.size() == 0); assert(selectedIndices.empty());
return selectedPairs; return selectedPairs;
} }