owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split the utils file

Browse Source
This commit is contained in:
emeric
2020-02-08 17:44:12 +01:00
parent 52a0f62491
commit e274c0ca89
47 changed files with 343 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/metadata/Makefile.am
+1 -2
View File
@@ -3,12 +3,11 @@ bin_PROGRAMS = lms-metadata
lms_metadata_SOURCES = \
$(srcdir)/LmsMetadata.cpp \
$(top_srcdir)/src/av/AvInfo.cpp \
$(top_srcdir)/src/metadata/MetaData.cpp \
$(top_srcdir)/src/metadata/AvFormat.cpp \
$(top_srcdir)/src/metadata/TagLibParser.cpp \
$(top_srcdir)/src/utils/Logger.cpp \
$(top_srcdir)/src/utils/StreamLogger.cpp \
$(top_srcdir)/src/utils/Utils.cpp \
$(top_srcdir)/src/utils/String.cpp \
$(top_srcdir)/src/utils/UUID.cpp
lms_metadata_CXXFLAGS=-std=c++17 -I$(top_srcdir)/src -D_REENTRANT
tools/similarity-parameters/GeneticAlgorithm.hpp
+4 -3
View File
@@ -19,7 +19,8 @@
#include <numeric>
#include "utils/Utils.hpp"
#include "utils/Random.hpp"
#include "ParallelFor.hpp"
template<typename Individual>
@@ -108,7 +109,7 @@ GeneticAlgorithm<Individual>::simulate(const std::vector<Individual>& initialPop
ScoredIndividual child {_params.breedFunction(itParent1->individual, itParent2->individual)};
if (getRealRandom(float {}, float {1}) <= _params.mutationProbability)
if (Random::getRealRandom(float {}, float {1}) <= _params.mutationProbability)
_params.mutateFunction(child.individual);
children.emplace_back(std::move(child));
@@ -156,7 +157,7 @@ template<typename Individual>
typename std::vector<typename GeneticAlgorithm<Individual>::ScoredIndividual>::const_iterator
GeneticAlgorithm<Individual>::pickRandomRouletteWheel(const std::vector<ScoredIndividual>& population, Score totalScore)
{
const Score randomScore {getRealRandom(Score {}, totalScore)};
const Score randomScore {Random::getRealRandom(Score {}, totalScore)};
Score curScore{};
for (auto itScoredIndividual {std::cbegin(population)}; itScoredIndividual != std::cend(population); ++itScoredIndividual )
tools/similarity-parameters/LmsSimilarityParameters.cpp
+4 -4
View File
@@ -358,7 +358,7 @@ breedFeatureSettingsMap(const FeatureSettingsMap& a, const FeatureSettingsMap& b
// just kill random elements until size is good
while (res.size() > a.size())
{
const auto itFeature {pickRandom(res)};
const auto itFeature {Random::pickRandom(res)};
res.erase(itFeature);
}
@@ -371,11 +371,11 @@ mutateFeatureSettingsMap(FeatureSettingsMap& a)
{
const std::size_t size {a.size()};
// Replace one of the feature with another one, random
a.erase(pickRandom(a));
a.erase(Random::pickRandom(a));
while (a.size() != size)
{
const auto itFeatureSetting {pickRandom(featuresSettings)};
const auto itFeatureSetting {Random::pickRandom(featuresSettings)};
a.emplace(itFeatureSetting->first, itFeatureSetting->second);
}
}
@@ -425,7 +425,7 @@ int main(int argc, char *argv[])
while (settings.size() < nbFeatures)
{
const auto itFeatureSetting {pickRandom(featuresSettings)};
const auto itFeatureSetting {Random::pickRandom(featuresSettings)};
settings.emplace(itFeatureSetting->first, itFeatureSetting->second);
}
tools/similarity-parameters/Makefile.am
+2 -1
View File
@@ -21,8 +21,9 @@ lms_similarity_parameters_SOURCES = \
$(top_srcdir)/src/similarity/features/SimilarityFeaturesDefs.cpp \
$(top_srcdir)/src/utils/Config.cpp \
$(top_srcdir)/src/utils/Logger.cpp \
$(top_srcdir)/src/utils/Random.cpp \
$(top_srcdir)/src/utils/StreamLogger.cpp \
$(top_srcdir)/src/utils/Utils.cpp
$(top_srcdir)/src/utils/String.cpp
lms_similarity_parameters_CXXFLAGS=-std=c++17 -I$(top_srcdir)/src -D_REENTRANT
tools/similarity/Makefile.am
+1 -1
View File
@@ -21,7 +21,7 @@ lms_similarity_SOURCES = \
$(top_srcdir)/src/utils/Config.cpp \
$(top_srcdir)/src/utils/Logger.cpp \
$(top_srcdir)/src/utils/StreamLogger.cpp \
$(top_srcdir)/src/utils/Utils.cpp
$(top_srcdir)/src/utils/String.cpp
lms_similarity_CXXFLAGS=-std=c++17 -I$(top_srcdir)/src -D_REENTRANT