Refactored namespaces

This commit is contained in:
emeric
2024-03-12 08:32:08 +01:00
parent 487960b413
commit 4b7c4295ec
501 changed files with 12605 additions and 12631 deletions
@@ -25,9 +25,9 @@
#include "database/Release.hpp"
#include "database/Session.hpp"
#include "database/Track.hpp"
#include "utils/ILogger.hpp"
#include "core/ILogger.hpp"
namespace Recommendation::PlaylistGeneratorConstraint
namespace lms::recommendation::PlaylistGeneratorConstraint
{
namespace
{
@@ -44,12 +44,12 @@ namespace Recommendation::PlaylistGeneratorConstraint
}
}
ConsecutiveArtists::ConsecutiveArtists(Database::Db& db)
ConsecutiveArtists::ConsecutiveArtists(db::Db& db)
: _db {db}
{}
float
ConsecutiveArtists::computeScore(const std::vector<Database::TrackId>& trackIds, std::size_t trackIndex)
ConsecutiveArtists::computeScore(const std::vector<db::TrackId>& trackIds, std::size_t trackIndex)
{
assert(!trackIds.empty());
assert(trackIndex <= trackIds.size() - 1);
@@ -73,9 +73,9 @@ namespace Recommendation::PlaylistGeneratorConstraint
}
ArtistContainer
ConsecutiveArtists::getArtists(Database::TrackId trackId)
ConsecutiveArtists::getArtists(db::TrackId trackId)
{
using namespace Database;
using namespace db;
ArtistContainer res;
@@ -93,5 +93,5 @@ namespace Recommendation::PlaylistGeneratorConstraint
}
} // namespace Recommendation
} // namespace lms::recommendation
@@ -23,23 +23,23 @@
#include "database/ReleaseId.hpp"
namespace Database
namespace lms::db
{
class Db;
}
namespace Recommendation::PlaylistGeneratorConstraint
namespace lms::recommendation::PlaylistGeneratorConstraint
{
class ConsecutiveArtists : public IConstraint
{
public:
ConsecutiveArtists(Database::Db& db);
ConsecutiveArtists(db::Db& db);
private:
float computeScore(const TrackContainer& trackIds, std::size_t trackIndex) override;
ArtistContainer getArtists(Database::TrackId trackId);
ArtistContainer getArtists(db::TrackId trackId);
Database::Db& _db;
db::Db& _db;
};
} // namespace Recommendation::PlaylistGeneratorConstraint
} // namespace lms::recommendation::PlaylistGeneratorConstraint
@@ -23,21 +23,21 @@
#include "database/Release.hpp"
#include "database/Session.hpp"
#include "database/Track.hpp"
#include "utils/ILogger.hpp"
#include "core/ILogger.hpp"
namespace Recommendation::PlaylistGeneratorConstraint
namespace lms::recommendation::PlaylistGeneratorConstraint
{
ConsecutiveReleases::ConsecutiveReleases(Database::Db& db)
ConsecutiveReleases::ConsecutiveReleases(db::Db& db)
: _db {db}
{}
float
ConsecutiveReleases::computeScore(const std::vector<Database::TrackId>& trackIds, std::size_t trackIndex)
ConsecutiveReleases::computeScore(const std::vector<db::TrackId>& trackIds, std::size_t trackIndex)
{
assert(!trackIds.empty());
assert(trackIndex <= trackIds.size() - 1);
const Database::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);
@@ -55,10 +55,10 @@ namespace Recommendation::PlaylistGeneratorConstraint
return score;
}
Database::ReleaseId
ConsecutiveReleases::getReleaseId(Database::TrackId trackId)
db::ReleaseId
ConsecutiveReleases::getReleaseId(db::TrackId trackId)
{
using namespace Database;
using namespace db;
Session& dbSession {_db.getTLSSession()};
auto transaction {dbSession.createReadTransaction()};
@@ -73,5 +73,5 @@ namespace Recommendation::PlaylistGeneratorConstraint
return release->getId();
}
} // namespace Recommendation
} // namespace lms::recommendation
@@ -23,24 +23,24 @@
#include "database/ReleaseId.hpp"
namespace Database
namespace lms::db
{
class Db;
}
namespace Recommendation::PlaylistGeneratorConstraint
namespace lms::recommendation::PlaylistGeneratorConstraint
{
class ConsecutiveReleases : public IConstraint
{
public:
ConsecutiveReleases(Database::Db& db);
ConsecutiveReleases(db::Db& db);
private:
float computeScore(const std::vector<Database::TrackId>& trackIds, std::size_t trackIndex) override;
float computeScore(const std::vector<db::TrackId>& trackIds, std::size_t trackIndex) override;
Database::ReleaseId getReleaseId(Database::TrackId trackId);
db::ReleaseId getReleaseId(db::TrackId trackId);
Database::Db& _db;
db::Db& _db;
};
} // namespace Recommendation
} // namespace lms::recommendation
@@ -21,13 +21,13 @@
#include <algorithm>
namespace Recommendation::PlaylistGeneratorConstraint
namespace lms::recommendation::PlaylistGeneratorConstraint
{
float
DuplicateTracks::computeScore(const std::vector<Database::TrackId>& trackIds, std::size_t trackIndex)
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 Recommendation
} // namespace lms::recommendation
@@ -21,12 +21,12 @@
#include "IConstraint.hpp"
namespace Recommendation::PlaylistGeneratorConstraint
namespace lms::recommendation::PlaylistGeneratorConstraint
{
class DuplicateTracks : public IConstraint
{
private:
float computeScore(const std::vector<Database::TrackId>& trackIds, std::size_t trackIndex) override;
float computeScore(const std::vector<db::TrackId>& trackIds, std::size_t trackIndex) override;
};
} // namespace Recommendation::PlaylistGeneratorConstraints
} // namespace lms::recommendation::PlaylistGeneratorConstraints
@@ -23,7 +23,7 @@
#include "services/recommendation/Types.hpp"
namespace Recommendation::PlaylistGeneratorConstraint
namespace lms::recommendation::PlaylistGeneratorConstraint
{
class IConstraint
{
@@ -36,4 +36,4 @@ namespace Recommendation::PlaylistGeneratorConstraint
// > 1 : violation
virtual float computeScore(const TrackContainer& trackIds, std::size_t trackIndex) = 0;
};
} // namespace Recommendation
} // namespace lms::recommendation