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

Fallback on the cluster similarity searcher if no song is classified

Browse Source
This commit is contained in:
emeric
2019-04-19 13:01:57 +02:00
parent 89ce9ab6c6
commit 0aef48f3bc
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/similarity/SimilaritySearcher.cpp
+3 -1
View File
@@ -45,7 +45,9 @@ Searcher::getSimilarTracks(Wt::Dbo::Session& session, const std::set<Database::I
auto somSearcher = _somAddon.getSearcher(); auto somSearcher = _somAddon.getSearcher();
if (method == Database::SimilaritySettings::PreferredMethod::Features if (method == Database::SimilaritySettings::PreferredMethod::Features
|| (method == Database::SimilaritySettings::PreferredMethod::Auto && somSearcher)) || (method == Database::SimilaritySettings::PreferredMethod::Auto
&& somSearcher
&& std::any_of(std::cbegin(trackIds), std::cend(trackIds), [&](Database::IdType trackId) { return somSearcher->isTrackClassified(trackId); } )))
{ {
return somSearcher->getSimilarTracks(trackIds, maxCount); return somSearcher->getSimilarTracks(trackIds, maxCount);
} }
src/similarity/features/SimilarityFeaturesSearcher.cpp
+6
View File
@@ -221,6 +221,12 @@ FeaturesSearcher::isValid() const
return _network.get() != nullptr; return _network.get() != nullptr;
} }
bool
FeaturesSearcher::isTrackClassified(Database::IdType trackId) const
{
return (_trackPositions.find(trackId) != _trackPositions.end());
}
bool bool
FeaturesSearcher::isReleaseClassified(Database::IdType releaseId) const FeaturesSearcher::isReleaseClassified(Database::IdType releaseId) const
{ {
src/similarity/features/SimilarityFeaturesSearcher.hpp
+2 -1
View File
@@ -43,8 +43,9 @@ class FeaturesSearcher
bool isValid() const; bool isValid() const;
bool isTrackClassified(Database::IdType trackId) const;
bool isReleaseClassified(Database::IdType releaseId) const; bool isReleaseClassified(Database::IdType releaseId) const;
bool isArtistClassified(Database::IdType releaseId) const; bool isArtistClassified(Database::IdType artistId) const;
std::vector<Database::IdType> getSimilarTracks(const std::set<Database::IdType>& tracksId, std::size_t maxCount) const; std::vector<Database::IdType> getSimilarTracks(const std::set<Database::IdType>& tracksId, std::size_t maxCount) const;
std::vector<Database::IdType> getSimilarReleases(Database::IdType releaseId, std::size_t maxCount) const; std::vector<Database::IdType> getSimilarReleases(Database::IdType releaseId, std::size_t maxCount) const;