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: A few more tweaks to ensure that signedness conversions do not cause warnings

Browse Source 
- Don't cast booleans to int when the result gets assigned to an unsigned type. Relace them with ifs.
- Use unsigned initializer for a variable declared in a lambda capture.
- Unsigned abs() of a difference of unsigned values.
This commit is contained in:
Djordje Mijovic 2020-06-02 15:00:33 +02:00 committed by Kamil Śliwak
parent a49a127627
commit 9b3d1c11ff
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/yulPhaser/Mutations.cpp
View File

@ -179,8 +179,8 @@ BOOST_AUTO_TEST_CASE(alternativeMutations_should_choose_between_mutations_with_g
for (size_t i = 0; i < 10; ++i) for (size_t i = 0; i < 10; ++i)
{ {
Chromosome mutatedChromosome = mutation(chromosome); Chromosome mutatedChromosome = mutation(chromosome);
cCount += static_cast<int>(mutatedChromosome == Chromosome("c")); cCount += (mutatedChromosome == Chromosome("c") ? 1 : 0);
fCount += static_cast<int>(mutatedChromosome == Chromosome("f")); fCount += (mutatedChromosome == Chromosome("f") ? 1 : 0);
} }
// This particular seed results in 7 "c"s out of 10 which looks plausible given the 80% chance. // This particular seed results in 7 "c"s out of 10 which looks plausible given the 80% chance.

2
test/yulPhaser/Population.cpp
View File

@ -135,7 +135,7 @@ BOOST_FIXTURE_TEST_CASE(makeRandom_should_get_chromosome_lengths_from_specified_
size_t maxLength = 5; size_t maxLength = 5;
assert(chromosomeCount % maxLength == 0); assert(chromosomeCount % maxLength == 0);
auto nextLength = [counter = 0, maxLength]() mutable { return counter++ % maxLength; }; auto nextLength = [counter = 0ul, maxLength]() mutable { return counter++ % maxLength; };
auto population = Population::makeRandom(m_fitnessMetric, chromosomeCount, nextLength); auto population = Population::makeRandom(m_fitnessMetric, chromosomeCount, nextLength);
// We can't rely on the order since the population sorts its chromosomes immediately but // We can't rely on the order since the population sorts its chromosomes immediately but

8
test/yulPhaser/TestHelpers.cpp
View File

@ -72,9 +72,13 @@ size_t phaser::test::countDifferences(Chromosome const& _chromosome1, Chromosome
{ {
size_t count = 0; size_t count = 0;
for (size_t i = 0; i < min(_chromosome1.length(), _chromosome2.length()); ++i) for (size_t i = 0; i < min(_chromosome1.length(), _chromosome2.length()); ++i)
count += static_cast<int>(_chromosome1.optimisationSteps()[i] != _chromosome2.optimisationSteps()[i]); if (_chromosome1.optimisationSteps()[i] != _chromosome2.optimisationSteps()[i])
++count;
return count + abs(static_cast<int>(_chromosome1.length() - _chromosome2.length())); return count + static_cast<size_t>(abs(
static_cast<long>(_chromosome1.length()) -
static_cast<long>(_chromosome2.length())
));
} }
TemporaryDirectory::TemporaryDirectory(std::string const& _prefix): TemporaryDirectory::TemporaryDirectory(std::string const& _prefix):