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

Added an option for the user to choice the type of the similarity engine to use

Browse Source
This commit is contained in:
emeric
2019-05-23 13:25:25 +02:00
parent ae8aadfdde
commit 5f02dfeff1
10 changed files with 254 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/similarity/SimilaritySearcher.cpp
+18 -21
View File
@@ -31,23 +31,22 @@ Searcher::Searcher(FeaturesScannerAddon& somAddon)
{}
static
Database::SimilaritySettings::PreferredMethod getPreferredMethod(Wt::Dbo::Session& session)
Database::SimilaritySettings::EngineType getEngineType(Wt::Dbo::Session& session)
{
Wt::Dbo::Transaction transaction(session);
return Database::SimilaritySettings::get(session)->getPreferredMethod();
Wt::Dbo::Transaction transaction{session};
return Database::SimilaritySettings::get(session)->getEngineType();
}
std::vector<Database::IdType>
Searcher::getSimilarTracks(Wt::Dbo::Session& session, const std::set<Database::IdType>& trackIds, std::size_t maxCount)
{
auto method = getPreferredMethod(session);
auto somSearcher = _somAddon.getSearcher();
auto engineType {getEngineType(session)};
auto somSearcher {_somAddon.getSearcher()};
if (method == Database::SimilaritySettings::PreferredMethod::Features
|| (method == Database::SimilaritySettings::PreferredMethod::Auto
&& somSearcher
&& std::any_of(std::cbegin(trackIds), std::cend(trackIds), [&](Database::IdType trackId) { return somSearcher->isTrackClassified(trackId); } )))
if (engineType == Database::SimilaritySettings::EngineType::Features
&& somSearcher
&& std::any_of(std::cbegin(trackIds), std::cend(trackIds), [&](Database::IdType trackId) { return somSearcher->isTrackClassified(trackId); } ))
{
return somSearcher->getSimilarTracks(trackIds, maxCount);
}
@@ -58,13 +57,12 @@ Searcher::getSimilarTracks(Wt::Dbo::Session& session, const std::set<Database::I
std::vector<Database::IdType>
Searcher::getSimilarReleases(Wt::Dbo::Session& session, Database::IdType releaseId, std::size_t maxCount)
{
auto method = getPreferredMethod(session);
auto somSearcher = _somAddon.getSearcher();
auto engineType {getEngineType(session)};
auto somSearcher {_somAddon.getSearcher()};
if (method == Database::SimilaritySettings::PreferredMethod::Features
|| (method == Database::SimilaritySettings::PreferredMethod::Auto
&& somSearcher
&& somSearcher->isReleaseClassified(releaseId)))
if (engineType == Database::SimilaritySettings::EngineType::Features
&& somSearcher
&& somSearcher->isReleaseClassified(releaseId))
{
return somSearcher->getSimilarReleases(releaseId, maxCount);
}
@@ -75,13 +73,12 @@ Searcher::getSimilarReleases(Wt::Dbo::Session& session, Database::IdType release
std::vector<Database::IdType>
Searcher::getSimilarArtists(Wt::Dbo::Session& session, Database::IdType artistId, std::size_t maxCount)
{
auto method = getPreferredMethod(session);
auto somSearcher = _somAddon.getSearcher();
auto engineType {getEngineType(session)};
auto somSearcher {_somAddon.getSearcher()};
if (method == Database::SimilaritySettings::PreferredMethod::Features
|| (method == Database::SimilaritySettings::PreferredMethod::Auto
&& somSearcher
&& somSearcher->isArtistClassified(artistId)))
if (engineType == Database::SimilaritySettings::EngineType::Features
&& somSearcher
&& somSearcher->isArtistClassified(artistId))
{
return somSearcher->getSimilarArtists(artistId, maxCount);
}