Added some more tools

src/libs/recommendation/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 add_library(lmsrecommendation SHARED
 	impl/Engine.cpp
-	impl/ProviderCreator.cpp
+	impl/ClassifierCreator.cpp
 	)
 
 target_include_directories(lmsrecommendation INTERFACE

src/libs/recommendation/impl/ClassifierCreator.cpp

@@ -17,19 +17,19 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "recommendation/ClustersRecommendationProviderCreator.hpp"
-#include "recommendation/FeaturesRecommendationProviderCreator.hpp"
-#include "recommendation/Provider.hpp"
+#include "recommendation/ClustersClassifierCreator.hpp"
+#include "recommendation/FeaturesClassifierCreator.hpp"
+#include "recommendation/Classifier.hpp"
 
 namespace Recommendation
 {
 
-	std::unique_ptr<Provider> createClustersRecommendationProvider()
+	std::unique_ptr<Classifier> createClustersClassifier()
 	{
 		return {};
 	}
 	
-	std::unique_ptr<Provider> createFeaturesRecommendationProvider(Scanner::IMediaScanner&)
+	std::unique_ptr<Classifier> createFeaturesClassifier()
 	{
 		return {};
 	}

src/libs/recommendation/impl/Engine.cpp

@@ -34,15 +34,15 @@ createEngine()
 }
 
 void
-Engine::clearProviders()
+Engine::clearClassifiers()
 {
-	_providers.clear();
+	_classifiers.clear();
 }
 
 void
-Engine::addProvider(std::unique_ptr<Provider> provider, unsigned priority)
+Engine::addClassifier(std::unique_ptr<Classifier> classifier, unsigned priority)
 {
-	_providers.emplace(priority, std::move(provider));
+	_classifiers.emplace(priority, std::move(classifier));
 }
 
 std::vector<Database::IdType>

src/libs/recommendation/impl/Engine.hpp

@@ -22,7 +22,7 @@
 #include <map>
 
 #include "recommendation/IEngine.hpp"
-#include "recommendation/Provider.hpp"
+#include "recommendation/Classifier.hpp"
 
 namespace Database
 {
@@ -34,9 +34,6 @@ namespace Recommendation
 	class Engine : public IEngine
 	{
 		public:
-			void clearProviders() override;
-			void addProvider(std::unique_ptr<Provider> provider, unsigned priority) override;
-
 			// Closest results first
 			std::vector<Database::IdType> getSimilarTracksFromTrackList(Database::Session& session, Database::IdType tracklistId, std::size_t maxCount) override;
 			std::vector<Database::IdType> getSimilarTracks(Database::Session& session, const std::unordered_set<Database::IdType>& tracksId, std::size_t maxCount) override;
@@ -44,8 +41,10 @@ namespace Recommendation
 			std::vector<Database::IdType> getSimilarArtists(Database::Session& session, Database::IdType artistId, std::size_t maxCount) override;
 
 		private:
+			void clearClassifiers();
+			void addClassifier(std::unique_ptr<Classifier> classifier, unsigned priority);
 
-			std::map<unsigned, std::unique_ptr<Provider>> _providers;
+			std::map<unsigned, std::unique_ptr<Classifier>> _classifiers;
 	};
 
 } // ns Recommendation

src/libs/recommendation/include/recommendation/Classifier.hpp

@@ -32,10 +32,12 @@ namespace Database
 namespace Recommendation
 {
 
-	class Provider
+	class Classifier
 	{
 		public:
-			virtual ~Provider() = default;
+			virtual ~Classifier() = default;
+
+			virtual void classify() = 0;
 
 			virtual bool isTrackClassified(Database::IdType trackId) const = 0;
 			virtual bool isReleaseClassified(Database::IdType releaseId) const = 0;

src/libs/recommendation/include/recommendation/ClustersClassifierCreator.hpp

@@ -28,8 +28,8 @@ namespace Database
 
 namespace Recommendation
 {
-	class Provider;
+	class Classifier;
 
-	std::unique_ptr<Provider> createClustersRecommendationProvider();
+	std::unique_ptr<Classifier> createClustersClassifier();
 }
 

src/libs/recommendation/include/recommendation/FeaturesClassifierCreator.hpp

@@ -26,15 +26,10 @@ namespace Database
 	class Session;
 }
 
-namespace Scanner
-{
-	class IMediaScanner;
-}
-
 namespace Recommendation
 {
-	class Provider;
+	class Classifier;
 
-	std::unique_ptr<Provider> createFeaturesRecommendationProvider(Scanner::IMediaScanner& scanner);
+	std::unique_ptr<Classifier> createFeaturesClassifier();
 }
 

src/libs/recommendation/include/recommendation/IEngine.hpp

@@ -23,7 +23,7 @@
 #include <unordered_set>
 
 #include "database/Types.hpp"
-#include "Provider.hpp"
+#include "Classifier.hpp"
 
 namespace Database
 {
@@ -32,15 +32,12 @@ namespace Database
 
 namespace Recommendation
 {
-	class Provider;
+	class Classifier;
 	class IEngine
 	{
 		public:
 			virtual ~IEngine() = default;
 
-			virtual void clearProviders() = 0;
-			virtual void addProvider(std::unique_ptr<Provider> provider, unsigned priority) = 0;
-
 			// Closest results first
 			virtual std::vector<Database::IdType> getSimilarTracksFromTrackList(Database::Session& session, Database::IdType tracklistId, std::size_t maxCount) = 0;
 			virtual std::vector<Database::IdType> getSimilarTracks(Database::Session& session, const std::unordered_set<Database::IdType>& tracksId, std::size_t maxCount) = 0;