Auto reformatted the base, ref #470
This commit is contained in:
emeric
@@ -23,12 +23,11 @@
|
||||
|
||||
namespace lms::db
|
||||
{
|
||||
class Db;
|
||||
class Db;
|
||||
}
|
||||
|
||||
namespace lms::recommendation
|
||||
{
|
||||
class IEngine;
|
||||
std::unique_ptr<IEngine> createClustersEngine(db::Db& db);
|
||||
}
|
||||
|
||||
class IEngine;
|
||||
std::unique_ptr<IEngine> createClustersEngine(db::Db& db);
|
||||
} // namespace lms::recommendation
|
||||
|
||||
@@ -20,15 +20,15 @@
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "IEngine.hpp"
|
||||
|
||||
namespace lms::db
|
||||
{
|
||||
class Db;
|
||||
class Db;
|
||||
}
|
||||
|
||||
namespace lms::recommendation
|
||||
{
|
||||
std::unique_ptr<IEngine> createFeaturesEngine(db::Db& db);
|
||||
std::unique_ptr<IEngine> createFeaturesEngine(db::Db& db);
|
||||
}
|
||||
|
||||
|
||||
@@ -20,33 +20,33 @@
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
#include "database/Types.hpp"
|
||||
#include "database/TrackListId.hpp"
|
||||
#include "services/recommendation/Types.hpp"
|
||||
|
||||
#include "core/EnumSet.hpp"
|
||||
#include "database/TrackListId.hpp"
|
||||
#include "database/Types.hpp"
|
||||
#include "services/recommendation/Types.hpp"
|
||||
|
||||
namespace lms::db
|
||||
{
|
||||
class Db;
|
||||
class Db;
|
||||
}
|
||||
|
||||
namespace lms::recommendation
|
||||
{
|
||||
class IEngine
|
||||
{
|
||||
public:
|
||||
virtual ~IEngine() = default;
|
||||
class IEngine
|
||||
{
|
||||
public:
|
||||
virtual ~IEngine() = default;
|
||||
|
||||
virtual void load(bool forceReload, const ProgressCallback& progressCallback = {}) = 0;
|
||||
virtual void requestCancelLoad() = 0;
|
||||
virtual void load(bool forceReload, const ProgressCallback& progressCallback = {}) = 0;
|
||||
virtual void requestCancelLoad() = 0;
|
||||
|
||||
virtual TrackContainer findSimilarTracksFromTrackList(db::TrackListId tracklistId, std::size_t maxCount) const = 0;
|
||||
virtual TrackContainer findSimilarTracks(const std::vector<db::TrackId>& tracksId, std::size_t maxCount) const = 0;
|
||||
virtual ReleaseContainer getSimilarReleases(db::ReleaseId releaseId, std::size_t maxCount) const = 0;
|
||||
virtual ArtistContainer getSimilarArtists(db::ArtistId artistId, core::EnumSet<db::TrackArtistLinkType> linkTypes, std::size_t maxCount) const = 0;
|
||||
};
|
||||
virtual TrackContainer findSimilarTracksFromTrackList(db::TrackListId tracklistId, std::size_t maxCount) const = 0;
|
||||
virtual TrackContainer findSimilarTracks(const std::vector<db::TrackId>& tracksId, std::size_t maxCount) const = 0;
|
||||
virtual ReleaseContainer getSimilarReleases(db::ReleaseId releaseId, std::size_t maxCount) const = 0;
|
||||
virtual ArtistContainer getSimilarArtists(db::ArtistId artistId, core::EnumSet<db::TrackArtistLinkType> linkTypes, std::size_t maxCount) const = 0;
|
||||
};
|
||||
|
||||
std::unique_ptr<IEngine> createEngine(db::Db& db);
|
||||
|
||||
} // ns Recommendation
|
||||
std::unique_ptr<IEngine> createEngine(db::Db& db);
|
||||
|
||||
} // namespace lms::recommendation
|
||||
|
||||
@@ -19,14 +19,15 @@
|
||||
|
||||
#include "PlaylistGeneratorService.hpp"
|
||||
|
||||
#include "core/ILogger.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/Session.hpp"
|
||||
#include "database/Track.hpp"
|
||||
#include "services/recommendation/IRecommendationService.hpp"
|
||||
|
||||
#include "playlist-constraints/ConsecutiveArtists.hpp"
|
||||
#include "playlist-constraints/ConsecutiveReleases.hpp"
|
||||
#include "playlist-constraints/DuplicateTracks.hpp"
|
||||
#include "core/ILogger.hpp"
|
||||
|
||||
namespace lms::recommendation
|
||||
{
|
||||
@@ -111,4 +112,4 @@ namespace lms::recommendation
|
||||
|
||||
return tracks;
|
||||
}
|
||||
}
|
||||
} // namespace lms::recommendation
|
||||
|
||||
@@ -21,22 +21,23 @@
|
||||
|
||||
#include "services/recommendation/IPlaylistGeneratorService.hpp"
|
||||
#include "services/recommendation/IRecommendationService.hpp"
|
||||
|
||||
#include "playlist-constraints/IConstraint.hpp"
|
||||
|
||||
namespace lms::recommendation
|
||||
{
|
||||
class PlaylistGeneratorService : public IPlaylistGeneratorService
|
||||
{
|
||||
public:
|
||||
PlaylistGeneratorService(db::Db& db, IRecommendationService& recommendationService);
|
||||
class PlaylistGeneratorService : public IPlaylistGeneratorService
|
||||
{
|
||||
public:
|
||||
PlaylistGeneratorService(db::Db& db, IRecommendationService& recommendationService);
|
||||
|
||||
private:
|
||||
TrackContainer extendPlaylist(db::TrackListId tracklistId, std::size_t maxCount) const override;
|
||||
private:
|
||||
TrackContainer extendPlaylist(db::TrackListId tracklistId, std::size_t maxCount) const override;
|
||||
|
||||
TrackContainer getTracksFromTrackList(db::TrackListId tracklistId) const;
|
||||
TrackContainer getTracksFromTrackList(db::TrackListId tracklistId) const;
|
||||
|
||||
db::Db& _db;
|
||||
IRecommendationService& _recommendationService;
|
||||
std::vector<std::unique_ptr<PlaylistGeneratorConstraint::IConstraint>> _constraints;
|
||||
};
|
||||
} // namespace Radio
|
||||
db::Db& _db;
|
||||
IRecommendationService& _recommendationService;
|
||||
std::vector<std::unique_ptr<PlaylistGeneratorConstraint::IConstraint>> _constraints;
|
||||
};
|
||||
} // namespace lms::recommendation
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include "ClustersEngineCreator.hpp"
|
||||
#include "FeaturesEngineCreator.hpp"
|
||||
|
||||
#include "database/Db.hpp"
|
||||
#include "database/Session.hpp"
|
||||
#include "database/ScanSettings.hpp"
|
||||
#include "core/Exception.hpp"
|
||||
#include "core/ILogger.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/ScanSettings.hpp"
|
||||
#include "database/Session.hpp"
|
||||
|
||||
#include "ClustersEngineCreator.hpp"
|
||||
#include "FeaturesEngineCreator.hpp"
|
||||
|
||||
namespace lms::recommendation
|
||||
{
|
||||
@@ -41,7 +41,7 @@ namespace lms::recommendation
|
||||
|
||||
return db::ScanSettings::get(session)->getSimilarityEngineType();
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
|
||||
std::unique_ptr<IRecommendationService> createRecommendationService(db::Db& db)
|
||||
{
|
||||
@@ -81,7 +81,8 @@ namespace lms::recommendation
|
||||
if (!_engine)
|
||||
return res;
|
||||
|
||||
return _engine->getSimilarReleases(releaseId, maxCount);;
|
||||
return _engine->getSimilarReleases(releaseId, maxCount);
|
||||
;
|
||||
}
|
||||
|
||||
ArtistContainer RecommendationService::getSimilarArtists(db::ArtistId artistId, core::EnumSet<db::TrackArtistLinkType> linkTypes, std::size_t maxCount) const
|
||||
@@ -120,4 +121,4 @@ namespace lms::recommendation
|
||||
if (_engine)
|
||||
_engine->load(false);
|
||||
}
|
||||
} // ns Similarity
|
||||
} // namespace lms::recommendation
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <optional>
|
||||
|
||||
#include "services/recommendation/IRecommendationService.hpp"
|
||||
|
||||
#include "IEngine.hpp"
|
||||
|
||||
namespace lms::db
|
||||
@@ -63,5 +64,4 @@ namespace lms::recommendation
|
||||
std::unique_ptr<IEngine> _engine;
|
||||
};
|
||||
|
||||
} // ns Recommendation
|
||||
|
||||
} // namespace lms::recommendation
|
||||
|
||||
@@ -27,7 +27,8 @@
|
||||
#include "database/Track.hpp"
|
||||
#include "database/TrackList.hpp"
|
||||
|
||||
namespace lms::recommendation {
|
||||
namespace lms::recommendation
|
||||
{
|
||||
|
||||
using namespace db;
|
||||
|
||||
@@ -44,7 +45,7 @@ namespace lms::recommendation {
|
||||
Session& dbSession{ _db.getTLSSession() };
|
||||
auto transaction{ dbSession.createReadTransaction() };
|
||||
|
||||
const auto similarTrackIds{ Track::findSimilarTrackIds(dbSession, trackIds, Range {0, maxCount}) };
|
||||
const auto similarTrackIds{ Track::findSimilarTrackIds(dbSession, trackIds, Range{ 0, maxCount }) };
|
||||
return std::move(similarTrackIds.results);
|
||||
}
|
||||
|
||||
@@ -104,7 +105,7 @@ namespace lms::recommendation {
|
||||
if (!artist)
|
||||
return {};
|
||||
|
||||
const auto similarArtistIds{ artist->findSimilarArtistIds(artistLinkTypes, Range {0, maxCount}) };
|
||||
const auto similarArtistIds{ artist->findSimilarArtistIds(artistLinkTypes, Range{ 0, maxCount }) };
|
||||
return std::move(similarArtistIds.results);
|
||||
}
|
||||
|
||||
|
||||
@@ -24,27 +24,27 @@
|
||||
namespace lms::recommendation
|
||||
{
|
||||
|
||||
class ClusterEngine : public IEngine
|
||||
{
|
||||
public:
|
||||
ClusterEngine(db::Db& db) : _db {db} {}
|
||||
class ClusterEngine : public IEngine
|
||||
{
|
||||
public:
|
||||
ClusterEngine(db::Db& db)
|
||||
: _db{ db } {}
|
||||
|
||||
ClusterEngine(const ClusterEngine&) = delete;
|
||||
ClusterEngine(ClusterEngine&&) = delete;
|
||||
ClusterEngine& operator=(const ClusterEngine&) = delete;
|
||||
ClusterEngine& operator=(ClusterEngine&&) = delete;
|
||||
ClusterEngine(const ClusterEngine&) = delete;
|
||||
ClusterEngine(ClusterEngine&&) = delete;
|
||||
ClusterEngine& operator=(const ClusterEngine&) = delete;
|
||||
ClusterEngine& operator=(ClusterEngine&&) = delete;
|
||||
|
||||
private:
|
||||
void load(bool, const ProgressCallback&) override {}
|
||||
void requestCancelLoad() override {}
|
||||
private:
|
||||
void load(bool, const ProgressCallback&) override {}
|
||||
void requestCancelLoad() override {}
|
||||
|
||||
TrackContainer findSimilarTracksFromTrackList(db::TrackListId tracklistId, std::size_t maxCount) const override;
|
||||
TrackContainer findSimilarTracks(const std::vector<db::TrackId>& tracksId, std::size_t maxCount) const override;
|
||||
ReleaseContainer getSimilarReleases(db::ReleaseId releaseId, std::size_t maxCount) const override;
|
||||
ArtistContainer getSimilarArtists(db::ArtistId artistId, core::EnumSet<db::TrackArtistLinkType> linkTypes, std::size_t maxCount) const override;
|
||||
TrackContainer findSimilarTracksFromTrackList(db::TrackListId tracklistId, std::size_t maxCount) const override;
|
||||
TrackContainer findSimilarTracks(const std::vector<db::TrackId>& tracksId, std::size_t maxCount) const override;
|
||||
ReleaseContainer getSimilarReleases(db::ReleaseId releaseId, std::size_t maxCount) const override;
|
||||
ArtistContainer getSimilarArtists(db::ArtistId artistId, core::EnumSet<db::TrackArtistLinkType> linkTypes, std::size_t maxCount) const override;
|
||||
|
||||
db::Db& _db;
|
||||
};
|
||||
db::Db& _db;
|
||||
};
|
||||
|
||||
} // namespace lms::recommendation
|
||||
|
||||
|
||||
@@ -24,370 +24,367 @@
|
||||
|
||||
#include "core/Exception.hpp"
|
||||
|
||||
namespace lms::recommendation {
|
||||
|
||||
static const std::unordered_map<FeatureName, FeatureDef> featureDefinitions
|
||||
namespace lms::recommendation
|
||||
{
|
||||
{ "lowlevel.average_loudness", {1}},
|
||||
{ "lowlevel.barkbands.dmean", {27}},
|
||||
{ "lowlevel.barkbands.dmean2", {27}},
|
||||
{ "lowlevel.barkbands.dvar", {27}},
|
||||
{ "lowlevel.barkbands.dvar2", {27}},
|
||||
{ "lowlevel.barkbands.max", {27}},
|
||||
{ "lowlevel.barkbands.mean", {27}},
|
||||
{ "lowlevel.barkbands.median", {27}},
|
||||
{ "lowlevel.barkbands.min", {27}},
|
||||
{ "lowlevel.barkbands.var", {27}},
|
||||
{ "lowlevel.barkbands_crest.dmean", {1}},
|
||||
{ "lowlevel.barkbands_crest.dmean2", {1}},
|
||||
{ "lowlevel.barkbands_crest.dvar", {1}},
|
||||
{ "lowlevel.barkbands_crest.dvar2", {1}},
|
||||
{ "lowlevel.barkbands_crest.max", {1}},
|
||||
{ "lowlevel.barkbands_crest.mean", {1}},
|
||||
{ "lowlevel.barkbands_crest.median", {1}},
|
||||
{ "lowlevel.barkbands_crest.min", {1}},
|
||||
{ "lowlevel.barkbands_crest.var", {1}},
|
||||
{ "lowlevel.barkbands_flatness_db.dmean", {1}},
|
||||
{ "lowlevel.barkbands_flatness_db.dmean2", {1}},
|
||||
{ "lowlevel.barkbands_flatness_db.dvar", {1}},
|
||||
{ "lowlevel.barkbands_flatness_db.dvar2", {1}},
|
||||
{ "lowlevel.barkbands_flatness_db.max", {1}},
|
||||
{ "lowlevel.barkbands_flatness_db.mean", {1}},
|
||||
{ "lowlevel.barkbands_flatness_db.median", {1}},
|
||||
{ "lowlevel.barkbands_flatness_db.min", {1}},
|
||||
{ "lowlevel.barkbands_flatness_db.var", {1}},
|
||||
{ "lowlevel.barkbands_kurtosis.dmean", {1}},
|
||||
{ "lowlevel.barkbands_kurtosis.dmean2", {1}},
|
||||
{ "lowlevel.barkbands_kurtosis.dvar", {1}},
|
||||
{ "lowlevel.barkbands_kurtosis.dvar2", {1}},
|
||||
{ "lowlevel.barkbands_kurtosis.max", {1}},
|
||||
{ "lowlevel.barkbands_kurtosis.mean", {1}},
|
||||
{ "lowlevel.barkbands_kurtosis.median", {1}},
|
||||
{ "lowlevel.barkbands_kurtosis.min", {1}},
|
||||
{ "lowlevel.barkbands_kurtosis.var", {1}},
|
||||
{ "lowlevel.barkbands_skewness.dmean", {1}},
|
||||
{ "lowlevel.barkbands_skewness.dmean2", {1}},
|
||||
{ "lowlevel.barkbands_skewness.dvar", {1}},
|
||||
{ "lowlevel.barkbands_skewness.dvar2", {1}},
|
||||
{ "lowlevel.barkbands_skewness.max", {1}},
|
||||
{ "lowlevel.barkbands_skewness.mean", {1}},
|
||||
{ "lowlevel.barkbands_skewness.median", {1}},
|
||||
{ "lowlevel.barkbands_skewness.min", {1}},
|
||||
{ "lowlevel.barkbands_skewness.var", {1}},
|
||||
{ "lowlevel.barkbands_spread.dmean", {1}},
|
||||
{ "lowlevel.barkbands_spread.dmean2", {1}},
|
||||
{ "lowlevel.barkbands_spread.dvar", {1}},
|
||||
{ "lowlevel.barkbands_spread.dvar2", {1}},
|
||||
{ "lowlevel.barkbands_spread.max", {1}},
|
||||
{ "lowlevel.barkbands_spread.mean", {1}},
|
||||
{ "lowlevel.barkbands_spread.median", {1}},
|
||||
{ "lowlevel.barkbands_spread.min", {1}},
|
||||
{ "lowlevel.barkbands_spread.var", {1}},
|
||||
{ "lowlevel.dissonance.dmean", {1}},
|
||||
{ "lowlevel.dissonance.dmean2", {1}},
|
||||
{ "lowlevel.dissonance.dvar", {1}},
|
||||
{ "lowlevel.dissonance.dvar2", {1}},
|
||||
{ "lowlevel.dissonance.max", {1}},
|
||||
{ "lowlevel.dissonance.mean", {1}},
|
||||
{ "lowlevel.dissonance.median", {1}},
|
||||
{ "lowlevel.dissonance.min", {1}},
|
||||
{ "lowlevel.dissonance.var", {1}},
|
||||
{ "lowlevel.dynamic_complexity", {1}},
|
||||
{ "lowlevel.erbbands.dmean", {40}},
|
||||
{ "lowlevel.erbbands.dmean2", {40}},
|
||||
{ "lowlevel.erbbands.dvar", {40}},
|
||||
{ "lowlevel.erbbands.dvar2", {40}},
|
||||
{ "lowlevel.erbbands.max", {40}},
|
||||
{ "lowlevel.erbbands.mean", {40}},
|
||||
{ "lowlevel.erbbands.median", {40}},
|
||||
{ "lowlevel.erbbands.min", {40}},
|
||||
{ "lowlevel.erbbands.var", {40}},
|
||||
{ "lowlevel.gfcc.mean", {13}},
|
||||
{ "lowlevel.hfc.dmean", {1}},
|
||||
{ "lowlevel.hfc.dmean2", {1}},
|
||||
{ "lowlevel.hfc.dvar", {1}},
|
||||
{ "lowlevel.hfc.dvar2", {1}},
|
||||
{ "lowlevel.hfc.max", {1}},
|
||||
{ "lowlevel.hfc.mean", {1}},
|
||||
{ "lowlevel.hfc.median", {1}},
|
||||
{ "lowlevel.hfc.min", {1}},
|
||||
{ "lowlevel.hfc.var", {1}},
|
||||
{ "tonal.hpcp.median", {36}},
|
||||
{ "lowlevel.melbands.dmean", {40}},
|
||||
{ "lowlevel.melbands.dmean2", {40}},
|
||||
{ "lowlevel.melbands.dvar", {40}},
|
||||
{ "lowlevel.melbands.dvar2", {40}},
|
||||
{ "lowlevel.melbands.max", {40}},
|
||||
{ "lowlevel.melbands.mean", {40}},
|
||||
{ "lowlevel.melbands.median", {40}},
|
||||
{ "lowlevel.melbands.min", {40}},
|
||||
{ "lowlevel.melbands.var", {40}},
|
||||
{ "lowlevel.melbands_crest.dmean", {1}},
|
||||
{ "lowlevel.melbands_crest.dmean2", {1}},
|
||||
{ "lowlevel.melbands_crest.dvar", {1}},
|
||||
{ "lowlevel.melbands_crest.dvar2", {1}},
|
||||
{ "lowlevel.melbands_crest.max", {1}},
|
||||
{ "lowlevel.melbands_crest.mean", {1}},
|
||||
{ "lowlevel.melbands_crest.median", {1}},
|
||||
{ "lowlevel.melbands_crest.min", {1}},
|
||||
{ "lowlevel.melbands_crest.var", {1}},
|
||||
{ "lowlevel.melbands_flatness_db.dmean", {1}},
|
||||
{ "lowlevel.melbands_flatness_db.dmean2", {1}},
|
||||
{ "lowlevel.melbands_flatness_db.dvar", {1}},
|
||||
{ "lowlevel.melbands_flatness_db.dvar2", {1}},
|
||||
{ "lowlevel.melbands_flatness_db.max", {1}},
|
||||
{ "lowlevel.melbands_flatness_db.mean", {1}},
|
||||
{ "lowlevel.melbands_flatness_db.median", {1}},
|
||||
{ "lowlevel.melbands_flatness_db.min", {1}},
|
||||
{ "lowlevel.melbands_flatness_db.var", {1}},
|
||||
{ "lowlevel.melbands_kurtosis.dmean", {1}},
|
||||
{ "lowlevel.melbands_kurtosis.dmean2", {1}},
|
||||
{ "lowlevel.melbands_kurtosis.dvar", {1}},
|
||||
{ "lowlevel.melbands_kurtosis.dvar2", {1}},
|
||||
{ "lowlevel.melbands_kurtosis.max", {1}},
|
||||
{ "lowlevel.melbands_kurtosis.mean", {1}},
|
||||
{ "lowlevel.melbands_kurtosis.median", {1}},
|
||||
{ "lowlevel.melbands_kurtosis.min", {1}},
|
||||
{ "lowlevel.melbands_kurtosis.var", {1}},
|
||||
{ "lowlevel.melbands_skewness.dmean", {1}},
|
||||
{ "lowlevel.melbands_skewness.dmean2", {1}},
|
||||
{ "lowlevel.melbands_skewness.dvar", {1}},
|
||||
{ "lowlevel.melbands_skewness.dvar2", {1}},
|
||||
{ "lowlevel.melbands_skewness.max", {1}},
|
||||
{ "lowlevel.melbands_skewness.mean", {1}},
|
||||
{ "lowlevel.melbands_skewness.median", {1}},
|
||||
{ "lowlevel.melbands_skewness.min", {1}},
|
||||
{ "lowlevel.melbands_skewness.var", {1}},
|
||||
{ "lowlevel.melbands_spread.dmean", {1}},
|
||||
{ "lowlevel.melbands_spread.dmean2", {1}},
|
||||
{ "lowlevel.melbands_spread.dvar", {1}},
|
||||
{ "lowlevel.melbands_spread.dvar2", {1}},
|
||||
{ "lowlevel.melbands_spread.max", {1}},
|
||||
{ "lowlevel.melbands_spread.mean", {1}},
|
||||
{ "lowlevel.melbands_spread.median", {1}},
|
||||
{ "lowlevel.melbands_spread.min", {1}},
|
||||
{ "lowlevel.melbands_spread.var", {1}},
|
||||
{ "lowlevel.mfcc.mean", {13}},
|
||||
{ "lowlevel.pitch_salience.dmean", {1}},
|
||||
{ "lowlevel.pitch_salience.dmean2", {1}},
|
||||
{ "lowlevel.pitch_salience.dvar", {1}},
|
||||
{ "lowlevel.pitch_salience.dvar2", {1}},
|
||||
{ "lowlevel.pitch_salience.max", {1}},
|
||||
{ "lowlevel.pitch_salience.mean", {1}},
|
||||
{ "lowlevel.pitch_salience.median", {1}},
|
||||
{ "lowlevel.pitch_salience.min", {1}},
|
||||
{ "lowlevel.pitch_salience.var", {1}},
|
||||
{ "lowlevel.silence_rate_30dB.dmean", {1}},
|
||||
{ "lowlevel.silence_rate_30dB.dmean2", {1}},
|
||||
{ "lowlevel.silence_rate_30dB.dvar", {1}},
|
||||
{ "lowlevel.silence_rate_30dB.dvar2", {1}},
|
||||
{ "lowlevel.silence_rate_30dB.max", {1}},
|
||||
{ "lowlevel.silence_rate_30dB.mean", {1}},
|
||||
{ "lowlevel.silence_rate_30dB.median", {1}},
|
||||
{ "lowlevel.silence_rate_30dB.min", {1}},
|
||||
{ "lowlevel.silence_rate_30dB.var", {1}},
|
||||
{ "lowlevel.silence_rate_60dB.dmean", {1}},
|
||||
{ "lowlevel.silence_rate_60dB.dmean2", {1}},
|
||||
{ "lowlevel.silence_rate_60dB.dvar", {1}},
|
||||
{ "lowlevel.silence_rate_60dB.dvar2", {1}},
|
||||
{ "lowlevel.silence_rate_60dB.max", {1}},
|
||||
{ "lowlevel.silence_rate_60dB.mean", {1}},
|
||||
{ "lowlevel.silence_rate_60dB.median", {1}},
|
||||
{ "lowlevel.silence_rate_60dB.min", {1}},
|
||||
{ "lowlevel.silence_rate_60dB.var", {1}},
|
||||
{ "lowlevel.spectral_centroid.dmean", {1}},
|
||||
{ "lowlevel.spectral_centroid.dmean2", {1}},
|
||||
{ "lowlevel.spectral_centroid.dvar", {1}},
|
||||
{ "lowlevel.spectral_centroid.dvar2", {1}},
|
||||
{ "lowlevel.spectral_centroid.max", {1}},
|
||||
{ "lowlevel.spectral_centroid.mean", {1}},
|
||||
{ "lowlevel.spectral_centroid.median", {1}},
|
||||
{ "lowlevel.spectral_centroid.min", {1}},
|
||||
{ "lowlevel.spectral_centroid.var", {1}},
|
||||
{ "lowlevel.spectral_complexity.dmean", {1}},
|
||||
{ "lowlevel.spectral_complexity.dmean2", {1}},
|
||||
{ "lowlevel.spectral_complexity.dvar", {1}},
|
||||
{ "lowlevel.spectral_complexity.dvar2", {1}},
|
||||
{ "lowlevel.spectral_complexity.max", {1}},
|
||||
{ "lowlevel.spectral_complexity.mean", {1}},
|
||||
{ "lowlevel.spectral_complexity.median", {1}},
|
||||
{ "lowlevel.spectral_complexity.min", {1}},
|
||||
{ "lowlevel.spectral_complexity.var", {1}},
|
||||
{ "lowlevel.spectral_contrast_coeffs.dmean", {6}},
|
||||
{ "lowlevel.spectral_contrast_coeffs.dmean2", {6}},
|
||||
{ "lowlevel.spectral_contrast_coeffs.dvar", {6}},
|
||||
{ "lowlevel.spectral_contrast_coeffs.dvar2", {6}},
|
||||
{ "lowlevel.spectral_contrast_coeffs.max", {6}},
|
||||
{ "lowlevel.spectral_contrast_coeffs.mean", {6}},
|
||||
{ "lowlevel.spectral_contrast_coeffs.median", {6}},
|
||||
{ "lowlevel.spectral_contrast_coeffs.min", {6}},
|
||||
{ "lowlevel.spectral_contrast_coeffs.var", {6}},
|
||||
{ "lowlevel.spectral_contrast_valleys.dmean", {6}},
|
||||
{ "lowlevel.spectral_contrast_valleys.dmean2", {6}},
|
||||
{ "lowlevel.spectral_contrast_valleys.dvar", {6}},
|
||||
{ "lowlevel.spectral_contrast_valleys.dvar2", {6}},
|
||||
{ "lowlevel.spectral_contrast_valleys.max", {6}},
|
||||
{ "lowlevel.spectral_contrast_valleys.mean", {6}},
|
||||
{ "lowlevel.spectral_contrast_valleys.median", {6}},
|
||||
{ "lowlevel.spectral_contrast_valleys.min", {6}},
|
||||
{ "lowlevel.spectral_contrast_valleys.var", {6}},
|
||||
{ "lowlevel.spectral_decrease.dmean", {1}},
|
||||
{ "lowlevel.spectral_decrease.dmean2", {1}},
|
||||
{ "lowlevel.spectral_decrease.dvar", {1}},
|
||||
{ "lowlevel.spectral_decrease.dvar2", {1}},
|
||||
{ "lowlevel.spectral_decrease.max", {1}},
|
||||
{ "lowlevel.spectral_decrease.mean", {1}},
|
||||
{ "lowlevel.spectral_decrease.median", {1}},
|
||||
{ "lowlevel.spectral_decrease.min", {1}},
|
||||
{ "lowlevel.spectral_decrease.var", {1}},
|
||||
{ "lowlevel.spectral_energy.dmean", {1}},
|
||||
{ "lowlevel.spectral_energy.dmean2", {1}},
|
||||
{ "lowlevel.spectral_energy.dvar", {1}},
|
||||
{ "lowlevel.spectral_energy.dvar2", {1}},
|
||||
{ "lowlevel.spectral_energy.max", {1}},
|
||||
{ "lowlevel.spectral_energy.mean", {1}},
|
||||
{ "lowlevel.spectral_energy.median", {1}},
|
||||
{ "lowlevel.spectral_energy.min", {1}},
|
||||
{ "lowlevel.spectral_energy.var", {1}},
|
||||
{ "lowlevel.spectral_energyband_high.dmean", {1}},
|
||||
{ "lowlevel.spectral_energyband_high.dmean2", {1}},
|
||||
{ "lowlevel.spectral_energyband_high.dvar", {1}},
|
||||
{ "lowlevel.spectral_energyband_high.dvar2", {1}},
|
||||
{ "lowlevel.spectral_energyband_high.max", {1}},
|
||||
{ "lowlevel.spectral_energyband_high.mean", {1}},
|
||||
{ "lowlevel.spectral_energyband_high.median", {1}},
|
||||
{ "lowlevel.spectral_energyband_high.min", {1}},
|
||||
{ "lowlevel.spectral_energyband_high.var", {1}},
|
||||
{ "lowlevel.spectral_energyband_low.dmean", {1}},
|
||||
{ "lowlevel.spectral_energyband_low.dmean2", {1}},
|
||||
{ "lowlevel.spectral_energyband_low.dvar", {1}},
|
||||
{ "lowlevel.spectral_energyband_low.dvar2", {1}},
|
||||
{ "lowlevel.spectral_energyband_low.max", {1}},
|
||||
{ "lowlevel.spectral_energyband_low.mean", {1}},
|
||||
{ "lowlevel.spectral_energyband_low.median", {1}},
|
||||
{ "lowlevel.spectral_energyband_low.min", {1}},
|
||||
{ "lowlevel.spectral_energyband_low.var", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_high.dmean", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_high.dmean2", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_high.dvar", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_high.dvar2", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_high.max", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_high.mean", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_high.median", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_high.min", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_high.var", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_low.dmean", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_low.dmean2", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_low.dvar", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_low.dvar2", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_low.max", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_low.mean", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_low.median", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_low.min", {1}},
|
||||
{ "lowlevel.spectral_energyband_middle_low.var", {1}},
|
||||
{ "lowlevel.spectral_entropy.dmean", {1}},
|
||||
{ "lowlevel.spectral_entropy.dmean2", {1}},
|
||||
{ "lowlevel.spectral_entropy.dvar", {1}},
|
||||
{ "lowlevel.spectral_entropy.dvar2", {1}},
|
||||
{ "lowlevel.spectral_entropy.max", {1}},
|
||||
{ "lowlevel.spectral_entropy.mean", {1}},
|
||||
{ "lowlevel.spectral_entropy.median", {1}},
|
||||
{ "lowlevel.spectral_entropy.min", {1}},
|
||||
{ "lowlevel.spectral_entropy.var", {1}},
|
||||
{ "lowlevel.spectral_flux.dmean", {1}},
|
||||
{ "lowlevel.spectral_flux.dmean2", {1}},
|
||||
{ "lowlevel.spectral_flux.dvar", {1}},
|
||||
{ "lowlevel.spectral_flux.dvar2", {1}},
|
||||
{ "lowlevel.spectral_flux.max", {1}},
|
||||
{ "lowlevel.spectral_flux.mean", {1}},
|
||||
{ "lowlevel.spectral_flux.median", {1}},
|
||||
{ "lowlevel.spectral_flux.min", {1}},
|
||||
{ "lowlevel.spectral_flux.var", {1}},
|
||||
{ "lowlevel.spectral_kurtosis.dmean", {1}},
|
||||
{ "lowlevel.spectral_kurtosis.dmean2", {1}},
|
||||
{ "lowlevel.spectral_kurtosis.dvar", {1}},
|
||||
{ "lowlevel.spectral_kurtosis.dvar2", {1}},
|
||||
{ "lowlevel.spectral_kurtosis.max", {1}},
|
||||
{ "lowlevel.spectral_kurtosis.mean", {1}},
|
||||
{ "lowlevel.spectral_kurtosis.median", {1}},
|
||||
{ "lowlevel.spectral_kurtosis.min", {1}},
|
||||
{ "lowlevel.spectral_kurtosis.var", {1}},
|
||||
{ "lowlevel.spectral_rms.dmean", {1}},
|
||||
{ "lowlevel.spectral_rms.dmean2", {1}},
|
||||
{ "lowlevel.spectral_rms.dvar", {1}},
|
||||
{ "lowlevel.spectral_rms.dvar2", {1}},
|
||||
{ "lowlevel.spectral_rms.max", {1}},
|
||||
{ "lowlevel.spectral_rms.mean", {1}},
|
||||
{ "lowlevel.spectral_rms.median", {1}},
|
||||
{ "lowlevel.spectral_rms.min", {1}},
|
||||
{ "lowlevel.spectral_rms.var", {1}},
|
||||
{ "lowlevel.spectral_rolloff.dmean", {1}},
|
||||
{ "lowlevel.spectral_rolloff.dmean2", {1}},
|
||||
{ "lowlevel.spectral_rolloff.dvar", {1}},
|
||||
{ "lowlevel.spectral_rolloff.dvar2", {1}},
|
||||
{ "lowlevel.spectral_rolloff.max", {1}},
|
||||
{ "lowlevel.spectral_rolloff.mean", {1}},
|
||||
{ "lowlevel.spectral_rolloff.median", {1}},
|
||||
{ "lowlevel.spectral_rolloff.min", {1}},
|
||||
{ "lowlevel.spectral_rolloff.var", {1}},
|
||||
{ "lowlevel.spectral_skewness.dmean", {1}},
|
||||
{ "lowlevel.spectral_skewness.dmean2", {1}},
|
||||
{ "lowlevel.spectral_skewness.dvar", {1}},
|
||||
{ "lowlevel.spectral_skewness.dvar2", {1}},
|
||||
{ "lowlevel.spectral_skewness.max", {1}},
|
||||
{ "lowlevel.spectral_skewness.mean", {1}},
|
||||
{ "lowlevel.spectral_skewness.median", {1}},
|
||||
{ "lowlevel.spectral_skewness.min", {1}},
|
||||
{ "lowlevel.spectral_skewness.var", {1}},
|
||||
{ "lowlevel.spectral_spread.dmean", {1}},
|
||||
{ "lowlevel.spectral_spread.dmean2", {1}},
|
||||
{ "lowlevel.spectral_spread.dvar", {1}},
|
||||
{ "lowlevel.spectral_spread.dvar2", {1}},
|
||||
{ "lowlevel.spectral_spread.max", {1}},
|
||||
{ "lowlevel.spectral_spread.mean", {1}},
|
||||
{ "lowlevel.spectral_spread.median", {1}},
|
||||
{ "lowlevel.spectral_spread.min", {1}},
|
||||
{ "lowlevel.spectral_spread.var", {1}},
|
||||
{ "lowlevel.spectral_strongpeak.dmean", {1}},
|
||||
{ "lowlevel.spectral_strongpeak.dmean2", {1}},
|
||||
{ "lowlevel.spectral_strongpeak.dvar", {1}},
|
||||
{ "lowlevel.spectral_strongpeak.dvar2", {1}},
|
||||
{ "lowlevel.spectral_strongpeak.max", {1}},
|
||||
{ "lowlevel.spectral_strongpeak.mean", {1}},
|
||||
{ "lowlevel.spectral_strongpeak.median", {1}},
|
||||
{ "lowlevel.spectral_strongpeak.min", {1}},
|
||||
{ "lowlevel.spectral_strongpeak.var", {1}},
|
||||
{ "lowlevel.zerocrossingrate.dmean", {1}},
|
||||
{ "lowlevel.zerocrossingrate.dmean2", {1}},
|
||||
{ "lowlevel.zerocrossingrate.dvar", {1}},
|
||||
{ "lowlevel.zerocrossingrate.dvar2", {1}},
|
||||
{ "lowlevel.zerocrossingrate.max", {1}},
|
||||
{ "lowlevel.zerocrossingrate.mean", {1}},
|
||||
{ "lowlevel.zerocrossingrate.median", {1}},
|
||||
{ "lowlevel.zerocrossingrate.min", {1}},
|
||||
{ "lowlevel.zerocrossingrate.var", {1}},
|
||||
};
|
||||
|
||||
FeatureDef
|
||||
getFeatureDef(const FeatureName& featureName)
|
||||
{
|
||||
auto it {featureDefinitions.find(featureName)};
|
||||
if (it == std::cend(featureDefinitions))
|
||||
throw core::LmsException {"Unhandled requested feature '" + featureName + "'"};
|
||||
static const std::unordered_map<FeatureName, FeatureDef> featureDefinitions{
|
||||
{ "lowlevel.average_loudness", { 1 } },
|
||||
{ "lowlevel.barkbands.dmean", { 27 } },
|
||||
{ "lowlevel.barkbands.dmean2", { 27 } },
|
||||
{ "lowlevel.barkbands.dvar", { 27 } },
|
||||
{ "lowlevel.barkbands.dvar2", { 27 } },
|
||||
{ "lowlevel.barkbands.max", { 27 } },
|
||||
{ "lowlevel.barkbands.mean", { 27 } },
|
||||
{ "lowlevel.barkbands.median", { 27 } },
|
||||
{ "lowlevel.barkbands.min", { 27 } },
|
||||
{ "lowlevel.barkbands.var", { 27 } },
|
||||
{ "lowlevel.barkbands_crest.dmean", { 1 } },
|
||||
{ "lowlevel.barkbands_crest.dmean2", { 1 } },
|
||||
{ "lowlevel.barkbands_crest.dvar", { 1 } },
|
||||
{ "lowlevel.barkbands_crest.dvar2", { 1 } },
|
||||
{ "lowlevel.barkbands_crest.max", { 1 } },
|
||||
{ "lowlevel.barkbands_crest.mean", { 1 } },
|
||||
{ "lowlevel.barkbands_crest.median", { 1 } },
|
||||
{ "lowlevel.barkbands_crest.min", { 1 } },
|
||||
{ "lowlevel.barkbands_crest.var", { 1 } },
|
||||
{ "lowlevel.barkbands_flatness_db.dmean", { 1 } },
|
||||
{ "lowlevel.barkbands_flatness_db.dmean2", { 1 } },
|
||||
{ "lowlevel.barkbands_flatness_db.dvar", { 1 } },
|
||||
{ "lowlevel.barkbands_flatness_db.dvar2", { 1 } },
|
||||
{ "lowlevel.barkbands_flatness_db.max", { 1 } },
|
||||
{ "lowlevel.barkbands_flatness_db.mean", { 1 } },
|
||||
{ "lowlevel.barkbands_flatness_db.median", { 1 } },
|
||||
{ "lowlevel.barkbands_flatness_db.min", { 1 } },
|
||||
{ "lowlevel.barkbands_flatness_db.var", { 1 } },
|
||||
{ "lowlevel.barkbands_kurtosis.dmean", { 1 } },
|
||||
{ "lowlevel.barkbands_kurtosis.dmean2", { 1 } },
|
||||
{ "lowlevel.barkbands_kurtosis.dvar", { 1 } },
|
||||
{ "lowlevel.barkbands_kurtosis.dvar2", { 1 } },
|
||||
{ "lowlevel.barkbands_kurtosis.max", { 1 } },
|
||||
{ "lowlevel.barkbands_kurtosis.mean", { 1 } },
|
||||
{ "lowlevel.barkbands_kurtosis.median", { 1 } },
|
||||
{ "lowlevel.barkbands_kurtosis.min", { 1 } },
|
||||
{ "lowlevel.barkbands_kurtosis.var", { 1 } },
|
||||
{ "lowlevel.barkbands_skewness.dmean", { 1 } },
|
||||
{ "lowlevel.barkbands_skewness.dmean2", { 1 } },
|
||||
{ "lowlevel.barkbands_skewness.dvar", { 1 } },
|
||||
{ "lowlevel.barkbands_skewness.dvar2", { 1 } },
|
||||
{ "lowlevel.barkbands_skewness.max", { 1 } },
|
||||
{ "lowlevel.barkbands_skewness.mean", { 1 } },
|
||||
{ "lowlevel.barkbands_skewness.median", { 1 } },
|
||||
{ "lowlevel.barkbands_skewness.min", { 1 } },
|
||||
{ "lowlevel.barkbands_skewness.var", { 1 } },
|
||||
{ "lowlevel.barkbands_spread.dmean", { 1 } },
|
||||
{ "lowlevel.barkbands_spread.dmean2", { 1 } },
|
||||
{ "lowlevel.barkbands_spread.dvar", { 1 } },
|
||||
{ "lowlevel.barkbands_spread.dvar2", { 1 } },
|
||||
{ "lowlevel.barkbands_spread.max", { 1 } },
|
||||
{ "lowlevel.barkbands_spread.mean", { 1 } },
|
||||
{ "lowlevel.barkbands_spread.median", { 1 } },
|
||||
{ "lowlevel.barkbands_spread.min", { 1 } },
|
||||
{ "lowlevel.barkbands_spread.var", { 1 } },
|
||||
{ "lowlevel.dissonance.dmean", { 1 } },
|
||||
{ "lowlevel.dissonance.dmean2", { 1 } },
|
||||
{ "lowlevel.dissonance.dvar", { 1 } },
|
||||
{ "lowlevel.dissonance.dvar2", { 1 } },
|
||||
{ "lowlevel.dissonance.max", { 1 } },
|
||||
{ "lowlevel.dissonance.mean", { 1 } },
|
||||
{ "lowlevel.dissonance.median", { 1 } },
|
||||
{ "lowlevel.dissonance.min", { 1 } },
|
||||
{ "lowlevel.dissonance.var", { 1 } },
|
||||
{ "lowlevel.dynamic_complexity", { 1 } },
|
||||
{ "lowlevel.erbbands.dmean", { 40 } },
|
||||
{ "lowlevel.erbbands.dmean2", { 40 } },
|
||||
{ "lowlevel.erbbands.dvar", { 40 } },
|
||||
{ "lowlevel.erbbands.dvar2", { 40 } },
|
||||
{ "lowlevel.erbbands.max", { 40 } },
|
||||
{ "lowlevel.erbbands.mean", { 40 } },
|
||||
{ "lowlevel.erbbands.median", { 40 } },
|
||||
{ "lowlevel.erbbands.min", { 40 } },
|
||||
{ "lowlevel.erbbands.var", { 40 } },
|
||||
{ "lowlevel.gfcc.mean", { 13 } },
|
||||
{ "lowlevel.hfc.dmean", { 1 } },
|
||||
{ "lowlevel.hfc.dmean2", { 1 } },
|
||||
{ "lowlevel.hfc.dvar", { 1 } },
|
||||
{ "lowlevel.hfc.dvar2", { 1 } },
|
||||
{ "lowlevel.hfc.max", { 1 } },
|
||||
{ "lowlevel.hfc.mean", { 1 } },
|
||||
{ "lowlevel.hfc.median", { 1 } },
|
||||
{ "lowlevel.hfc.min", { 1 } },
|
||||
{ "lowlevel.hfc.var", { 1 } },
|
||||
{ "tonal.hpcp.median", { 36 } },
|
||||
{ "lowlevel.melbands.dmean", { 40 } },
|
||||
{ "lowlevel.melbands.dmean2", { 40 } },
|
||||
{ "lowlevel.melbands.dvar", { 40 } },
|
||||
{ "lowlevel.melbands.dvar2", { 40 } },
|
||||
{ "lowlevel.melbands.max", { 40 } },
|
||||
{ "lowlevel.melbands.mean", { 40 } },
|
||||
{ "lowlevel.melbands.median", { 40 } },
|
||||
{ "lowlevel.melbands.min", { 40 } },
|
||||
{ "lowlevel.melbands.var", { 40 } },
|
||||
{ "lowlevel.melbands_crest.dmean", { 1 } },
|
||||
{ "lowlevel.melbands_crest.dmean2", { 1 } },
|
||||
{ "lowlevel.melbands_crest.dvar", { 1 } },
|
||||
{ "lowlevel.melbands_crest.dvar2", { 1 } },
|
||||
{ "lowlevel.melbands_crest.max", { 1 } },
|
||||
{ "lowlevel.melbands_crest.mean", { 1 } },
|
||||
{ "lowlevel.melbands_crest.median", { 1 } },
|
||||
{ "lowlevel.melbands_crest.min", { 1 } },
|
||||
{ "lowlevel.melbands_crest.var", { 1 } },
|
||||
{ "lowlevel.melbands_flatness_db.dmean", { 1 } },
|
||||
{ "lowlevel.melbands_flatness_db.dmean2", { 1 } },
|
||||
{ "lowlevel.melbands_flatness_db.dvar", { 1 } },
|
||||
{ "lowlevel.melbands_flatness_db.dvar2", { 1 } },
|
||||
{ "lowlevel.melbands_flatness_db.max", { 1 } },
|
||||
{ "lowlevel.melbands_flatness_db.mean", { 1 } },
|
||||
{ "lowlevel.melbands_flatness_db.median", { 1 } },
|
||||
{ "lowlevel.melbands_flatness_db.min", { 1 } },
|
||||
{ "lowlevel.melbands_flatness_db.var", { 1 } },
|
||||
{ "lowlevel.melbands_kurtosis.dmean", { 1 } },
|
||||
{ "lowlevel.melbands_kurtosis.dmean2", { 1 } },
|
||||
{ "lowlevel.melbands_kurtosis.dvar", { 1 } },
|
||||
{ "lowlevel.melbands_kurtosis.dvar2", { 1 } },
|
||||
{ "lowlevel.melbands_kurtosis.max", { 1 } },
|
||||
{ "lowlevel.melbands_kurtosis.mean", { 1 } },
|
||||
{ "lowlevel.melbands_kurtosis.median", { 1 } },
|
||||
{ "lowlevel.melbands_kurtosis.min", { 1 } },
|
||||
{ "lowlevel.melbands_kurtosis.var", { 1 } },
|
||||
{ "lowlevel.melbands_skewness.dmean", { 1 } },
|
||||
{ "lowlevel.melbands_skewness.dmean2", { 1 } },
|
||||
{ "lowlevel.melbands_skewness.dvar", { 1 } },
|
||||
{ "lowlevel.melbands_skewness.dvar2", { 1 } },
|
||||
{ "lowlevel.melbands_skewness.max", { 1 } },
|
||||
{ "lowlevel.melbands_skewness.mean", { 1 } },
|
||||
{ "lowlevel.melbands_skewness.median", { 1 } },
|
||||
{ "lowlevel.melbands_skewness.min", { 1 } },
|
||||
{ "lowlevel.melbands_skewness.var", { 1 } },
|
||||
{ "lowlevel.melbands_spread.dmean", { 1 } },
|
||||
{ "lowlevel.melbands_spread.dmean2", { 1 } },
|
||||
{ "lowlevel.melbands_spread.dvar", { 1 } },
|
||||
{ "lowlevel.melbands_spread.dvar2", { 1 } },
|
||||
{ "lowlevel.melbands_spread.max", { 1 } },
|
||||
{ "lowlevel.melbands_spread.mean", { 1 } },
|
||||
{ "lowlevel.melbands_spread.median", { 1 } },
|
||||
{ "lowlevel.melbands_spread.min", { 1 } },
|
||||
{ "lowlevel.melbands_spread.var", { 1 } },
|
||||
{ "lowlevel.mfcc.mean", { 13 } },
|
||||
{ "lowlevel.pitch_salience.dmean", { 1 } },
|
||||
{ "lowlevel.pitch_salience.dmean2", { 1 } },
|
||||
{ "lowlevel.pitch_salience.dvar", { 1 } },
|
||||
{ "lowlevel.pitch_salience.dvar2", { 1 } },
|
||||
{ "lowlevel.pitch_salience.max", { 1 } },
|
||||
{ "lowlevel.pitch_salience.mean", { 1 } },
|
||||
{ "lowlevel.pitch_salience.median", { 1 } },
|
||||
{ "lowlevel.pitch_salience.min", { 1 } },
|
||||
{ "lowlevel.pitch_salience.var", { 1 } },
|
||||
{ "lowlevel.silence_rate_30dB.dmean", { 1 } },
|
||||
{ "lowlevel.silence_rate_30dB.dmean2", { 1 } },
|
||||
{ "lowlevel.silence_rate_30dB.dvar", { 1 } },
|
||||
{ "lowlevel.silence_rate_30dB.dvar2", { 1 } },
|
||||
{ "lowlevel.silence_rate_30dB.max", { 1 } },
|
||||
{ "lowlevel.silence_rate_30dB.mean", { 1 } },
|
||||
{ "lowlevel.silence_rate_30dB.median", { 1 } },
|
||||
{ "lowlevel.silence_rate_30dB.min", { 1 } },
|
||||
{ "lowlevel.silence_rate_30dB.var", { 1 } },
|
||||
{ "lowlevel.silence_rate_60dB.dmean", { 1 } },
|
||||
{ "lowlevel.silence_rate_60dB.dmean2", { 1 } },
|
||||
{ "lowlevel.silence_rate_60dB.dvar", { 1 } },
|
||||
{ "lowlevel.silence_rate_60dB.dvar2", { 1 } },
|
||||
{ "lowlevel.silence_rate_60dB.max", { 1 } },
|
||||
{ "lowlevel.silence_rate_60dB.mean", { 1 } },
|
||||
{ "lowlevel.silence_rate_60dB.median", { 1 } },
|
||||
{ "lowlevel.silence_rate_60dB.min", { 1 } },
|
||||
{ "lowlevel.silence_rate_60dB.var", { 1 } },
|
||||
{ "lowlevel.spectral_centroid.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_centroid.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_centroid.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_centroid.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_centroid.max", { 1 } },
|
||||
{ "lowlevel.spectral_centroid.mean", { 1 } },
|
||||
{ "lowlevel.spectral_centroid.median", { 1 } },
|
||||
{ "lowlevel.spectral_centroid.min", { 1 } },
|
||||
{ "lowlevel.spectral_centroid.var", { 1 } },
|
||||
{ "lowlevel.spectral_complexity.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_complexity.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_complexity.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_complexity.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_complexity.max", { 1 } },
|
||||
{ "lowlevel.spectral_complexity.mean", { 1 } },
|
||||
{ "lowlevel.spectral_complexity.median", { 1 } },
|
||||
{ "lowlevel.spectral_complexity.min", { 1 } },
|
||||
{ "lowlevel.spectral_complexity.var", { 1 } },
|
||||
{ "lowlevel.spectral_contrast_coeffs.dmean", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_coeffs.dmean2", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_coeffs.dvar", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_coeffs.dvar2", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_coeffs.max", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_coeffs.mean", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_coeffs.median", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_coeffs.min", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_coeffs.var", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_valleys.dmean", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_valleys.dmean2", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_valleys.dvar", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_valleys.dvar2", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_valleys.max", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_valleys.mean", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_valleys.median", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_valleys.min", { 6 } },
|
||||
{ "lowlevel.spectral_contrast_valleys.var", { 6 } },
|
||||
{ "lowlevel.spectral_decrease.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_decrease.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_decrease.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_decrease.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_decrease.max", { 1 } },
|
||||
{ "lowlevel.spectral_decrease.mean", { 1 } },
|
||||
{ "lowlevel.spectral_decrease.median", { 1 } },
|
||||
{ "lowlevel.spectral_decrease.min", { 1 } },
|
||||
{ "lowlevel.spectral_decrease.var", { 1 } },
|
||||
{ "lowlevel.spectral_energy.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_energy.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_energy.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_energy.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_energy.max", { 1 } },
|
||||
{ "lowlevel.spectral_energy.mean", { 1 } },
|
||||
{ "lowlevel.spectral_energy.median", { 1 } },
|
||||
{ "lowlevel.spectral_energy.min", { 1 } },
|
||||
{ "lowlevel.spectral_energy.var", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_high.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_high.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_high.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_high.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_high.max", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_high.mean", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_high.median", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_high.min", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_high.var", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_low.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_low.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_low.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_low.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_low.max", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_low.mean", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_low.median", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_low.min", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_low.var", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_high.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_high.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_high.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_high.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_high.max", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_high.mean", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_high.median", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_high.min", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_high.var", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_low.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_low.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_low.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_low.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_low.max", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_low.mean", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_low.median", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_low.min", { 1 } },
|
||||
{ "lowlevel.spectral_energyband_middle_low.var", { 1 } },
|
||||
{ "lowlevel.spectral_entropy.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_entropy.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_entropy.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_entropy.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_entropy.max", { 1 } },
|
||||
{ "lowlevel.spectral_entropy.mean", { 1 } },
|
||||
{ "lowlevel.spectral_entropy.median", { 1 } },
|
||||
{ "lowlevel.spectral_entropy.min", { 1 } },
|
||||
{ "lowlevel.spectral_entropy.var", { 1 } },
|
||||
{ "lowlevel.spectral_flux.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_flux.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_flux.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_flux.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_flux.max", { 1 } },
|
||||
{ "lowlevel.spectral_flux.mean", { 1 } },
|
||||
{ "lowlevel.spectral_flux.median", { 1 } },
|
||||
{ "lowlevel.spectral_flux.min", { 1 } },
|
||||
{ "lowlevel.spectral_flux.var", { 1 } },
|
||||
{ "lowlevel.spectral_kurtosis.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_kurtosis.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_kurtosis.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_kurtosis.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_kurtosis.max", { 1 } },
|
||||
{ "lowlevel.spectral_kurtosis.mean", { 1 } },
|
||||
{ "lowlevel.spectral_kurtosis.median", { 1 } },
|
||||
{ "lowlevel.spectral_kurtosis.min", { 1 } },
|
||||
{ "lowlevel.spectral_kurtosis.var", { 1 } },
|
||||
{ "lowlevel.spectral_rms.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_rms.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_rms.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_rms.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_rms.max", { 1 } },
|
||||
{ "lowlevel.spectral_rms.mean", { 1 } },
|
||||
{ "lowlevel.spectral_rms.median", { 1 } },
|
||||
{ "lowlevel.spectral_rms.min", { 1 } },
|
||||
{ "lowlevel.spectral_rms.var", { 1 } },
|
||||
{ "lowlevel.spectral_rolloff.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_rolloff.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_rolloff.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_rolloff.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_rolloff.max", { 1 } },
|
||||
{ "lowlevel.spectral_rolloff.mean", { 1 } },
|
||||
{ "lowlevel.spectral_rolloff.median", { 1 } },
|
||||
{ "lowlevel.spectral_rolloff.min", { 1 } },
|
||||
{ "lowlevel.spectral_rolloff.var", { 1 } },
|
||||
{ "lowlevel.spectral_skewness.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_skewness.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_skewness.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_skewness.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_skewness.max", { 1 } },
|
||||
{ "lowlevel.spectral_skewness.mean", { 1 } },
|
||||
{ "lowlevel.spectral_skewness.median", { 1 } },
|
||||
{ "lowlevel.spectral_skewness.min", { 1 } },
|
||||
{ "lowlevel.spectral_skewness.var", { 1 } },
|
||||
{ "lowlevel.spectral_spread.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_spread.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_spread.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_spread.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_spread.max", { 1 } },
|
||||
{ "lowlevel.spectral_spread.mean", { 1 } },
|
||||
{ "lowlevel.spectral_spread.median", { 1 } },
|
||||
{ "lowlevel.spectral_spread.min", { 1 } },
|
||||
{ "lowlevel.spectral_spread.var", { 1 } },
|
||||
{ "lowlevel.spectral_strongpeak.dmean", { 1 } },
|
||||
{ "lowlevel.spectral_strongpeak.dmean2", { 1 } },
|
||||
{ "lowlevel.spectral_strongpeak.dvar", { 1 } },
|
||||
{ "lowlevel.spectral_strongpeak.dvar2", { 1 } },
|
||||
{ "lowlevel.spectral_strongpeak.max", { 1 } },
|
||||
{ "lowlevel.spectral_strongpeak.mean", { 1 } },
|
||||
{ "lowlevel.spectral_strongpeak.median", { 1 } },
|
||||
{ "lowlevel.spectral_strongpeak.min", { 1 } },
|
||||
{ "lowlevel.spectral_strongpeak.var", { 1 } },
|
||||
{ "lowlevel.zerocrossingrate.dmean", { 1 } },
|
||||
{ "lowlevel.zerocrossingrate.dmean2", { 1 } },
|
||||
{ "lowlevel.zerocrossingrate.dvar", { 1 } },
|
||||
{ "lowlevel.zerocrossingrate.dvar2", { 1 } },
|
||||
{ "lowlevel.zerocrossingrate.max", { 1 } },
|
||||
{ "lowlevel.zerocrossingrate.mean", { 1 } },
|
||||
{ "lowlevel.zerocrossingrate.median", { 1 } },
|
||||
{ "lowlevel.zerocrossingrate.min", { 1 } },
|
||||
{ "lowlevel.zerocrossingrate.var", { 1 } },
|
||||
};
|
||||
|
||||
return it->second;
|
||||
}
|
||||
FeatureDef getFeatureDef(const FeatureName& featureName)
|
||||
{
|
||||
auto it{ featureDefinitions.find(featureName) };
|
||||
if (it == std::cend(featureDefinitions))
|
||||
throw core::LmsException{ "Unhandled requested feature '" + featureName + "'" };
|
||||
|
||||
FeatureNames
|
||||
getFeatureNames()
|
||||
{
|
||||
FeatureNames res;
|
||||
return it->second;
|
||||
}
|
||||
|
||||
std::transform(std::cbegin(featureDefinitions), std::cend(featureDefinitions),
|
||||
std::inserter(res, std::begin(res)), [](auto itFeature) { return itFeature.first; });
|
||||
FeatureNames getFeatureNames()
|
||||
{
|
||||
FeatureNames res;
|
||||
|
||||
return res;
|
||||
}
|
||||
std::transform(std::cbegin(featureDefinitions), std::cend(featureDefinitions),
|
||||
std::inserter(res, std::begin(res)), [](auto itFeature) { return itFeature.first; });
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
} // namespace lms::recommendation
|
||||
|
||||
|
||||
@@ -24,26 +24,27 @@
|
||||
#include <unordered_set>
|
||||
#include <vector>
|
||||
|
||||
namespace lms::recommendation {
|
||||
|
||||
using FeatureName = std::string;
|
||||
using FeatureNames = std::unordered_set<FeatureName>;
|
||||
using FeatureValue = double;
|
||||
using FeatureValues = std::vector<FeatureValue>;
|
||||
using FeatureValuesMap = std::unordered_map<FeatureName, FeatureValues>;
|
||||
|
||||
struct FeatureDef
|
||||
namespace lms::recommendation
|
||||
{
|
||||
std::size_t nbDimensions {};
|
||||
};
|
||||
|
||||
FeatureDef getFeatureDef(const FeatureName& featureName);
|
||||
FeatureNames getFeatureNames();
|
||||
using FeatureName = std::string;
|
||||
using FeatureNames = std::unordered_set<FeatureName>;
|
||||
using FeatureValue = double;
|
||||
using FeatureValues = std::vector<FeatureValue>;
|
||||
using FeatureValuesMap = std::unordered_map<FeatureName, FeatureValues>;
|
||||
|
||||
struct FeatureSettings
|
||||
{
|
||||
double weight {};
|
||||
};
|
||||
using FeatureSettingsMap = std::unordered_map<FeatureName, FeatureSettings>;
|
||||
struct FeatureDef
|
||||
{
|
||||
std::size_t nbDimensions{};
|
||||
};
|
||||
|
||||
FeatureDef getFeatureDef(const FeatureName& featureName);
|
||||
FeatureNames getFeatureNames();
|
||||
|
||||
struct FeatureSettings
|
||||
{
|
||||
double weight{};
|
||||
};
|
||||
using FeatureSettingsMap = std::unordered_map<FeatureName, FeatureSettings>;
|
||||
|
||||
} // namespace lms::recommendation
|
||||
|
||||
@@ -21,6 +21,8 @@
|
||||
|
||||
#include <numeric>
|
||||
|
||||
#include "core/ILogger.hpp"
|
||||
#include "core/Random.hpp"
|
||||
#include "database/Artist.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/Release.hpp"
|
||||
@@ -30,8 +32,6 @@
|
||||
#include "database/TrackFeatures.hpp"
|
||||
#include "database/TrackList.hpp"
|
||||
#include "som/DataNormalizer.hpp"
|
||||
#include "core/ILogger.hpp"
|
||||
#include "core/Random.hpp"
|
||||
|
||||
namespace lms::recommendation
|
||||
{
|
||||
@@ -47,7 +47,7 @@ namespace lms::recommendation
|
||||
std::optional<som::InputVector> convertFeatureValuesMapToInputVector(const FeatureValuesMap& featureValuesMap, std::size_t nbDimensions)
|
||||
{
|
||||
std::size_t i{};
|
||||
std::optional<som::InputVector> res{ som::InputVector {nbDimensions} };
|
||||
std::optional<som::InputVector> res{ som::InputVector{ nbDimensions } };
|
||||
for (const auto& [featureName, values] : featureValuesMap)
|
||||
{
|
||||
if (values.size() != getFeatureDef(featureName).nbDimensions)
|
||||
@@ -80,17 +80,16 @@ namespace lms::recommendation
|
||||
|
||||
return weights;
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
|
||||
const FeatureSettingsMap& FeaturesEngine::getDefaultTrainFeatureSettings()
|
||||
{
|
||||
static const FeatureSettingsMap defaultTrainFeatureSettings
|
||||
{
|
||||
{ "lowlevel.spectral_energyband_high.mean", {1}},
|
||||
{ "lowlevel.spectral_rolloff.median", {1}},
|
||||
{ "lowlevel.spectral_contrast_valleys.var", {1}},
|
||||
{ "lowlevel.erbbands.mean", {1}},
|
||||
{ "lowlevel.gfcc.mean", {1}},
|
||||
static const FeatureSettingsMap defaultTrainFeatureSettings{
|
||||
{ "lowlevel.spectral_energyband_high.mean", { 1 } },
|
||||
{ "lowlevel.spectral_rolloff.median", { 1 } },
|
||||
{ "lowlevel.spectral_contrast_valleys.var", { 1 } },
|
||||
{ "lowlevel.erbbands.mean", { 1 } },
|
||||
{ "lowlevel.gfcc.mean", { 1 } },
|
||||
};
|
||||
|
||||
return defaultTrainFeatureSettings;
|
||||
@@ -104,12 +103,12 @@ namespace lms::recommendation
|
||||
std::transform(std::cbegin(trainSettings.featureSettingsMap), std::cend(trainSettings.featureSettingsMap), std::inserter(featureNames, std::begin(featureNames)),
|
||||
[](const auto& itFeatureSetting) { return itFeatureSetting.first; });
|
||||
|
||||
const std::size_t nbDimensions{ std::accumulate(std::cbegin(featureNames), std::cend(featureNames), std::size_t {0},
|
||||
[](std::size_t sum, const FeatureName& featureName) { return sum + getFeatureDef(featureName).nbDimensions; }) };
|
||||
const std::size_t nbDimensions{ std::accumulate(std::cbegin(featureNames), std::cend(featureNames), std::size_t{ 0 },
|
||||
[](std::size_t sum, const FeatureName& featureName) { return sum + getFeatureDef(featureName).nbDimensions; }) };
|
||||
|
||||
LMS_LOG(RECOMMENDATION, DEBUG, "Features dimension = " << nbDimensions);
|
||||
|
||||
Session & session{ _db.getTLSSession() };
|
||||
Session& session{ _db.getTLSSession() };
|
||||
|
||||
RangeResults<TrackFeaturesId> trackFeaturesIds;
|
||||
{
|
||||
@@ -178,10 +177,9 @@ namespace lms::recommendation
|
||||
som::InputVector weights{ getInputVectorWeights(trainSettings.featureSettingsMap, nbDimensions) };
|
||||
network.setDataWeights(weights);
|
||||
|
||||
auto somProgressCallback{ [&](const som::Network::CurrentIteration& iter)
|
||||
{
|
||||
auto somProgressCallback{ [&](const som::Network::CurrentIteration& iter) {
|
||||
LMS_LOG(RECOMMENDATION, DEBUG, "Current pass = " << iter.idIteration << " / " << iter.iterationCount);
|
||||
progressCallback(Progress {iter.idIteration, iter.iterationCount});
|
||||
progressCallback(Progress{ iter.idIteration, iter.iterationCount });
|
||||
} };
|
||||
|
||||
LMS_LOG(RECOMMENDATION, DEBUG, "Training network...");
|
||||
@@ -216,15 +214,14 @@ namespace lms::recommendation
|
||||
|
||||
TrackContainer FeaturesEngine::findSimilarTracksFromTrackList(TrackListId trackListId, std::size_t maxCount) const
|
||||
{
|
||||
const TrackContainer trackIds{ [&]
|
||||
{
|
||||
const TrackContainer trackIds{ [&] {
|
||||
TrackContainer res;
|
||||
|
||||
Session& session {_db.getTLSSession()};
|
||||
Session& session{ _db.getTLSSession() };
|
||||
|
||||
auto transaction {session.createReadTransaction()};
|
||||
auto transaction{ session.createReadTransaction() };
|
||||
|
||||
const TrackList::pointer trackList {TrackList::find(session, trackListId)};
|
||||
const TrackList::pointer trackList{ TrackList::find(session, trackListId) };
|
||||
if (trackList)
|
||||
res = trackList->getTrackIds();
|
||||
|
||||
@@ -245,10 +242,10 @@ namespace lms::recommendation
|
||||
auto transaction{ session.createReadTransaction() };
|
||||
|
||||
similarTrackIds.erase(std::remove_if(std::begin(similarTrackIds), std::end(similarTrackIds),
|
||||
[&](TrackId trackId)
|
||||
{
|
||||
return !Track::exists(session, trackId);
|
||||
}), std::end(similarTrackIds));
|
||||
[&](TrackId trackId) {
|
||||
return !Track::exists(session, trackId);
|
||||
}),
|
||||
std::end(similarTrackIds));
|
||||
}
|
||||
|
||||
return similarTrackIds;
|
||||
@@ -256,7 +253,7 @@ namespace lms::recommendation
|
||||
|
||||
ReleaseContainer FeaturesEngine::getSimilarReleases(ReleaseId releaseId, std::size_t maxCount) const
|
||||
{
|
||||
auto similarReleaseIds{ getSimilarObjects({releaseId}, _releaseMatrix, _releasePositions, maxCount) };
|
||||
auto similarReleaseIds{ getSimilarObjects({ releaseId }, _releaseMatrix, _releasePositions, maxCount) };
|
||||
|
||||
Session& session{ _db.getTLSSession() };
|
||||
|
||||
@@ -266,10 +263,10 @@ namespace lms::recommendation
|
||||
auto transaction{ session.createReadTransaction() };
|
||||
|
||||
similarReleaseIds.erase(std::remove_if(std::begin(similarReleaseIds), std::end(similarReleaseIds),
|
||||
[&](ReleaseId releaseId)
|
||||
{
|
||||
return !Release::exists(session, releaseId);
|
||||
}), std::end(similarReleaseIds));
|
||||
[&](ReleaseId releaseId) {
|
||||
return !Release::exists(session, releaseId);
|
||||
}),
|
||||
std::end(similarReleaseIds));
|
||||
}
|
||||
|
||||
return similarReleaseIds;
|
||||
@@ -277,17 +274,16 @@ namespace lms::recommendation
|
||||
|
||||
ArtistContainer FeaturesEngine::getSimilarArtists(ArtistId artistId, core::EnumSet<TrackArtistLinkType> linkTypes, std::size_t maxCount) const
|
||||
{
|
||||
auto getSimilarArtistIdsForLinkType{ [&](TrackArtistLinkType linkType)
|
||||
{
|
||||
auto getSimilarArtistIdsForLinkType{ [&](TrackArtistLinkType linkType) {
|
||||
ArtistContainer similarArtistIds;
|
||||
|
||||
const auto itArtists {_artistMatrix.find(linkType)};
|
||||
const auto itArtists{ _artistMatrix.find(linkType) };
|
||||
if (itArtists == std::cend(_artistMatrix))
|
||||
{
|
||||
return similarArtistIds;
|
||||
}
|
||||
|
||||
return getSimilarObjects({artistId}, itArtists->second, _artistPositions, maxCount);
|
||||
return getSimilarObjects({ artistId }, itArtists->second, _artistPositions, maxCount);
|
||||
} };
|
||||
|
||||
std::unordered_set<ArtistId> similarArtistIds;
|
||||
@@ -306,10 +302,10 @@ namespace lms::recommendation
|
||||
auto transaction{ session.createReadTransaction() };
|
||||
|
||||
res.erase(std::remove_if(std::begin(res), std::end(res),
|
||||
[&](ArtistId artistId)
|
||||
{
|
||||
return !Artist::exists(session, artistId);
|
||||
}), std::end(res));
|
||||
[&](ArtistId artistId) {
|
||||
return !Artist::exists(session, artistId);
|
||||
}),
|
||||
std::end(res));
|
||||
}
|
||||
|
||||
while (res.size() > maxCount)
|
||||
@@ -364,7 +360,7 @@ namespace lms::recommendation
|
||||
|
||||
LMS_LOG(RECOMMENDATION, DEBUG, "Constructing maps...");
|
||||
|
||||
Session & session{ _db.getTLSSession() };
|
||||
Session& session{ _db.getTLSSession() };
|
||||
|
||||
for (const auto& [trackId, positions] : trackPositions)
|
||||
{
|
||||
@@ -410,4 +406,4 @@ namespace lms::recommendation
|
||||
LMS_LOG(RECOMMENDATION, INFO, "Classifier successfully loaded!");
|
||||
}
|
||||
|
||||
} // ns Recommendation
|
||||
} // namespace lms::recommendation
|
||||
|
||||
@@ -21,17 +21,18 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <functional>
|
||||
#include <unordered_map>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include "core/Utils.hpp"
|
||||
#include "som/DataNormalizer.hpp"
|
||||
#include "som/Network.hpp"
|
||||
#include "core/Utils.hpp"
|
||||
#include "IEngine.hpp"
|
||||
#include "FeaturesEngineCache.hpp"
|
||||
|
||||
#include "FeaturesDefs.hpp"
|
||||
#include "FeaturesEngineCache.hpp"
|
||||
#include "IEngine.hpp"
|
||||
|
||||
namespace lms::db
|
||||
{
|
||||
@@ -45,7 +46,8 @@ namespace lms::recommendation
|
||||
class FeaturesEngine : public IEngine
|
||||
{
|
||||
public:
|
||||
FeaturesEngine(db::Db& db) : _db{ db } {}
|
||||
FeaturesEngine(db::Db& db)
|
||||
: _db{ db } {}
|
||||
|
||||
FeaturesEngine(const FeaturesEngine&) = delete;
|
||||
FeaturesEngine(FeaturesEngine&&) = delete;
|
||||
@@ -74,14 +76,14 @@ namespace lms::recommendation
|
||||
};
|
||||
void loadFromTraining(const TrainSettings& trainSettings, const ProgressCallback& progressCallback);
|
||||
|
||||
template <typename IdType>
|
||||
template<typename IdType>
|
||||
using ObjectPositions = std::unordered_map<IdType, std::vector<som::Position>>;
|
||||
|
||||
using ArtistPositions = ObjectPositions<db::ArtistId>;
|
||||
using ReleasePositions = ObjectPositions<db::ReleaseId>;
|
||||
using TrackPositions = ObjectPositions<db::TrackId>;
|
||||
|
||||
template <typename IdType>
|
||||
template<typename IdType>
|
||||
using ObjectMatrix = som::Matrix<std::vector<IdType>>;
|
||||
using ArtistMatrix = ObjectMatrix<db::ArtistId>;
|
||||
using ReleaseMatrix = ObjectMatrix<db::ReleaseId>;
|
||||
@@ -91,34 +93,34 @@ namespace lms::recommendation
|
||||
|
||||
FeaturesEngineCache toCache() const;
|
||||
|
||||
template <typename IdType>
|
||||
template<typename IdType>
|
||||
static std::vector<som::Position> getMatchingRefVectorsPosition(const std::vector<IdType>& ids, const ObjectPositions<IdType>& objectPositions);
|
||||
|
||||
template <typename IdType>
|
||||
template<typename IdType>
|
||||
static std::vector<IdType> getObjectsIds(const std::vector<som::Position>& positions, const ObjectMatrix<IdType>& objectsMatrix);
|
||||
|
||||
template <typename IdType>
|
||||
template<typename IdType>
|
||||
std::vector<IdType> getSimilarObjects(const std::vector<IdType>& ids,
|
||||
const ObjectMatrix<IdType>& objectMatrix,
|
||||
const ObjectPositions<IdType>& objectPositions,
|
||||
std::size_t maxCount) const;
|
||||
|
||||
db::Db& _db;
|
||||
bool _loadCancelled{};
|
||||
std::unique_ptr<som::Network> _network;
|
||||
double _networkRefVectorsDistanceMedian{};
|
||||
bool _loadCancelled{};
|
||||
std::unique_ptr<som::Network> _network;
|
||||
double _networkRefVectorsDistanceMedian{};
|
||||
|
||||
ArtistPositions _artistPositions;
|
||||
ArtistPositions _artistPositions;
|
||||
std::unordered_map<db::TrackArtistLinkType, ArtistMatrix> _artistMatrix;
|
||||
|
||||
ReleasePositions _releasePositions;
|
||||
ReleaseMatrix _releaseMatrix;
|
||||
ReleasePositions _releasePositions;
|
||||
ReleaseMatrix _releaseMatrix;
|
||||
|
||||
TrackPositions _trackPositions;
|
||||
TrackMatrix _trackMatrix;
|
||||
TrackPositions _trackPositions;
|
||||
TrackMatrix _trackMatrix;
|
||||
};
|
||||
|
||||
template <typename IdType>
|
||||
template<typename IdType>
|
||||
std::vector<som::Position> FeaturesEngine::getMatchingRefVectorsPosition(const std::vector<IdType>& ids, const ObjectPositions<IdType>& objectPositions)
|
||||
{
|
||||
std::vector<som::Position> res;
|
||||
@@ -139,7 +141,7 @@ namespace lms::recommendation
|
||||
return res;
|
||||
}
|
||||
|
||||
template <typename IdType>
|
||||
template<typename IdType>
|
||||
std::vector<IdType> FeaturesEngine::getObjectsIds(const std::vector<som::Position>& positions, const ObjectMatrix<IdType>& objectMatrix)
|
||||
{
|
||||
std::vector<IdType> res;
|
||||
@@ -153,11 +155,11 @@ namespace lms::recommendation
|
||||
return res;
|
||||
}
|
||||
|
||||
template <typename IdType>
|
||||
template<typename IdType>
|
||||
std::vector<IdType> FeaturesEngine::getSimilarObjects(const std::vector<IdType>& ids,
|
||||
const ObjectMatrix<IdType>& objectMatrix,
|
||||
const ObjectPositions<IdType>& objectPositions,
|
||||
std::size_t maxCount) const
|
||||
const ObjectMatrix<IdType>& objectMatrix,
|
||||
const ObjectPositions<IdType>& objectPositions,
|
||||
std::size_t maxCount) const
|
||||
{
|
||||
std::vector<IdType> res;
|
||||
|
||||
@@ -171,11 +173,10 @@ namespace lms::recommendation
|
||||
|
||||
// Remove objects that are already in input or already reported
|
||||
closestObjectIds.erase(std::remove_if(std::begin(closestObjectIds), std::end(closestObjectIds),
|
||||
[&](IdType id)
|
||||
{
|
||||
return std::find(std::cbegin(ids), std::cend(ids), id) != std::cend(ids);
|
||||
})
|
||||
, std::end(closestObjectIds));
|
||||
[&](IdType id) {
|
||||
return std::find(std::cbegin(ids), std::cend(ids), id) != std::cend(ids);
|
||||
}),
|
||||
std::end(closestObjectIds));
|
||||
|
||||
for (IdType id : closestObjectIds)
|
||||
{
|
||||
@@ -198,4 +199,4 @@ namespace lms::recommendation
|
||||
|
||||
return res;
|
||||
}
|
||||
}
|
||||
} // namespace lms::recommendation
|
||||
|
||||
@@ -86,7 +86,7 @@ namespace lms::recommendation
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
|
||||
std::optional<som::Network> FeaturesEngineCache::createNetworkFromCacheFile(const std::filesystem::path& path)
|
||||
{
|
||||
@@ -240,8 +240,8 @@ namespace lms::recommendation
|
||||
}
|
||||
|
||||
FeaturesEngineCache::FeaturesEngineCache(som::Network network, TrackPositions trackPositions)
|
||||
: _network{ std::move(network) },
|
||||
_trackPositions{ std::move(trackPositions) }
|
||||
: _network{ std::move(network) }
|
||||
, _trackPositions{ std::move(trackPositions) }
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -47,8 +47,8 @@ namespace lms::recommendation
|
||||
|
||||
friend class FeaturesEngine;
|
||||
|
||||
som::Network _network;
|
||||
TrackPositions _trackPositions;
|
||||
som::Network _network;
|
||||
TrackPositions _trackPositions;
|
||||
};
|
||||
|
||||
} // namespace lms::recommendation
|
||||
|
||||
@@ -21,77 +21,73 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include "core/ILogger.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/Release.hpp"
|
||||
#include "database/Session.hpp"
|
||||
#include "database/Track.hpp"
|
||||
#include "core/ILogger.hpp"
|
||||
|
||||
namespace lms::recommendation::PlaylistGeneratorConstraint
|
||||
{
|
||||
namespace
|
||||
{
|
||||
std::size_t
|
||||
countCommonArtists(const ArtistContainer& artists1, const ArtistContainer& artists2)
|
||||
{
|
||||
ArtistContainer intersection;
|
||||
namespace
|
||||
{
|
||||
std::size_t countCommonArtists(const ArtistContainer& artists1, const ArtistContainer& artists2)
|
||||
{
|
||||
ArtistContainer intersection;
|
||||
|
||||
std::set_intersection(std::cbegin(artists1), std::cend(artists1),
|
||||
std::cbegin(artists2), std::cend(artists2),
|
||||
std::back_inserter(intersection));
|
||||
std::set_intersection(std::cbegin(artists1), std::cend(artists1),
|
||||
std::cbegin(artists2), std::cend(artists2),
|
||||
std::back_inserter(intersection));
|
||||
|
||||
return intersection.size();
|
||||
}
|
||||
}
|
||||
return intersection.size();
|
||||
}
|
||||
} // namespace
|
||||
|
||||
ConsecutiveArtists::ConsecutiveArtists(db::Db& db)
|
||||
: _db {db}
|
||||
{}
|
||||
ConsecutiveArtists::ConsecutiveArtists(db::Db& db)
|
||||
: _db{ db }
|
||||
{
|
||||
}
|
||||
|
||||
float
|
||||
ConsecutiveArtists::computeScore(const std::vector<db::TrackId>& trackIds, std::size_t trackIndex)
|
||||
{
|
||||
assert(!trackIds.empty());
|
||||
assert(trackIndex <= trackIds.size() - 1);
|
||||
float ConsecutiveArtists::computeScore(const std::vector<db::TrackId>& trackIds, std::size_t trackIndex)
|
||||
{
|
||||
assert(!trackIds.empty());
|
||||
assert(trackIndex <= trackIds.size() - 1);
|
||||
|
||||
const ArtistContainer artists {getArtists(trackIds[trackIndex])};
|
||||
const ArtistContainer artists{ getArtists(trackIds[trackIndex]) };
|
||||
|
||||
constexpr std::size_t rangeSize{ 3 }; // check up to rangeSize tracks before/after the target track
|
||||
static_assert(rangeSize > 0);
|
||||
constexpr std::size_t rangeSize{ 3 }; // check up to rangeSize tracks before/after the target track
|
||||
static_assert(rangeSize > 0);
|
||||
|
||||
float score {};
|
||||
for (std::size_t i {1}; i < rangeSize; ++i)
|
||||
{
|
||||
if (trackIndex >= i)
|
||||
score += countCommonArtists(artists, getArtists(trackIds[trackIndex - i])) / static_cast<float>(i);
|
||||
float score{};
|
||||
for (std::size_t i{ 1 }; i < rangeSize; ++i)
|
||||
{
|
||||
if (trackIndex >= i)
|
||||
score += countCommonArtists(artists, getArtists(trackIds[trackIndex - i])) / static_cast<float>(i);
|
||||
|
||||
if (trackIndex + i < trackIds.size())
|
||||
score += countCommonArtists(artists, getArtists(trackIds[trackIndex + i])) / static_cast<float>(i);
|
||||
}
|
||||
if (trackIndex + i < trackIds.size())
|
||||
score += countCommonArtists(artists, getArtists(trackIds[trackIndex + i])) / static_cast<float>(i);
|
||||
}
|
||||
|
||||
return score;
|
||||
}
|
||||
return score;
|
||||
}
|
||||
|
||||
ArtistContainer
|
||||
ConsecutiveArtists::getArtists(db::TrackId trackId)
|
||||
{
|
||||
using namespace db;
|
||||
ArtistContainer ConsecutiveArtists::getArtists(db::TrackId trackId)
|
||||
{
|
||||
using namespace db;
|
||||
|
||||
ArtistContainer res;
|
||||
ArtistContainer res;
|
||||
|
||||
Session& dbSession {_db.getTLSSession()};
|
||||
auto transaction {dbSession.createReadTransaction()};
|
||||
Session& dbSession{ _db.getTLSSession() };
|
||||
auto transaction{ dbSession.createReadTransaction() };
|
||||
|
||||
const Track::pointer track {Track::find(dbSession, trackId)};
|
||||
if (!track)
|
||||
return res;
|
||||
const Track::pointer track{ Track::find(dbSession, trackId) };
|
||||
if (!track)
|
||||
return res;
|
||||
|
||||
res = track->getArtistIds({});
|
||||
std::sort(std::begin(res), std::end(res));
|
||||
res = track->getArtistIds({});
|
||||
std::sort(std::begin(res), std::end(res));
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
} // namespace lms::recommendation
|
||||
return res;
|
||||
}
|
||||
|
||||
} // namespace lms::recommendation::PlaylistGeneratorConstraint
|
||||
|
||||
@@ -25,21 +25,20 @@
|
||||
|
||||
namespace lms::db
|
||||
{
|
||||
class Db;
|
||||
class Db;
|
||||
}
|
||||
|
||||
namespace lms::recommendation::PlaylistGeneratorConstraint
|
||||
{
|
||||
class ConsecutiveArtists : public IConstraint
|
||||
{
|
||||
public:
|
||||
ConsecutiveArtists(db::Db& db);
|
||||
class ConsecutiveArtists : public IConstraint
|
||||
{
|
||||
public:
|
||||
ConsecutiveArtists(db::Db& db);
|
||||
|
||||
private:
|
||||
float computeScore(const TrackContainer& trackIds, std::size_t trackIndex) override;
|
||||
ArtistContainer getArtists(db::TrackId trackId);
|
||||
private:
|
||||
float computeScore(const TrackContainer& trackIds, std::size_t trackIndex) override;
|
||||
ArtistContainer getArtists(db::TrackId trackId);
|
||||
|
||||
db::Db& _db;
|
||||
};
|
||||
db::Db& _db;
|
||||
};
|
||||
} // namespace lms::recommendation::PlaylistGeneratorConstraint
|
||||
|
||||
|
||||
+36
-38
@@ -19,59 +19,57 @@
|
||||
|
||||
#include "ConsecutiveReleases.hpp"
|
||||
|
||||
#include "core/ILogger.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/Release.hpp"
|
||||
#include "database/Session.hpp"
|
||||
#include "database/Track.hpp"
|
||||
#include "core/ILogger.hpp"
|
||||
|
||||
namespace lms::recommendation::PlaylistGeneratorConstraint
|
||||
{
|
||||
ConsecutiveReleases::ConsecutiveReleases(db::Db& db)
|
||||
: _db {db}
|
||||
{}
|
||||
ConsecutiveReleases::ConsecutiveReleases(db::Db& db)
|
||||
: _db{ db }
|
||||
{
|
||||
}
|
||||
|
||||
float
|
||||
ConsecutiveReleases::computeScore(const std::vector<db::TrackId>& trackIds, std::size_t trackIndex)
|
||||
{
|
||||
assert(!trackIds.empty());
|
||||
assert(trackIndex <= trackIds.size() - 1);
|
||||
float ConsecutiveReleases::computeScore(const std::vector<db::TrackId>& trackIds, std::size_t trackIndex)
|
||||
{
|
||||
assert(!trackIds.empty());
|
||||
assert(trackIndex <= trackIds.size() - 1);
|
||||
|
||||
const db::ReleaseId releaseId {getReleaseId(trackIds[trackIndex])};
|
||||
const db::ReleaseId releaseId{ getReleaseId(trackIds[trackIndex]) };
|
||||
|
||||
constexpr std::size_t rangeSize{ 3 }; // check up to rangeSize tracks before/after the target track
|
||||
static_assert(rangeSize > 0);
|
||||
constexpr std::size_t rangeSize{ 3 }; // check up to rangeSize tracks before/after the target track
|
||||
static_assert(rangeSize > 0);
|
||||
|
||||
float score {};
|
||||
for (std::size_t i {1}; i < rangeSize; ++i)
|
||||
{
|
||||
if ((trackIndex >= i) && getReleaseId(trackIds[trackIndex - i]) == releaseId)
|
||||
score += (1.f / static_cast<float>(i));
|
||||
float score{};
|
||||
for (std::size_t i{ 1 }; i < rangeSize; ++i)
|
||||
{
|
||||
if ((trackIndex >= i) && getReleaseId(trackIds[trackIndex - i]) == releaseId)
|
||||
score += (1.f / static_cast<float>(i));
|
||||
|
||||
if ((trackIndex + i < trackIds.size()) && getReleaseId(trackIds[trackIndex + i]) == releaseId)
|
||||
score += (1.f / static_cast<float>(i));
|
||||
}
|
||||
if ((trackIndex + i < trackIds.size()) && getReleaseId(trackIds[trackIndex + i]) == releaseId)
|
||||
score += (1.f / static_cast<float>(i));
|
||||
}
|
||||
|
||||
return score;
|
||||
}
|
||||
return score;
|
||||
}
|
||||
|
||||
db::ReleaseId
|
||||
ConsecutiveReleases::getReleaseId(db::TrackId trackId)
|
||||
{
|
||||
using namespace db;
|
||||
db::ReleaseId ConsecutiveReleases::getReleaseId(db::TrackId trackId)
|
||||
{
|
||||
using namespace db;
|
||||
|
||||
Session& dbSession {_db.getTLSSession()};
|
||||
auto transaction {dbSession.createReadTransaction()};
|
||||
Session& dbSession{ _db.getTLSSession() };
|
||||
auto transaction{ dbSession.createReadTransaction() };
|
||||
|
||||
const Track::pointer track {Track::find(dbSession, trackId)};
|
||||
if (!track)
|
||||
return {};
|
||||
const Track::pointer track{ Track::find(dbSession, trackId) };
|
||||
if (!track)
|
||||
return {};
|
||||
|
||||
const Release::pointer release {track->getRelease()};
|
||||
if (!release)
|
||||
return {};
|
||||
|
||||
return release->getId();
|
||||
}
|
||||
} // namespace lms::recommendation
|
||||
const Release::pointer release{ track->getRelease() };
|
||||
if (!release)
|
||||
return {};
|
||||
|
||||
return release->getId();
|
||||
}
|
||||
} // namespace lms::recommendation::PlaylistGeneratorConstraint
|
||||
|
||||
+11
-12
@@ -25,22 +25,21 @@
|
||||
|
||||
namespace lms::db
|
||||
{
|
||||
class Db;
|
||||
class Db;
|
||||
}
|
||||
|
||||
namespace lms::recommendation::PlaylistGeneratorConstraint
|
||||
{
|
||||
class ConsecutiveReleases : public IConstraint
|
||||
{
|
||||
public:
|
||||
ConsecutiveReleases(db::Db& db);
|
||||
class ConsecutiveReleases : public IConstraint
|
||||
{
|
||||
public:
|
||||
ConsecutiveReleases(db::Db& db);
|
||||
|
||||
private:
|
||||
float computeScore(const std::vector<db::TrackId>& trackIds, std::size_t trackIndex) override;
|
||||
private:
|
||||
float computeScore(const std::vector<db::TrackId>& trackIds, std::size_t trackIndex) override;
|
||||
|
||||
db::ReleaseId getReleaseId(db::TrackId trackId);
|
||||
|
||||
db::Db& _db;
|
||||
};
|
||||
} // namespace lms::recommendation
|
||||
db::ReleaseId getReleaseId(db::TrackId trackId);
|
||||
|
||||
db::Db& _db;
|
||||
};
|
||||
} // namespace lms::recommendation::PlaylistGeneratorConstraint
|
||||
|
||||
@@ -23,11 +23,9 @@
|
||||
|
||||
namespace lms::recommendation::PlaylistGeneratorConstraint
|
||||
{
|
||||
float
|
||||
DuplicateTracks::computeScore(const std::vector<db::TrackId>& trackIds, std::size_t trackIndex)
|
||||
{
|
||||
const auto count {std::count(std::cbegin(trackIds), std::cend(trackIds), trackIds[trackIndex])};
|
||||
return count == 1 ? 0 : 1000;
|
||||
}
|
||||
} // namespace lms::recommendation
|
||||
|
||||
float DuplicateTracks::computeScore(const std::vector<db::TrackId>& trackIds, std::size_t trackIndex)
|
||||
{
|
||||
const auto count{ std::count(std::cbegin(trackIds), std::cend(trackIds), trackIds[trackIndex]) };
|
||||
return count == 1 ? 0 : 1000;
|
||||
}
|
||||
} // namespace lms::recommendation::PlaylistGeneratorConstraint
|
||||
|
||||
@@ -23,10 +23,9 @@
|
||||
|
||||
namespace lms::recommendation::PlaylistGeneratorConstraint
|
||||
{
|
||||
class DuplicateTracks : public IConstraint
|
||||
{
|
||||
private:
|
||||
float computeScore(const std::vector<db::TrackId>& trackIds, std::size_t trackIndex) override;
|
||||
};
|
||||
} // namespace lms::recommendation::PlaylistGeneratorConstraints
|
||||
|
||||
class DuplicateTracks : public IConstraint
|
||||
{
|
||||
private:
|
||||
float computeScore(const std::vector<db::TrackId>& trackIds, std::size_t trackIndex) override;
|
||||
};
|
||||
} // namespace lms::recommendation::PlaylistGeneratorConstraint
|
||||
|
||||
@@ -25,15 +25,15 @@
|
||||
|
||||
namespace lms::recommendation::PlaylistGeneratorConstraint
|
||||
{
|
||||
class IConstraint
|
||||
{
|
||||
public:
|
||||
virtual ~IConstraint() = default;
|
||||
class IConstraint
|
||||
{
|
||||
public:
|
||||
virtual ~IConstraint() = default;
|
||||
|
||||
// compute the score of the track at index trackIndex
|
||||
// 0: best
|
||||
// 1: worst
|
||||
// > 1 : violation
|
||||
virtual float computeScore(const TrackContainer& trackIds, std::size_t trackIndex) = 0;
|
||||
};
|
||||
} // namespace lms::recommendation
|
||||
// compute the score of the track at index trackIndex
|
||||
// 0: best
|
||||
// 1: worst
|
||||
// > 1 : violation
|
||||
virtual float computeScore(const TrackContainer& trackIds, std::size_t trackIndex) = 0;
|
||||
};
|
||||
} // namespace lms::recommendation::PlaylistGeneratorConstraint
|
||||
|
||||
Reference in New Issue
Block a user