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

Simplified the feature settings

Browse Source
This commit is contained in:
emeric
2019-12-15 14:29:44 +01:00
parent 74a5f6389d
commit e0711861b5
17 changed files with 226 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/similarity/LmsSimilarity.cpp
+3 -51
View File
@@ -42,54 +42,6 @@ int main(int argc, char *argv[])
// log to stdout
ServiceProvider<Logger>::create<StreamLogger>(std::cout);
const FeatureSettingsMap featuresSettings
{
/* { "lowlevel.average_loudness", 1 },
{ "lowlevel.dynamic_complexity", 1 },
{ "lowlevel.spectral_contrast_coeffs.median", {1} },
{ "lowlevel.erbbands.median", {1} },
{ "tonal.hpcp.median", {1} },
{ "lowlevel.melbands.median", {1} },
{ "lowlevel.barkbands.median", {1} },
{ "lowlevel.mfcc.mean", {1} },
{ "lowlevel.gfcc.mean", {1} },
*/
{ "lowlevel.spectral_kurtosis.median", {1}},
{ "lowlevel.spectral_kurtosis.mean", {1}},
{ "lowlevel.spectral_complexity.var", {1}},
{ "lowlevel.barkbands.median", {1}},
{ "lowlevel.barkbands_kurtosis.mean", {1}},
/*
{"lowlevel.spectral_centroid.dvar2", {1} },
{"lowlevel.barkbands.median", {1} },
{ "lowlevel.barkbands.dvar", {1} },
{ "lowlevel.spectral_complexity.min", {1} },
{ "lowlevel.pitch_salience.dmean2", {1} },
{ "lowlevel.spectral_contrast_valleys.dmean", {1} },
{ "lowlevel.pitch_salience.max", {1} },
{ "lowlevel.barkbands.mean", {1} },
{ "lowlevel.spectral_complexity.mean", {1} },
{ "lowlevel.dissonance.dvar", {1} },
*/
/*
{ "lowlevel.spectral_energy.dvar", {1} },
{ "lowlevel.barkbands.min", {1} },
{ "lowlevel.spectral_centroid.median", {1} },
{"lowlevel.barkbands_kurtosis.median", {1} },
{"lowlevel.spectral_energy.median", {1} },
{"lowlevel.barkbands.max", {1} },
{"lowlevel.barkbands_spread.var", {1} },
{"lowlevel.spectral_decrease.var", {1} },
{"lowlevel.spectral_contrast_valleys.dmean", {1} },
{"lowlevel.barkbands_crest.mean", {1} },
{"lowlevel.spectral_entropy.var", {1} },
{"lowlevel.barkbands_crest.max", {1} },
{"lowlevel.hfc.dvar", {1} },
{"lowlevel.barkbands_skewness.dvar2", {1} },
{"lowlevel.spectral_centroid.max", {1} },
*/
};
std::filesystem::path configFilePath {"/etc/lms.conf"};
if (argc >= 2)
configFilePath = std::string(argv[1], 0, 256);
@@ -102,17 +54,17 @@ int main(int argc, char *argv[])
std::cout << "Classifying tracks..." << std::endl;
// may be long...
struct FeaturesSearcher::TrainSettings trainSettings;
trainSettings.featureSettingsMap = featuresSettings;
trainSettings.featureSettingsMap = FeaturesSearcher::getDefaultTrainFeatureSettings();
FeaturesSearcher searcher {session, trainSettings};
std::cout << "Classifying tracks DONE" << std::endl;
const std::vector<Database::IdType> trackIds = std::invoke([&]()
{
auto transaction {session.createSharedTransaction()};
return Database::Track::getAllIds(session);
return Database::Track::getAllIdsWithFeatures(session);
});
std::cout << "*** Tracks ***" << std::endl;
std::cout << "*** Tracks (" << trackIds.size() << ") ***" << std::endl;
for (Database::IdType trackId : trackIds)
{
auto trackToString = [&](Database::IdType trackId)