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

Reorganized sources, better accuracy for similarities based on features

Browse Source
This commit is contained in:
emeric
2019-02-05 14:08:46 +01:00
parent 3e142b5507
commit 6fcb693261
34 changed files with 1324 additions and 1218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile.am
+6 -6
View File
@@ -7,7 +7,7 @@ lms_SOURCES = \
$(srcdir)/database/Artist.cpp \
$(srcdir)/database/Cluster.cpp \
$(srcdir)/database/DatabaseHandler.cpp \
$(srcdir)/database/TrackFeature.cpp \
$(srcdir)/database/TrackFeatures.cpp \
$(srcdir)/database/TrackList.cpp \
$(srcdir)/database/Release.cpp \
$(srcdir)/database/ScanSettings.cpp \
@@ -23,11 +23,11 @@ lms_SOURCES = \
$(srcdir)/scanner/MediaScanner.cpp \
$(srcdir)/similarity/SimilaritySearcher.cpp \
$(srcdir)/similarity/cluster/SimilarityClusterSearcher.cpp \
$(srcdir)/similarity/som/AcousticBrainzUtils.cpp \
$(srcdir)/similarity/som/DataNormalizer.cpp \
$(srcdir)/similarity/som/Network.cpp \
$(srcdir)/similarity/som/SimilaritySOMScannerAddon.cpp \
$(srcdir)/similarity/som/SimilaritySOMSearcher.cpp \
$(srcdir)/similarity/features/SimilarityFeaturesScannerAddon.cpp \
$(srcdir)/similarity/features/SimilarityFeaturesSearcher.cpp \
$(srcdir)/similarity/features/som/AcousticBrainzUtils.cpp \
$(srcdir)/similarity/features/som/DataNormalizer.cpp \
$(srcdir)/similarity/features/som/Network.cpp \
$(srcdir)/ui/Auth.cpp \
$(srcdir)/ui/LmsApplication.cpp \
$(srcdir)/ui/LmsApplicationGroup.cpp \
src/database/DatabaseHandler.cpp
+4 -7
View File
@@ -40,7 +40,7 @@
#include "SimilaritySettings.hpp"
#include "Track.hpp"
#include "TrackList.hpp"
#include "TrackFeature.hpp"
#include "TrackFeatures.hpp"
namespace Database {
@@ -106,11 +106,11 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool)
_session.mapClass<TrackListEntry>("tracklist_entry");
_session.mapClass<Release>("release");
_session.mapClass<Track>("track");
_session.mapClass<TrackFeature>("track_feature");
_session.mapClass<TrackFeatureType>("track_feature_type");
_session.mapClass<TrackFeatures>("track_features");
_session.mapClass<ScanSettings>("scan_settings");
_session.mapClass<SimilaritySettings>("similarity_settings");
_session.mapClass<SimilaritySettingsFeature>("similarity_settings_feature");
_session.mapClass<AuthInfo>("auth_info");
_session.mapClass<AuthInfo::AuthIdentityType>("auth_identity");
@@ -142,10 +142,7 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool)
_session.execute("CREATE INDEX IF NOT EXISTS cluster_name_idx ON cluster(name)");
_session.execute("CREATE INDEX IF NOT EXISTS cluster_type_name_idx ON cluster_type(name)");
_session.execute("CREATE INDEX IF NOT EXISTS tracklist_name_idx ON tracklist(name)");
_session.execute("CREATE INDEX IF NOT EXISTS track_feature_type_name_idx ON track_feature_type(name)");
_session.execute("CREATE INDEX IF NOT EXISTS track_feature_type_idx ON track_feature(type_id)");
_session.execute("CREATE INDEX IF NOT EXISTS track_feature_track_idx ON track_feature(track_id)");
_session.execute("CREATE INDEX IF NOT EXISTS track_feature_type_track_idx ON track_feature(type_id, track_id)");
_session.execute("CREATE INDEX IF NOT EXISTS track_features_track_idx ON track_features(track_id)");
}
_users = new UserDatabase(_session);
src/database/Release.hpp
+1
View File
@@ -59,6 +59,7 @@ class Release : public Wt::Dbo::Dbo<Release>
bool& moreExpected);
std::vector<Wt::Dbo::ptr<Track>> getTracks(const std::set<IdType>& clusters = std::set<IdType>()) const;
// Get the cluster of the tracks that belong to this release
// Each clusters are grouped by cluster type, sorted by the number of occurence
// size is the max number of cluster per cluster type
src/database/SimilaritySettings.cpp
+39 -84
View File
@@ -22,53 +22,42 @@
#include "utils/Logger.hpp"
#include "utils/Utils.hpp"
#include "TrackFeature.hpp"
namespace {
std::set<std::string> defaultTrackFeaturesNames =
{
"lowlevel.average_loudness",
"lowlevel.barkbands_flatness_db.mean",
"lowlevel.dissonance.mean",
"lowlevel.dynamic_complexity",
"lowlevel.hfc.mean", // GOOD
"lowlevel.melbands_crest.mean",
"lowlevel.melbands_kurtosis.mean",
"lowlevel.melbands_skewness.mean",
"lowlevel.melbands_spread.mean",
"lowlevel.pitch_salience.mean",
"lowlevel.pitch_salience.var",
"lowlevel.silence_rate_30dB.mean",
"lowlevel.silence_rate_60dB.mean",
"lowlevel.spectral_centroid.mean",
"lowlevel.spectral_complexity.mean",
"lowlevel.spectral_decrease.mean",
"lowlevel.spectral_energy.mean",
"lowlevel.spectral_energyband_high.mean",
"lowlevel.spectral_energyband_low.mean",
"lowlevel.spectral_energyband_middle_high.mean",
"lowlevel.spectral_energyband_middle_low.mean",
"lowlevel.spectral_entropy.mean",
"lowlevel.spectral_flux.mean",
"lowlevel.spectral_kurtosis.mean",
"lowlevel.spectral_rms.mean",
"lowlevel.spectral_skewness.mean",
"lowlevel.spectral_spread.mean",
"lowlevel.spectral_strongpeak.mean",
"lowlevel.zerocrossingrate.mean",
"rhythm.beats_loudness.mean", // BAD
"rhythm.bpm",
"tonal.chords_changes_rate", // OK
"tonal.chords_number_rate", // BAD
"tonal.chords_strength.mean", // OK
"tonal.hpcp_entropy.mean", // GOOD
};
} // namespace
#include "TrackFeatures.hpp"
namespace Database {
struct TrackFeatureInfo
{
std::string name;
std::size_t nbDimensions;
double weight;
};
static std::vector<TrackFeatureInfo> defaultFeatures =
{
{ "lowlevel.spectral_contrast_coeffs.median", 6, 1. },
{ "lowlevel.erbbands.median", 40, 1. },
{ "tonal.hpcp.median", 36, 1. },
{ "lowlevel.melbands.median", 40, 1. },
{ "lowlevel.barkbands.median", 27, 1. },
{ "lowlevel.mfcc.mean", 13, 1. },
{ "lowlevel.gfcc.mean", 13, 1. },
};
SimilaritySettingsFeature::SimilaritySettingsFeature(Wt::Dbo::ptr<SimilaritySettings> settings, const std::string& name, std::size_t nbDimensions, double weight)
: _name(name),
_nbDimensions(nbDimensions),
_weight(weight),
_settings(settings)
{
}
SimilaritySettingsFeature::pointer
SimilaritySettingsFeature::create(Wt::Dbo::Session& session, Wt::Dbo::ptr<SimilaritySettings> settings, const std::string& name, std::size_t nbDimensions, double weight)
{
return session.add(std::make_unique<SimilaritySettingsFeature>(settings, name, nbDimensions, weight));
}
SimilaritySettings::pointer
SimilaritySettings::get(Wt::Dbo::Session& session)
@@ -77,54 +66,20 @@ SimilaritySettings::get(Wt::Dbo::Session& session)
if (!settings)
{
settings = session.add(std::make_unique<SimilaritySettings>());
settings.modify()->setTrackFeatureTypes(defaultTrackFeaturesNames);
for (const auto& feature : defaultFeatures)
SimilaritySettingsFeature::create(session, settings, feature.name, feature.nbDimensions, feature.weight);
}
return settings;
}
std::vector<Wt::Dbo::ptr<TrackFeatureType>>
SimilaritySettings::getTrackFeatureTypes() const
std::vector<Wt::Dbo::ptr<SimilaritySettingsFeature>>
SimilaritySettings::getFeatures() const
{
return std::vector<Wt::Dbo::ptr<TrackFeatureType>>(_trackFeatureTypes.begin(), _trackFeatureTypes.end());
return std::vector<Wt::Dbo::ptr<SimilaritySettingsFeature>>(_features.begin(), _features.end());
}
void
SimilaritySettings::setTrackFeatureTypes(const std::set<std::string>& featuresNames)
{
bool needRescan = false;
assert(session());
// Create any missing feature type
for (const auto& featureName : featuresNames)
{
auto featureType = TrackFeatureType::getByName(*session(), featureName);
if (!featureType)
{
LMS_LOG(DB, INFO) << "Creating feature type " << featureName;
featureType = TrackFeatureType::create(*session(), featureName);
_trackFeatureTypes.insert(featureType);
needRescan = true;
}
}
// Delete no longer existing feature type
for (auto trackFeatureType : _trackFeatureTypes)
{
if (std::none_of(featuresNames.begin(), featuresNames.end(),
[trackFeatureType](const std::string& name) { return name == trackFeatureType->getName(); }))
{
LMS_LOG(DB, INFO) << "Deleting track feature type " << trackFeatureType->getName();
trackFeatureType.remove();
}
}
if (needRescan)
_scanVersion += 1;
}
} // namespace Database
src/database/SimilaritySettings.hpp
+55 -22
View File
@@ -23,42 +23,75 @@
namespace Database {
class TrackFeature;
class TrackFeatureType;
class SimilaritySettings;
class SimilaritySettings : public Wt::Dbo::Dbo<SimilaritySettings>
class SimilaritySettingsFeature : public Wt::Dbo::Dbo<SimilaritySettingsFeature>
{
public:
using pointer = Wt::Dbo::ptr<SimilaritySettings>;
using pointer = Wt::Dbo::ptr<SimilaritySettingsFeature>;
static pointer get(Wt::Dbo::Session& session);
SimilaritySettingsFeature() = default;
SimilaritySettingsFeature(Wt::Dbo::ptr<SimilaritySettings> settings, const std::string& name, std::size_t nbDimensions, double weight);
std::size_t getVersion() const { return _scanVersion; }
static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr<SimilaritySettings> settings, const std::string& name, std::size_t nbDimensions, double weight = 1);
std::vector<Wt::Dbo::ptr<TrackFeatureType>> getTrackFeatureTypes() const;
void setTrackFeatureTypes(const std::set<std::string>& featureTypeNames);
void setNetworkData(std::string data) { _refFeaturesData = data; }
const std::string& getNetworkData() const { return _refFeaturesData; }
void setNormalizationData(std::string data) { _normalizationData = data; }
const std::string& getNormalizationData() const { return _normalizationData; }
const std::string& getName() const { return _name; } ;
std::size_t getNbDimensions() const { return static_cast<std::size_t>(_nbDimensions); }
double getWeight() const { return _weight; }
template<class Action>
void persist(Action& a)
{
Wt::Dbo::field(a, _scanVersion, "settings_version");
Wt::Dbo::field(a, _normalizationData, "normalization_data");
Wt::Dbo::field(a, _refFeaturesData, "ref_features_data");
Wt::Dbo::hasMany(a, _trackFeatureTypes, Wt::Dbo::ManyToOne, "similarity_settings");
Wt::Dbo::field(a, _name, "name");
Wt::Dbo::field(a, _nbDimensions, "dimension_count");
Wt::Dbo::field(a, _weight, "weight");
Wt::Dbo::belongsTo(a, _settings, "similarity_settings", Wt::Dbo::OnDeleteCascade);
}
private:
std::string _name;
int _nbDimensions;
double _weight;
Wt::Dbo::ptr<SimilaritySettings> _settings;
};
class SimilaritySettings : public Wt::Dbo::Dbo<SimilaritySettings>
{
public:
enum class PreferredMethod
{
Auto,
Features,
Clusters,
};
using pointer = Wt::Dbo::ptr<SimilaritySettings>;
// Utils
static pointer get(Wt::Dbo::Session& session);
// Accessors
std::size_t getVersion() const { return _settingsVersion; }
PreferredMethod getPreferredMethod() const { return _preferredMethod; }
std::vector<Wt::Dbo::ptr<SimilaritySettingsFeature>> getFeatures() const;
template<class Action>
void persist(Action& a)
{
Wt::Dbo::field(a, _settingsVersion, "settings_version");
Wt::Dbo::field(a, _preferredMethod, "preferred_method");
Wt::Dbo::hasMany(a, _features, Wt::Dbo::ManyToOne, "similarity_settings");
}
private:
int _scanVersion = 0;
std::string _normalizationData;
std::string _refFeaturesData;
Wt::Dbo::collection<Wt::Dbo::ptr<TrackFeatureType>> _trackFeatureTypes;
int _settingsVersion = 0;
PreferredMethod _preferredMethod = PreferredMethod::Auto;
Wt::Dbo::collection<Wt::Dbo::ptr<SimilaritySettingsFeature>> _features;
};
src/database/Track.cpp
+7 -13
View File
@@ -26,7 +26,7 @@
#include "Artist.hpp"
#include "Cluster.hpp"
#include "Release.hpp"
#include "TrackFeature.hpp"
#include "TrackFeatures.hpp"
#include "SqlQuery.hpp"
namespace Database {
@@ -114,7 +114,7 @@ Track::getAllWithMBIDAndMissingFeatures(Wt::Dbo::Session& session)
Wt::Dbo::collection<pointer> res = session.query<pointer>
("SELECT t FROM track t")
.where("LENGTH(t.mbid) > 0")
.where("NOT EXISTS (SELECT * FROM track_feature t_f WHERE t_f.track_id = t.id)");
.where("NOT EXISTS (SELECT * FROM track_features t_f WHERE t_f.track_id = t.id)");
return std::vector<pointer>(res.begin(), res.end());
}
@@ -123,7 +123,7 @@ Track::getAllWithFeatures(Wt::Dbo::Session& session)
{
Wt::Dbo::collection<pointer> res = session.query<pointer>
("SELECT t FROM track t")
.where("EXISTS (SELECT * from track_feature t_f WHERE t_f.track_id = t.id)");
.where("EXISTS (SELECT * from track_features t_f WHERE t_f.track_id = t.id)");
return std::vector<pointer>(res.begin(), res.end());
}
@@ -138,7 +138,7 @@ Track::getClusters(void) const
bool
Track::hasTrackFeatures() const
{
return !_trackFeatures.empty();
return (_trackFeatures.lock() != Database::TrackFeatures::pointer());
}
static
@@ -262,16 +262,10 @@ Track::getCopyrightURL() const
return _copyrightURL != "" ? boost::make_optional<std::string>(_copyrightURL) : boost::none;
}
Wt::Dbo::ptr<TrackFeature>
Track::getTrackFeature(Wt::Dbo::ptr<TrackFeatureType> type) const
Wt::Dbo::ptr<TrackFeatures>
Track::getTrackFeatures() const
{
assert(self());
assert(IdIsValid(self()->id()));
assert(session());
return session()->find<TrackFeature>()
.where("type_id = ?").bind(type.id())
.where("track_id = ?").bind(self()->id());
return _trackFeatures.lock();
}
std::vector<std::vector<Cluster::pointer>>
src/database/Track.hpp
+5 -11
View File
@@ -37,8 +37,7 @@ class Artist;
class Cluster;
class ClusterType;
class Release;
class TrackFeature;
class TrackFeatureType;
class TrackFeatures;
class TrackListEntry;
class TrackStats;
@@ -81,7 +80,6 @@ class Track : public Wt::Dbo::Dbo<Track>
// Accessors
void setScanVersion(std::size_t version) { _scanVersion = version; }
void setSimilarityScanVersion(std::size_t version) { _similarityScanVersion = version; }
void setTrackNumber(int num) { _trackNumber = num; }
void setTotalTrackNumber(int num) { _totalTrackNumber = num; }
void setDiscNumber(int num) { _discNumber = num; }
@@ -101,10 +99,9 @@ class Track : public Wt::Dbo::Dbo<Track>
void setArtist(Wt::Dbo::ptr<Artist> artist) { _artist = artist; }
void setRelease(Wt::Dbo::ptr<Release> release) { _release = release; }
void eraseClusters() { _clusters.clear(); }
void eraseFeatures() { _trackFeatures.clear(); }
void eraseFeatures() { /*_trackFeatures.reset();*/ }
std::size_t getScanVersion() const { return _scanVersion; }
std::size_t getSimilarityScanVersion() const { return _similarityScanVersion; }
boost::optional<std::size_t> getTrackNumber() const;
boost::optional<std::size_t> getTotalTrackNumber() const;
boost::optional<std::size_t> getDiscNumber() const;
@@ -124,9 +121,8 @@ class Track : public Wt::Dbo::Dbo<Track>
Wt::Dbo::ptr<Artist> getArtist() const { return _artist; }
Wt::Dbo::ptr<Release> getRelease() const { return _release; }
std::vector<Wt::Dbo::ptr<Cluster>> getClusters() const;
std::vector<Wt::Dbo::ptr<TrackFeature>> getTrackFeatures() const; // ordered by feature's name
bool hasTrackFeatures() const;
Wt::Dbo::ptr<TrackFeature> getTrackFeature(Wt::Dbo::ptr<TrackFeatureType> type) const;
Wt::Dbo::ptr<TrackFeatures> getTrackFeatures() const;
std::vector<std::vector<Wt::Dbo::ptr<Cluster>>> getClusterGroups(std::vector<Wt::Dbo::ptr<ClusterType>> clusterTypes, std::size_t size) const;
@@ -134,7 +130,6 @@ class Track : public Wt::Dbo::Dbo<Track>
void persist(Action& a)
{
Wt::Dbo::field(a, _scanVersion, "scan_version");
Wt::Dbo::field(a, _similarityScanVersion, "similarity_version");
Wt::Dbo::field(a, _trackNumber, "track_number");
Wt::Dbo::field(a, _totalTrackNumber, "total_track_number");
Wt::Dbo::field(a, _discNumber, "disc_number");
@@ -156,7 +151,7 @@ class Track : public Wt::Dbo::Dbo<Track>
Wt::Dbo::belongsTo(a, _artist, "artist", Wt::Dbo::OnDeleteCascade);
Wt::Dbo::hasMany(a, _clusters, Wt::Dbo::ManyToMany, "track_cluster", "", Wt::Dbo::OnDeleteCascade);
Wt::Dbo::hasMany(a, _playlistEntries, Wt::Dbo::ManyToOne, "track");
Wt::Dbo::hasMany(a, _trackFeatures, Wt::Dbo::ManyToOne, "track");
Wt::Dbo::hasOne(a, _trackFeatures);
}
private:
@@ -166,7 +161,6 @@ class Track : public Wt::Dbo::Dbo<Track>
static const std::size_t _maxCopyrightURLLength = 128;
int _scanVersion = 0;
int _similarityScanVersion = 0;
int _trackNumber = 0;
int _totalTrackNumber = 0;
int _discNumber = 0;
@@ -191,7 +185,7 @@ class Track : public Wt::Dbo::Dbo<Track>
Wt::Dbo::ptr<Release> _release;
Wt::Dbo::collection<Wt::Dbo::ptr<Cluster>> _clusters;
Wt::Dbo::collection<Wt::Dbo::ptr<TrackListEntry>> _playlistEntries;
Wt::Dbo::collection<Wt::Dbo::ptr<TrackFeature>> _trackFeatures;
Wt::Dbo::weak_ptr<TrackFeatures> _trackFeatures;
};
src/database/TrackFeature.cpp
-58
View File
@@ -1,58 +0,0 @@
/*
* Copyright (C) 2018 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "TrackFeature.hpp"
#include "SimilaritySettings.hpp"
#include "Track.hpp"
namespace Database {
TrackFeatureType::TrackFeatureType(std::string name)
: _name(name)
{
}
TrackFeatureType::pointer
TrackFeatureType::getByName(Wt::Dbo::Session& session, std::string name)
{
return session.find<TrackFeatureType>().where("name = ?").bind(name);
}
TrackFeatureType::pointer
TrackFeatureType::create(Wt::Dbo::Session& session, std::string name)
{
return session.add(std::make_unique<TrackFeatureType>(name));
}
TrackFeature::TrackFeature(Wt::Dbo::ptr<TrackFeatureType> type, Wt::Dbo::ptr<Track> track, double value)
: _type(type),
_track(track),
_value(value)
{
}
TrackFeature::pointer
TrackFeature::create(Wt::Dbo::Session& session, Wt::Dbo::ptr<TrackFeatureType> type, Wt::Dbo::ptr<Track> track, double value)
{
return session.add(std::make_unique<TrackFeature>(type, track, value));
}
} // namespace Database
src/database/TrackFeature.hpp
-97
View File
@@ -1,97 +0,0 @@
/*
* Copyright (C) 2018 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <string>
#include <Wt/Dbo/Dbo.h>
#include "Types.hpp"
namespace Database {
class Track;
class SimilaritySettings;
class TrackFeatureType : public Wt::Dbo::Dbo<TrackFeatureType>
{
public:
using pointer = Wt::Dbo::ptr<TrackFeatureType>;
TrackFeatureType() = default;
TrackFeatureType(std::string name);
// Find utility
static pointer getByName(Wt::Dbo::Session& session, std::string name);
// Create utility
static pointer create(Wt::Dbo::Session& session, std::string name);
// Accessors
const std::string& getName() const { return _name; }
template<class Action>
void persist(Action& a)
{
Wt::Dbo::field(a, _name, "name");
Wt::Dbo::belongsTo(a, _similaritySettings, "similarity_settings", Wt::Dbo::OnDeleteCascade);
}
private:
std::string _name;
Wt::Dbo::ptr<SimilaritySettings> _similaritySettings;
};
class TrackFeature : public Wt::Dbo::Dbo<TrackFeature>
{
public:
using pointer = Wt::Dbo::ptr<TrackFeature>;
TrackFeature() = default;
TrackFeature(Wt::Dbo::ptr<TrackFeatureType> type, Wt::Dbo::ptr<Track> track, double value);
// Create utility
static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr<TrackFeatureType> type, Wt::Dbo::ptr<Track> track, double value);
Wt::Dbo::ptr<TrackFeatureType> getType() const { return _type; }
double getValue() const { return _value; }
template<class Action>
void persist(Action& a)
{
Wt::Dbo::field(a, _value, "value");
Wt::Dbo::belongsTo(a, _type, "type", Wt::Dbo::OnDeleteCascade);
Wt::Dbo::belongsTo(a, _track, "track", Wt::Dbo::OnDeleteCascade);
}
private:
Wt::Dbo::ptr<TrackFeatureType> _type;
Wt::Dbo::ptr<Track> _track;
double _value = 0.;
};
} // namespace database
src/database/TrackFeatures.cpp
+93
View File
@@ -0,0 +1,93 @@
/*
* Copyright (C) 2018 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "TrackFeatures.hpp"
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/json_parser.hpp>
#include "utils/Logger.hpp"
#include "Track.hpp"
namespace Database {
TrackFeatures::TrackFeatures(Wt::Dbo::ptr<Track> track, const std::string& jsonEncodedFeatures)
: _data(jsonEncodedFeatures),
_track(track)
{
}
TrackFeatures::pointer
TrackFeatures::create(Wt::Dbo::Session& session, Wt::Dbo::ptr<Track> track, const std::string& jsonEncodedFeatures)
{
return session.add(std::make_unique<TrackFeatures>(track, jsonEncodedFeatures));
}
std::vector<double>
TrackFeatures::getFeatures(const std::string& featureNode) const
{
std::vector<double> res;
std::map<std::string, std::vector<double>> features = { {featureNode, {}} };
if (!getFeatures( features ))
return res;
res = std::move(features[featureNode]);
return res;
}
bool
TrackFeatures::getFeatures(std::map<std::string /*name*/, std::vector<double> /*values*/>& features) const
{
try
{
boost::property_tree::ptree root;
std::istringstream iss(_data);
boost::property_tree::read_json(iss, root);
for (auto& featureNode : features)
{
auto node = root.get_child(featureNode.first);
bool hasChildren = false;
for (const auto& child : node.get_child(""))
{
hasChildren = true;
featureNode.second.push_back(child.second.get_value<double>());
}
if (!hasChildren)
{
featureNode.second.push_back(node.get_value<double>());
}
}
return true;
}
catch (boost::property_tree::ptree_error& error)
{
LMS_LOG(DB, ERROR) << "ptree exception: " << error.what();
std::cout << "ptree exception: " << error.what() << std::endl;
return false;
}
}
} // namespace Database
src/database/TrackFeatures.hpp
+63
View File
@@ -0,0 +1,63 @@
/*
* Copyright (C) 2018 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <string>
#include <Wt/Dbo/Dbo.h>
#include "Types.hpp"
namespace Database {
class Track;
class TrackFeatures : public Wt::Dbo::Dbo<TrackFeatures>
{
public:
using pointer = Wt::Dbo::ptr<TrackFeatures>;
TrackFeatures() = default;
TrackFeatures(Wt::Dbo::ptr<Track> track, const std::string& jsonEncodedFeatures);
// Create utility
static pointer create(Wt::Dbo::Session& session, Wt::Dbo::ptr<Track> track, const std::string& jsonEncodedFeatures);
std::vector<double> getFeatures(const std::string& featureNode) const;
bool getFeatures(std::map<std::string /*featureNode*/, std::vector<double> /*values*/>& featureNodes) const;
template<class Action>
void persist(Action& a)
{
Wt::Dbo::field(a, _data, "data");
Wt::Dbo::belongsTo(a, _track, "track", Wt::Dbo::OnDeleteCascade);
}
private:
std::string _data;
Wt::Dbo::ptr<Track> _track;
};
} // namespace database
src/main/main.cpp
+4 -4
View File
@@ -28,7 +28,7 @@
#include "cover/CoverArtGrabber.hpp"
#include "image/Image.hpp"
#include "scanner/MediaScanner.hpp"
#include "similarity/som/SimilaritySOMScannerAddon.hpp"
#include "similarity/features/SimilarityFeaturesScannerAddon.hpp"
#include "similarity/SimilaritySearcher.hpp"
#include "ui/LmsApplication.hpp"
#include "utils/Config.hpp"
@@ -129,11 +129,11 @@ int main(int argc, char* argv[])
// Service initialization order is important
getServices().mediaScanner = std::make_unique<Scanner::MediaScanner>(*connectionPool);
Similarity::SOMScannerAddon similaritySOMScannerAddon(*connectionPool);
Similarity::FeaturesScannerAddon similarityFeaturesScannerAddon(*connectionPool);
getServices().mediaScanner->setAddon(similaritySOMScannerAddon);
getServices().mediaScanner->setAddon(similarityFeaturesScannerAddon);
getServices().coverArtGrabber = std::make_unique<CoverArt::Grabber>();
getServices().similaritySearcher = std::make_unique<Similarity::Searcher>(similaritySOMScannerAddon);
getServices().similaritySearcher = std::make_unique<Similarity::Searcher>(similarityFeaturesScannerAddon);
// bind entry point
server.addEntryPoint(Wt::EntryPointType::Application,
src/scanner/MediaScanner.cpp
+16 -16
View File
@@ -642,32 +642,32 @@ MediaScanner::scanMediaDirectory(boost::filesystem::path mediaDirectory, bool fo
// Check if a file exists and is still in a media directory
static bool
checkFile(const boost::filesystem::path& p, boost::filesystem::path mediaDirectory, const std::set<boost::filesystem::path>& extensions)
checkFile(const boost::filesystem::path& p, const boost::filesystem::path& mediaDirectory, const std::set<boost::filesystem::path>& extensions)
{
try
{
bool status = true;
// For each track, make sure the the file still exists
// and still belongs to a media directory
if (!boost::filesystem::exists( p )
|| !boost::filesystem::is_regular( p ) )
{
LMS_LOG(DBUPDATER, INFO) << "Removing '" << p.string() << "': missing";
status = false;
}
else if (!isPathInParentPath(p, mediaDirectory))
{
LMS_LOG(DBUPDATER, INFO) << "Removing '" << p.string() << "': out of media directory";
status = false;
}
else if (!isFileSupported(p, extensions))
{
LMS_LOG(DBUPDATER, INFO) << "Removing '" << p.string() << "': file format no longer handled";
status = false;
return false;
}
return status;
if (!isPathInParentPath(p, mediaDirectory))
{
LMS_LOG(DBUPDATER, INFO) << "Removing '" << p.string() << "': out of media directory";
return false;
}
if (!isFileSupported(p, extensions))
{
LMS_LOG(DBUPDATER, INFO) << "Removing '" << p.string() << "': file format no longer handled";
return false;
}
return true;
}
catch (boost::filesystem::filesystem_error& e)
@@ -683,7 +683,7 @@ MediaScanner::removeMissingTracks(Stats& stats)
std::vector<boost::filesystem::path> trackPaths = Track::getAllPaths(_db.getSession());;
LMS_LOG(DBUPDATER, DEBUG) << "Checking tracks...";
for (auto& trackPath : trackPaths)
for (const auto& trackPath : trackPaths)
{
if (!_running)
return;
src/similarity/SimilaritySearcher.cpp
+41 -13
View File
@@ -19,40 +19,68 @@
#include "SimilaritySearcher.hpp"
#include "features/SimilarityFeaturesScannerAddon.hpp"
#include "cluster/SimilarityClusterSearcher.hpp"
#include "database/SimilaritySettings.hpp"
namespace Similarity {
Searcher::Searcher(SOMScannerAddon& somAddon)
Searcher::Searcher(FeaturesScannerAddon& somAddon)
: _somAddon(somAddon)
{}
std::vector<Database::IdType>
Searcher::getSimilarTracks(const std::vector<Database::IdType>& tracksId, std::size_t maxCount)
static
Database::SimilaritySettings::PreferredMethod getPreferredMethod(Wt::Dbo::Session& session)
{
auto somSearcher = _somAddon.getSearcher();
if (!somSearcher)
return {};
Wt::Dbo::Transaction transaction(session);
return Database::SimilaritySettings::get(session)->getPreferredMethod();
}
return somSearcher->getSimilarTracks(tracksId, maxCount);
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();
if (method == Database::SimilaritySettings::PreferredMethod::Features
|| (method == Database::SimilaritySettings::PreferredMethod::Auto && somSearcher))
{
return somSearcher->getSimilarTracks(trackIds, maxCount);
}
else
return ClusterSearcher::getSimilarTracks(session, trackIds, maxCount);
}
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();
if (!somSearcher)
return {};
return somSearcher->getSimilarReleases(session, releaseId, maxCount);
if (method == Database::SimilaritySettings::PreferredMethod::Features
|| (method == Database::SimilaritySettings::PreferredMethod::Auto && somSearcher))
{
return somSearcher->getSimilarReleases(releaseId, maxCount);
}
else
return ClusterSearcher::getSimilarReleases(session, releaseId, maxCount);
}
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();
if (!somSearcher)
return {};
return somSearcher->getSimilarArtists(session, artistId, maxCount);
if (method == Database::SimilaritySettings::PreferredMethod::Features
|| (method == Database::SimilaritySettings::PreferredMethod::Auto && somSearcher))
{
return somSearcher->getSimilarArtists(artistId, maxCount);
}
else
return ClusterSearcher::getSimilarArtists(session, artistId, maxCount);
}
} // ns Similarity
src/similarity/SimilaritySearcher.hpp
+7 -4
View File
@@ -19,25 +19,28 @@
#pragma once
#include <set>
#include <Wt/Dbo/Session.h>
#include "database/Types.hpp"
#include "som/SimilaritySOMScannerAddon.hpp"
namespace Similarity {
class FeaturesScannerAddon;
class Searcher
{
public:
Searcher(SOMScannerAddon& somAddon);
Searcher(FeaturesScannerAddon& somAddon);
std::vector<Database::IdType> getSimilarTracks(const std::vector<Database::IdType>& tracksId, std::size_t maxCount);
// Closest results first
std::vector<Database::IdType> getSimilarTracks(Wt::Dbo::Session& session, const std::set<Database::IdType>& tracksId, std::size_t maxCount);
std::vector<Database::IdType> getSimilarReleases(Wt::Dbo::Session& session, Database::IdType releaseId, std::size_t maxCount);
std::vector<Database::IdType> getSimilarArtists(Wt::Dbo::Session& session, Database::IdType artistId, std::size_t maxCount);
private:
SOMScannerAddon& _somAddon;
FeaturesScannerAddon& _somAddon;
};
} // ns Similarity
src/similarity/cluster/SimilarityClusterSearcher.cpp
+94 -31
View File
@@ -22,19 +22,24 @@
#include <random>
#include <chrono>
#include "database/Artist.hpp"
#include "database/Cluster.hpp"
#include "database/Release.hpp"
#include "database/Track.hpp"
#include "utils/Utils.hpp"
namespace Similarity {
namespace ClusterSearcher {
std::vector<Database::IdType>
ClusterSearcher::getSimilarTracks(Wt::Dbo::Session& session, const std::vector<Database::IdType>& tracksId, std::size_t maxCount)
getSimilarTracks(Wt::Dbo::Session& session, const std::set<Database::IdType>& trackIds, std::size_t maxCount)
{
std::vector<Database::IdType> res;
Wt::Dbo::Transaction transaction(session);
std::vector<Database::IdType> clusterIds;
for (auto trackId : tracksId)
for (auto trackId : trackIds)
{
auto track = Database::Track::getById(session, trackId);
if (!track)
@@ -51,26 +56,12 @@ ClusterSearcher::getSimilarTracks(Wt::Dbo::Session& session, const std::vector<D
std::vector<Database::IdType> sortedClusterIds;
uniqueAndSortedByOccurence(clusterIds.begin(), clusterIds.end(), std::back_inserter(sortedClusterIds));
#if 0
auto now = std::chrono::system_clock::now();
std::mt19937 randGenerator(std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count());
std::set<Database::IdType> trackIds;
for (auto clusterId : clusterIds)
{
auto ids = tracklist->getTrackIds();
trackIds = std::set<Database::IdType>(ids.begin(), ids.end());
}
auto cluster = Database::Cluster::getById(session, clusterId);
if (!cluster)
continue;
// Get all the tracks of the tracklist, get the cluster that is mostly used
// and reuse it to get the next track
auto clusters = tracklist->getClusters();
if (clusters.empty())
return;
for (auto cluster : clusters)
{
std::set<Database::IdType> clusterTrackIds = cluster->getTrackIds();
std::set<Database::IdType> candidateTrackIds;
@@ -81,30 +72,102 @@ ClusterSearcher::getSimilarTracks(Wt::Dbo::Session& session, const std::vector<D
if (candidateTrackIds.empty())
continue;
std::uniform_int_distribution<int> dist(0, candidateTrackIds.size() - 1);
for (auto trackId : candidateTrackIds)
{
if (res.size() >= maxCount)
break;
auto trackToAdd = Database::Track::getById(LmsApp->getDboSession(), *std::next(candidateTrackIds.begin(), dist(randGenerator)));
enqueueTrack(trackToAdd);
res.push_back(trackId);
}
return;
if (res.size() >= maxCount)
break;
}
LMS_LOG(UI, INFO) << "No more track to be added!";
#endif
return {};
return res;
}
std::vector<Database::IdType>
ClusterSearcher::getSimilarReleases(Wt::Dbo::Session& session, Database::IdType releaseId, std::size_t maxCount)
getSimilarReleases(Wt::Dbo::Session& session, Database::IdType releaseId, std::size_t maxCount)
{
std::vector<Database::IdType> res;
return {};
Wt::Dbo::Transaction transaction(session);
auto release = Database::Release::getById(session, releaseId);
if (!release)
return res;
auto releaseTracks = release->getTracks();
std::set<Database::IdType> releaseTrackIds;
for (const auto& releaseTrack : releaseTracks)
releaseTrackIds.insert(releaseTrack.id());
auto trackIds = getSimilarTracks(session, releaseTrackIds, maxCount * 5);
for (auto trackId : trackIds)
{
auto track = Database::Track::getById(session, trackId);
if (!track)
continue;
auto trackRelease = track->getRelease();
if (!trackRelease || trackRelease.id() == releaseId)
continue;
if (std::find(res.begin(), res.end(), trackRelease.id()) != res.end())
continue;
res.push_back(trackRelease.id());
if (res.size() == maxCount)
break;
}
return res;
}
std::vector<Database::IdType>
ClusterSearcher::getSimilarArtists(Wt::Dbo::Session& session, Database::IdType artistId, std::size_t maxCount)
getSimilarArtists(Wt::Dbo::Session& session, Database::IdType artistId, std::size_t maxCount)
{
return {};
std::vector<Database::IdType> res;
Wt::Dbo::Transaction transaction(session);
auto artist = Database::Artist::getById(session, artistId);
if (!artist)
return res;
auto artistTracks = artist->getTracks();
std::set<Database::IdType> artistTrackIds;
for (const auto& artistTrack : artistTracks)
artistTrackIds.insert(artistTrack.id());
auto trackIds = getSimilarTracks(session, artistTrackIds, maxCount * 5);
for (auto trackId : trackIds)
{
auto track = Database::Track::getById(session, trackId);
if (!track)
continue;
auto trackArtist = track->getArtist();
if (!trackArtist || trackArtist.id() == artistId)
continue;
if (std::find(res.begin(), res.end(), trackArtist.id()) != res.end())
continue;
res.push_back(trackArtist.id());
if (res.size() == maxCount)
break;
}
return res;
}
} // namespace ClusterSearcher
} // namespace Similarity
src/similarity/cluster/SimilarityClusterSearcher.hpp
+5 -6
View File
@@ -19,18 +19,17 @@
#pragma once
#include <vector>
#include <set>
#include "database/Types.hpp"
namespace Similarity {
class ClusterSearcher
namespace ClusterSearcher
{
public:
std::vector<Database::IdType> getSimilarTracks(Wt::Dbo::Session& session, const std::vector<Database::IdType>& tracksId, std::size_t maxCount);
std::vector<Database::IdType> getSimilarReleases(Wt::Dbo::Session& session, Database::IdType releaseId, std::size_t maxCount);
std::vector<Database::IdType> getSimilarArtists(Wt::Dbo::Session& session, Database::IdType artistId, std::size_t maxCount);
std::vector<Database::IdType> getSimilarTracks(Wt::Dbo::Session& session, const std::set<Database::IdType>& tracksId, std::size_t maxCount);
std::vector<Database::IdType> getSimilarReleases(Wt::Dbo::Session& session, Database::IdType releaseId, std::size_t maxCount);
std::vector<Database::IdType> getSimilarArtists(Wt::Dbo::Session& session, Database::IdType artistId, std::size_t maxCount);
};
} // namespace Similarity
src/similarity/features/SimilarityFeaturesScannerAddon.cpp
+141
View File
@@ -0,0 +1,141 @@
/*
* Copyright (C) 2019 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "SimilarityFeaturesScannerAddon.hpp"
#include "database/Track.hpp"
#include "database/TrackFeatures.hpp"
#include "som/AcousticBrainzUtils.hpp"
#include "utils/Logger.hpp"
namespace Similarity {
namespace {
struct TrackInfo
{
Database::IdType id;
std::string mbid;
};
std::vector<TrackInfo>
getTracksWithMBIDAndMissingFeatures(Wt::Dbo::Session& session)
{
std::vector<TrackInfo> res;
Wt::Dbo::Transaction transaction(session);
auto tracks = Database::Track::getAllWithMBIDAndMissingFeatures(session);
for (auto track : tracks)
res.push_back({track.id(), track->getMBID()});
return res;
}
} // namespace
FeaturesScannerAddon::FeaturesScannerAddon(Wt::Dbo::SqlConnectionPool& connectionPool)
: _db(connectionPool)
{
}
std::shared_ptr<Similarity::FeaturesSearcher>
FeaturesScannerAddon::getSearcher()
{
return std::atomic_load(&_searcher);
}
void
FeaturesScannerAddon::trackUpdated(Database::IdType trackId)
{
Wt::Dbo::Transaction transaction(_db.getSession());
auto track = Database::Track::getById(_db.getSession(), trackId);
if (!track)
return;
track.modify()->eraseFeatures();
}
void
FeaturesScannerAddon::preScanComplete()
{
LMS_LOG(DBUPDATER, DEBUG) << "Getting tracks with missing Features...";
auto tracksInfo = getTracksWithMBIDAndMissingFeatures(_db.getSession());
LMS_LOG(DBUPDATER, DEBUG) << "Getting tracks with missing Features DONE (found " << tracksInfo.size() << ")";
for (const auto& trackInfo : tracksInfo)
fetchFeatures(trackInfo.id, trackInfo.mbid);
updateSearcher();
}
void
FeaturesScannerAddon::updateSearcher()
{
Wt::Dbo::Transaction transaction(_db.getSession());
auto tracks = Database::Track::getAllWithFeatures(_db.getSession());
transaction.commit();
if (tracks.empty())
{
LMS_LOG(DBUPDATER, INFO) << "No track suitable for features similarity clustering";
std::atomic_store(&_searcher, std::shared_ptr<FeaturesSearcher>());
return;
}
auto searcher = std::make_shared<Similarity::FeaturesSearcher>(_db.getSession());
std::atomic_store(&_searcher, searcher);
LMS_LOG(DBUPDATER, INFO) << "New features similarity searcher instanciated";
}
bool
FeaturesScannerAddon::fetchFeatures(Database::IdType trackId, const std::string& MBID)
{
std::map<std::string, double> features;
LMS_LOG(DBUPDATER, DEBUG) << "Fetching low level features for track '" << MBID << "'";
std::string data = AcousticBrainz::extractLowLevelFeatures(MBID);
if (data.empty())
{
LMS_LOG(DBUPDATER, ERROR) << "Cannot extract features using AcousticBrainz!";
return false;
}
// TODO check if the expected features are here
Wt::Dbo::Transaction transaction(_db.getSession());
Wt::Dbo::ptr<Database::Track> track = Database::Track::getById(_db.getSession(), trackId);
if (!track)
return false;
LMS_LOG(DBUPDATER, DEBUG) << "Successfully extracted AcousticBrainz lowlevel features for track '" << track->getPath().string() << "'";
Database::TrackFeatures::create(_db.getSession(), track, data);
return true;
}
} // namespace Similarity
src/similarity/som/SimilaritySOMScannerAddon.hpp → src/similarity/features/SimilarityFeaturesScannerAddon.hpp
+11 -13
View File
@@ -24,20 +24,21 @@
#include "database/DatabaseHandler.hpp"
#include "scanner/MediaScannerAddon.hpp"
#include "SimilaritySOMSearcher.hpp"
#include "SimilarityFeaturesSearcher.hpp"
namespace Similarity {
class SOMScannerAddon : public Scanner::MediaScannerAddon
class FeaturesScannerAddon final : public Scanner::MediaScannerAddon
{
public:
SOMScannerAddon(Wt::Dbo::SqlConnectionPool& connectionPool);
FeaturesScannerAddon(Wt::Dbo::SqlConnectionPool& connectionPool);
std::shared_ptr<SOMSearcher> getSearcher();
std::shared_ptr<FeaturesSearcher> getSearcher();
private:
void refreshSettings() override;
void refreshSettings() override {}
void trackAdded(Database::IdType trackId) override {}
void trackToRemove(Database::IdType trackId) override {}
void trackUpdated(Database::IdType trackId) override;
@@ -45,17 +46,14 @@ class SOMScannerAddon : public Scanner::MediaScannerAddon
bool fetchFeatures(Database::IdType trackId, const std::string& MBID);
void clusterize();
void updateSearcher();
std::size_t _settingsVersion;
std::set<std::string> _featuresName;
Database::Handler _db;
std::shared_ptr<SOMSearcher> _finder;
Database::Handler _db;
std::shared_ptr<FeaturesSearcher> _searcher;
};
SOMScannerAddon* setSOMScannerAddon(SOMScannerAddon addon);
SOMScannerAddon* getSOMScannerAddon();
FeaturesScannerAddon* setFeaturesScannerAddon(FeaturesScannerAddon addon);
FeaturesScannerAddon* getFeaturesScannerAddon();
} // namespace Similarity
src/similarity/features/SimilarityFeaturesSearcher.cpp
+305
View File
@@ -0,0 +1,305 @@
/*
* Copyright (C) 2018 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "SimilarityFeaturesSearcher.hpp"
#include <random>
#include "database/Artist.hpp"
#include "database/SimilaritySettings.hpp"
#include "database/Release.hpp"
#include "database/Track.hpp"
#include "database/TrackFeatures.hpp"
#include "som/DataNormalizer.hpp"
#include "utils/Logger.hpp"
#include "utils/Utils.hpp"
namespace Similarity {
FeaturesSearcher::FeaturesSearcher(Wt::Dbo::Session& session)
{
Wt::Dbo::Transaction transaction(session);
auto settings = Database::SimilaritySettings::get(session);
struct FeatureInfo
{
std::size_t nbDimensions;
double weight;
};
std::map<std::string, FeatureInfo> featuresInfo;
std::size_t nbDimensions = 0;
for (auto feature : settings->getFeatures())
{
featuresInfo[feature->getName()] = { feature->getNbDimensions(), feature->getWeight() };
nbDimensions += feature->getNbDimensions();
}
LMS_LOG(SIMILARITY, DEBUG) << "Getting Tracks with features...";
auto tracks = Database::Track::getAllWithFeatures(session);
LMS_LOG(SIMILARITY, DEBUG) << "Getting Tracks with features DONE";
std::vector<SOM::InputVector> samples;
std::vector<Database::IdType> tracksIds;
LMS_LOG(SIMILARITY, DEBUG) << "Extracting features...";
for (auto track : tracks)
{
SOM::InputVector sample;
std::map<std::string, std::vector<double>> features;
for (const auto& featureInfo : featuresInfo)
features[featureInfo.first] = {};
if (!track->getTrackFeatures()->getFeatures(features))
continue;
// Check dimensions for each feature
bool ok = true;
for (const auto& feature : features)
{
auto it = featuresInfo.find(feature.first);
if (it == featuresInfo.end() || it->second.nbDimensions != feature.second.size())
{
LMS_LOG(SIMILARITY, WARNING) << "Dimension mismatch for feature '" << feature.first << "'. Expected " << it->second.nbDimensions << ", got " << feature.second.size();
ok = false;
break;
}
sample.insert( sample.end(), feature.second.begin(), feature.second.end() );
}
if (!ok)
continue;
samples.emplace_back(std::move(sample));
tracksIds.emplace_back(track.id());
}
LMS_LOG(SIMILARITY, DEBUG) << "Extracting features DONE";
transaction.commit();
if (tracksIds.empty())
{
LMS_LOG(SIMILARITY, INFO) << "Nothing to classify!";
return;
}
LMS_LOG(SIMILARITY, DEBUG) << "Normalizing data...";
SOM::DataNormalizer normalizer(nbDimensions);
normalizer.computeNormalizationFactors(samples);
for (auto& sample : samples)
normalizer.normalizeData(sample);
std::size_t size = std::sqrt(samples.size()/2);
LMS_LOG(SIMILARITY, INFO) << "Found " << samples.size() << " tracks, constructing a " << size << "*" << size << " network";
_network = std::make_unique<SOM::Network>(size, size, nbDimensions);
_artistsMap = SOM::Matrix<std::set<Database::IdType>>(size, size);
_releasesMap = SOM::Matrix<std::set<Database::IdType>>(size, size);
_tracksMap = SOM::Matrix<std::set<Database::IdType>>(size, size);
std::vector<double> weights;
for (const auto& featureInfo : featuresInfo)
{
for (std::size_t i = 0; i < featureInfo.second.nbDimensions; ++i)
weights.push_back(1. / featureInfo.second.nbDimensions * featureInfo.second.weight);
}
LMS_LOG(SIMILARITY, DEBUG) << "Training network...";
_network->train(samples, 20);
LMS_LOG(SIMILARITY, DEBUG) << "Training network DONE";
LMS_LOG(SIMILARITY, DEBUG) << "Classifying tracks...";
for (std::size_t i = 0; i < samples.size(); ++i)
{
Wt::Dbo::Transaction transaction(session);
const auto& sample = samples[i];
auto trackId = tracksIds[i];
auto coords = _network->getClosestRefVectorCoords(sample);
_trackCoords[trackId].insert(coords);
_tracksMap[coords].insert(trackId);
auto track = Database::Track::getById(session, trackId);
if (track->getRelease())
{
_releaseCoords[track->getRelease().id()].insert(coords);
_releasesMap[coords].insert(track->getRelease().id());
}
if (track->getArtist())
{
_artistCoords[track->getArtist().id()].insert(coords);
_artistsMap[coords].insert(track->getArtist().id());
}
}
LMS_LOG(SIMILARITY, DEBUG) << "Classifying tracks DONE";
}
std::vector<Database::IdType>
FeaturesSearcher::getSimilarTracks(const std::set<Database::IdType>& tracksIds, std::size_t maxCount) const
{
return getSimilarObjects(tracksIds, _tracksMap, _trackCoords, maxCount);
}
std::vector<Database::IdType>
FeaturesSearcher::getSimilarReleases(Database::IdType releaseId, std::size_t maxCount) const
{
return getSimilarObjects({releaseId}, _releasesMap, _releaseCoords, maxCount);
}
std::vector<Database::IdType>
FeaturesSearcher::getSimilarArtists(Database::IdType artistId, std::size_t maxCount) const
{
return getSimilarObjects({artistId}, _artistsMap, _artistCoords, maxCount);
}
#if 0
void
FeaturesSearcher::dump(Wt::Dbo::Session& session, std::ostream& os) const
{
os << "Number of tracks classified: " << _trackIdsCoords.size() << std::endl;
os << "Network size: " << _network.getWidth() << " * " << _network.getHeight() << std::endl;
Wt::Dbo::Transaction transaction(session);
for (std::size_t y = 0; y < _network.getHeight(); ++y)
{
for (std::size_t x = 0; x < _network.getWidth(); ++x)
{
const auto& trackIds = _tracksMap[{x, y}];
for (auto trackId : trackIds)
{
auto track = Database::Track::getById(session, trackId);
if (!track)
continue;
os << "{";
if (track->getArtist())
os << track->getArtist()->getName() << " ";
if (track->getRelease())
os << track->getRelease()->getName();
os << "} ";
}
os << "; ";
}
os << std::endl;
}
}
#endif
static
std::set<SOM::Coords>
getMatchingRefVectorsCoords(const std::set<Database::IdType>& ids, const std::map<Database::IdType, std::set<SOM::Coords>>& objectCoords)
{
std::set<SOM::Coords> res;
if (ids.empty())
return res;
for (auto id : ids)
{
auto it = objectCoords.find(id);
if (it == objectCoords.end())
continue;
for (const auto& coords : it->second)
res.insert(coords);
}
return res;
}
static
std::set<Database::IdType>
getObjectsIds(const std::set<SOM::Coords>& coordsSet, const SOM::Matrix<std::set<Database::IdType>>& objectsMap )
{
std::set<Database::IdType> res;
for (const auto& coords : coordsSet)
{
for (auto id : objectsMap.get(coords))
res.insert(id);
}
return res;
}
std::vector<Database::IdType>
FeaturesSearcher::getSimilarObjects(const std::set<Database::IdType>& ids,
const SOM::Matrix<std::set<Database::IdType>>& objectsMap,
const std::map<Database::IdType, std::set<SOM::Coords>>& objectCoords,
std::size_t maxCount) const
{
std::vector<Database::IdType> res;
auto now = std::chrono::system_clock::now();
std::mt19937 randGenerator(std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count());
std::set<SOM::Coords> searchedRefVectorsCoords = getMatchingRefVectorsCoords(ids, objectCoords);
if (searchedRefVectorsCoords.empty())
return res;
while (1)
{
std::set<Database::IdType> closestObjectIds = getObjectsIds(searchedRefVectorsCoords, objectsMap);
// Remove objects that are already in input
for (auto id : ids)
closestObjectIds.erase(id);
{
std::vector<Database::IdType> objectIdsToAdd(closestObjectIds.begin(), closestObjectIds.end());
std::shuffle(objectIdsToAdd.begin(), objectIdsToAdd.end(), randGenerator);
std::copy(objectIdsToAdd.begin(), objectIdsToAdd.end(), std::back_inserter(res));
}
if (res.size() > maxCount)
res.resize(maxCount);
if (res.size() == maxCount)
break;
// If there is not enough objects, try again with closest neighbour until there is too much distance
auto closestRefVectorCoords = _network->getClosestRefVectorCoords(searchedRefVectorsCoords, _networkRefVectorsDistanceMedian * 0.75);
if (!closestRefVectorCoords)
break;
searchedRefVectorsCoords.insert(*closestRefVectorCoords);
}
return res;
}
} // ns Similarity
src/similarity/features/SimilarityFeaturesSearcher.hpp
+64
View File
@@ -0,0 +1,64 @@
/*
* Copyright (C) 2018 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <map>
#include <set>
#include "database/DatabaseHandler.hpp"
#include "database/Types.hpp"
#include "som/Network.hpp"
namespace Similarity {
class FeaturesSearcher
{
public:
FeaturesSearcher(Wt::Dbo::Session& session);
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> getSimilarArtists(Database::IdType artistId, std::size_t maxCount) const;
void dump(Wt::Dbo::Session& session, std::ostream& os) const;
private:
std::vector<Database::IdType> getSimilarObjects(const std::set<Database::IdType>& ids,
const SOM::Matrix<std::set<Database::IdType>>& objectsMap,
const std::map<Database::IdType, std::set<SOM::Coords>>& objectCoords,
std::size_t maxCount) const;
std::unique_ptr<SOM::Network> _network;
double _networkRefVectorsDistanceMedian = 0;
SOM::Matrix<std::set<Database::IdType>> _artistsMap;
std::map<Database::IdType, std::set<SOM::Coords>> _artistCoords;
SOM::Matrix<std::set<Database::IdType>> _releasesMap;
std::map<Database::IdType, std::set<SOM::Coords>> _releaseCoords;
SOM::Matrix<std::set<Database::IdType>> _tracksMap;
std::map<Database::IdType, std::set<SOM::Coords>> _trackCoords;
};
} // ns Similarity
src/similarity/som/AcousticBrainzUtils.cpp → src/similarity/features/som/AcousticBrainzUtils.cpp
+5 -30
View File
@@ -40,31 +40,6 @@ static size_t writeToOStringStream(void *buffer, size_t size, size_t nmemb, void
return size * nmemb;
}
static bool
getFeaturesFromJsonData(const std::string& jsonData, const std::set<std::string>& featuresName, std::map<std::string, double>& features)
{
try
{
boost::property_tree::ptree root;
std::istringstream iss(jsonData);
boost::property_tree::read_json(iss, root);
for (const auto& featureName : featuresName)
{
features[featureName] = root.get<double>(featureName);
}
return true;
}
catch (std::exception& e)
{
LMS_LOG(DBUPDATER, ERROR) << "Cannot extract feature: " << e.what();
return false;
}
}
static std::string
getJsonData(const std::string& mbid)
{
@@ -79,7 +54,7 @@ getJsonData(const std::string& mbid)
curl = curl_easy_init();
if (!curl)
{
LMS_LOG(DBUPDATER, ERROR) << "CURL init failed";
LMS_LOG(SIMILARITY, ERROR) << "CURL init failed";
return data;
}
@@ -92,7 +67,7 @@ getJsonData(const std::string& mbid)
res = curl_easy_perform(curl);
if (res != CURLE_OK)
{
LMS_LOG(DBUPDATER, ERROR) << "CURL perform failed: " << curl_easy_strerror(res);
LMS_LOG(SIMILARITY, ERROR) << "CURL perform failed: " << curl_easy_strerror(res);
return data;
}
@@ -103,10 +78,10 @@ getJsonData(const std::string& mbid)
return data;
}
bool
extractFeatures(const std::string& mbid, const std::set<std::string>& featuresName, std::map<std::string, double>& features)
std::string
extractLowLevelFeatures(const std::string& mbid)
{
return getFeaturesFromJsonData(getJsonData(mbid), featuresName, features);
return getJsonData(mbid);
}
} // namespace Scanner::AcousticBrainz
src/similarity/som/AcousticBrainzUtils.hpp → src/similarity/features/som/AcousticBrainzUtils.hpp
+1 -2
View File
@@ -25,7 +25,6 @@
namespace AcousticBrainz
{
bool extractFeatures(const std::string& MBID, const std::set<std::string>& featuresName, std::map<std::string, double>& features);
std::string extractLowLevelFeatures(const std::string& MBID);
}
src/similarity/som/DataNormalizer.cpp → src/similarity/features/som/DataNormalizer.cpp
-33
View File
@@ -50,11 +50,6 @@ DataNormalizer::DataNormalizer(std::size_t inputDimCount)
{
}
DataNormalizer::DataNormalizer(const std::string& data)
{
serializeFrom(data);
}
void
DataNormalizer::computeNormalizationFactors(const std::vector<InputVector>& inputVectors)
{
@@ -103,34 +98,6 @@ DataNormalizer::normalizeData(InputVector& a) const
}
}
std::string
DataNormalizer::serializeTo() const
{
std::ostringstream oss;
oss << _inputDimCount << " ";
for (std::size_t i = 0; i < _inputDimCount; ++i)
oss << _minmax[i].min << " " << _minmax[i].max;
return oss.str();
}
void
DataNormalizer::serializeFrom(const std::string& data)
{
std::istringstream iss(data);
iss >> _inputDimCount;
_minmax.resize(_inputDimCount);
for (std::size_t i = 0; i < _inputDimCount; ++i)
{
iss >> _minmax[i].min;
iss >> _minmax[i].max;
}
}
void
DataNormalizer::dump(std::ostream& os) const
{
src/similarity/som/DataNormalizer.hpp → src/similarity/features/som/DataNormalizer.hpp
-1
View File
@@ -32,7 +32,6 @@ class DataNormalizer
public:
DataNormalizer(std::size_t inputDimCount);
DataNormalizer(const std::string& data);
void computeNormalizationFactors(const std::vector<InputVector>& dataSamples);
src/similarity/som/Matrix.hpp → src/similarity/features/som/Matrix.hpp
+15 -4
View File
@@ -34,7 +34,15 @@ struct Coords
bool operator<(const Coords& other) const
{
return x < other.x && y < other.y;
if (x == other.x)
return y < other.y;
else
return x < other.x;
}
bool operator==(const Coords& other) const
{
return x == other.x && y == other.y;
}
};
@@ -43,6 +51,8 @@ class Matrix
{
public:
Matrix() = default;
Matrix(std::size_t width, std::size_t height)
: _width(width),
_height(height)
@@ -71,7 +81,6 @@ class Matrix
{
assert(coords.x < _width);
assert(coords.y < _height);
return _values[coords.x + _width*coords.y];
}
@@ -88,6 +97,8 @@ class Matrix
template <typename Func>
Coords getCoordsMinElement(Func func) const
{
assert(!_values.empty());
auto it = std::min_element(_values.begin(), _values.end(), func);
auto index = std::distance(_values.begin(), it);
@@ -96,8 +107,8 @@ class Matrix
private:
std::size_t _width;
std::size_t _height;
std::size_t _width = 0;
std::size_t _height = 0;
std::vector<T> _values;
};
src/similarity/som/Network.cpp → src/similarity/features/som/Network.cpp
+110 -107
View File
@@ -45,11 +45,11 @@ checkSameDimensions(const InputVector& a, std::size_t inputDimCount)
}
static InputVector::value_type
defaultLearningFactor(Network::Progress progress)
defaultLearningFactor(Network::CurrentIteration iteration)
{
constexpr InputVector::value_type initialValue = 1;
return initialValue * exp(-((progress.idIteration + 1) / static_cast<InputVector::value_type>(progress.iterationCount)));
return initialValue * exp(-((iteration.idIteration + 1) / static_cast<InputVector::value_type>(iteration.iterationCount)));
}
static InputVector::value_type
@@ -70,18 +70,18 @@ euclidianSquareDistance(const InputVector& a, const InputVector& b, const InputV
static
InputVector::value_type
sigmaFunc(Network::Progress progress)
sigmaFunc(Network::CurrentIteration iteration)
{
constexpr InputVector::value_type sigma0 = 1;
return sigma0 * exp(- ((progress.idIteration + 1) / static_cast<InputVector::value_type>(progress.iterationCount)));
return sigma0 * exp(- ((iteration.idIteration + 1) / static_cast<InputVector::value_type>(iteration.iterationCount)));
}
static
InputVector::value_type
defaultNeighborhoodFunc(InputVector::value_type norm, Network::Progress progress)
defaultNeighbourhoodFunc(InputVector::value_type norm, Network::CurrentIteration iteration)
{
auto sigma = sigmaFunc(progress);
auto sigma = sigmaFunc(iteration);
return exp(-norm / (2 * sigma * sigma));
}
@@ -168,7 +168,7 @@ _weights(inputDimCount, static_cast<InputVector::value_type>(1)),
_refVectors(width, height),
_distanceFunc(euclidianSquareDistance),
_learningFactorFunc(defaultLearningFactor),
_neighborhoodFunc(defaultNeighborhoodFunc)
_neighbourhoodFunc(defaultNeighbourhoodFunc)
{
auto now = std::chrono::system_clock::now();
std::mt19937 randGenerator(std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count());
@@ -188,15 +188,6 @@ _neighborhoodFunc(defaultNeighborhoodFunc)
}
}
Network::Network(const std::string& data)
: _refVectors(0, 0),
_distanceFunc(euclidianSquareDistance),
_learningFactorFunc(defaultLearningFactor),
_neighborhoodFunc(defaultNeighborhoodFunc)
{
serializeFrom(data);
}
void
Network::setDataWeights(const InputVector& weights)
{
@@ -205,6 +196,50 @@ Network::setDataWeights(const InputVector& weights)
_weights = weights;
}
double
Network::getRefVectorsDistance(Coords coords1, Coords coords2) const
{
return _distanceFunc(_refVectors.get(coords1), _refVectors.get(coords2), _weights);
}
double
Network::computeRefVectorsDistanceMean() const
{
std::vector<double> values;
values.reserve(2*_refVectors.getHeight()*_refVectors.getWidth() - _refVectors.getWidth() - _refVectors.getHeight());
for (std::size_t y = 0; y < _refVectors.getHeight(); ++y)
{
for (std::size_t x = 0; x < _refVectors.getWidth(); ++x)
{
if (x != _refVectors.getWidth() - 1)
values.push_back(getRefVectorsDistance( {x, y}, {x + 1, y}));
if (y != _refVectors.getHeight() - 1)
values.push_back(getRefVectorsDistance( {x, y}, {x, y + 1}));
}
}
return std::accumulate(values.begin(), values.end(), 0.) / values.size();
}
double
Network::computeRefVectorsDistanceMedian() const
{
std::vector<double> values;
values.reserve(2*_refVectors.getHeight()*_refVectors.getWidth() - _refVectors.getWidth() - _refVectors.getHeight());
for (std::size_t y = 0; y < _refVectors.getHeight(); ++y)
{
for (std::size_t x = 0; x < _refVectors.getWidth(); ++x)
{
if (x != _refVectors.getWidth() - 1)
values.push_back(getRefVectorsDistance( {x, y}, {x + 1, y}));
if (y != _refVectors.getHeight() - 1)
values.push_back(getRefVectorsDistance( {x, y}, {x, y + 1}));
}
}
return values[values.size()/2 - 1];
}
void
Network::dump(std::ostream& os) const
{
@@ -223,7 +258,7 @@ Network::dump(std::ostream& os) const
}
Coords
Network::getClosestRefVector(const InputVector& data) const
Network::getClosestRefVectorCoords(const InputVector& data) const
{
return _refVectors.getCoordsMinElement([&](const auto& a, const auto& b)
{
@@ -231,48 +266,77 @@ Network::getClosestRefVector(const InputVector& data) const
});
}
Coords
Network::classify(const InputVector& data) const
boost::optional<Coords>
Network::getClosestRefVectorCoords(const InputVector& data, double maxDistance) const
{
return getClosestRefVector(data);
Coords coords = _refVectors.getCoordsMinElement([&](const auto& a, const auto& b)
{
return (_distanceFunc(a, data, _weights) < _distanceFunc(b, data, _weights));
});
if (_distanceFunc(data, _refVectors.get(coords), _weights) > maxDistance)
return boost::none;
return coords;
}
std::vector<Coords>
Network::classify(const InputVector& data, std::size_t size) const
boost::optional<Coords>
Network::getClosestRefVectorCoords(const std::set<Coords>& refVectorsCoords, double maxDistance) const
{
struct Entry
std::set<Coords> neighboursCoords;
for (const Coords& refVectorCoords : refVectorsCoords)
{
if (refVectorCoords.y > 0)
neighboursCoords.insert({ refVectorCoords.x, refVectorCoords.y - 1 });
if (refVectorCoords.y < _refVectors.getHeight() - 1)
neighboursCoords.insert({ refVectorCoords.x, refVectorCoords.y + 1 });
if (refVectorCoords.x > 0)
neighboursCoords.insert({ refVectorCoords.x - 1, refVectorCoords.y });
if (refVectorCoords.x < _refVectors.getWidth() - 1)
neighboursCoords.insert({ refVectorCoords.x + 1, refVectorCoords.y });
}
// remove coords that are in the input coords
for (const auto& refVectorCoords : refVectorsCoords)
neighboursCoords.erase(refVectorCoords);
if (neighboursCoords.empty())
return boost::none;
// Now compute the distance for each neighbour
struct NeighbourInfo
{
Coords coords;
InputVector refVector;
double distance;
};
std::vector<Entry> sortedEntries;
for (std::size_t x = 0; x < _refVectors.getWidth(); ++x)
std::vector<NeighbourInfo> neighboursInfo;
for (const Coords& neighbourCoords : neighboursCoords)
{
for (std::size_t y = 0; y < _refVectors.getHeight(); ++y)
{
sortedEntries.push_back( Entry{{x, y}, _refVectors.get({x, y})} );
}
auto min = std::min_element(refVectorsCoords.begin(), refVectorsCoords.end(),
[this, neighbourCoords](const auto& a, const auto& b)
{
return (this->getRefVectorsDistance(a, neighbourCoords) < this->getRefVectorsDistance(b, neighbourCoords));
});
double distance = getRefVectorsDistance(neighbourCoords, *min);
if (distance > maxDistance)
continue;
neighboursInfo.push_back({neighbourCoords, distance});
}
const InputVector& closestRefVector = _refVectors.get(getClosestRefVector(data));
if (neighboursInfo.empty())
return boost::none;
std::sort(sortedEntries.begin(), sortedEntries.end(),
[&](const Entry& a, const Entry& b)
auto min = std::min_element(neighboursInfo.begin(), neighboursInfo.end(),
[&](const auto& a, const auto& b)
{
return _distanceFunc(a.refVector, closestRefVector, _weights) < _distanceFunc(b.refVector, closestRefVector, _weights);
return a.distance < b.distance;
});
std::vector<Coords> res;
for (const Entry& entry : sortedEntries)
{
res.push_back(entry.coords);
if (res.size() == size)
break;
}
return res;
return min->coords;
}
static InputVector::value_type
@@ -286,7 +350,7 @@ computeCoordsNorm(Coords c1, Coords c2)
void
Network::updateRefVectors(Coords closestRefVectorCoords, const InputVector& input, Progress progress)
Network::updateRefVectors(Coords closestRefVectorCoords, const InputVector& input, CurrentIteration iteration)
{
for (std::size_t y = 0; y < _refVectors.getHeight(); ++y)
{
@@ -298,7 +362,7 @@ Network::updateRefVectors(Coords closestRefVectorCoords, const InputVector& inpu
auto n = computeCoordsNorm({x, y}, closestRefVectorCoords);
auto oldRefVector = refVector;
refVector = refVector + delta * (_learningFactorFunc(progress) * _neighborhoodFunc(n, progress));
refVector = refVector + delta * (_learningFactorFunc(iteration) * _neighbourhoodFunc(n, iteration));
}
}
}
@@ -324,74 +388,13 @@ Network::train(const std::vector<InputVector>& inputData, std::size_t nbIteratio
for (auto input : inputDataShuffled)
{
Coords closestRefVectorCoords = getClosestRefVector(*input);
Coords closestRefVectorCoords = getClosestRefVectorCoords(*input);
updateRefVectors(closestRefVectorCoords, *input, {i, nbIterations});
}
}
}
std::string
Network::serializeTo() const
{
std::ostringstream oss;
oss << _inputDimCount << " ";
for (auto weight : _weights)
oss << weight << " ";
// Matrix
oss << _refVectors.getWidth() << " " << _refVectors.getHeight() << " ";
for (std::size_t x = 0; x < _refVectors.getWidth(); ++x)
{
for (std::size_t y = 0; y < _refVectors.getHeight(); ++y)
{
for (auto val : _refVectors.get({x,y}))
oss << val << " ";
}
}
return oss.str();
}
void
Network::serializeFrom(const std::string& data)
{
std::istringstream iss(data);
LMS_LOG(SIMILARITY, DEBUG) << "data = '" << data << "'";
iss >> _inputDimCount;
LMS_LOG(SIMILARITY, DEBUG) << "Input dim count = " << _inputDimCount;
for (std::size_t i = 0; i < _inputDimCount; ++i)
{
InputVector::value_type val;
iss >> val;
_weights.push_back(val);
}
LMS_LOG(SIMILARITY, DEBUG) << "Reading matrix...";
std::size_t width, height;
iss >> width >> height;
_refVectors = Matrix<SOM::InputVector>(width, height);
for (std::size_t x = 0; x < _refVectors.getWidth(); ++x)
{
for (std::size_t y = 0; y < _refVectors.getHeight(); ++y)
{
InputVector refVector;
refVector.reserve(_inputDimCount);
for (std::size_t i = 0; i < _inputDimCount; ++i)
{
InputVector::value_type val;
iss >> val;
refVector.push_back(val);
}
_refVectors.get({x, y}) = refVector;
}
}
}
} // namespace SOM
src/similarity/som/Network.hpp → src/similarity/features/som/Network.hpp
+19 -18
View File
@@ -20,9 +20,12 @@
#pragma once
#include <vector>
#include <set>
#include <ostream>
#include <functional>
#include <boost/optional.hpp>
#include "Matrix.hpp"
#include "utils/Exception.hpp"
@@ -58,45 +61,43 @@ class Network
// Set weight for each dimension (default is 1 for each weight)
void setDataWeights(const InputVector& weights);
// data must be normalized
// <!> data must be normalized
void train(const std::vector<InputVector>& dataSamples, std::size_t nbIterations);
// data must be normalized
Coords classify(const InputVector& data) const;
Coords getClosestRefVectorCoords(const InputVector& data) const;
boost::optional<Coords> getClosestRefVectorCoords(const InputVector& data, double maxDistance) const;
// ordered from closest to farthest
std::vector<Coords> classify(const InputVector& data, std::size_t size) const;
boost::optional<Coords> getClosestRefVectorCoords(const std::set<Coords>& refVectorsCoords, double maxDistance) const;
double getRefVectorsDistance(Coords coords1, Coords coords2) const;
double computeRefVectorsDistanceMean() const;
double computeRefVectorsDistanceMedian() const;
void dump(std::ostream& os) const;
// For each ref vector, update formula is:
// i is the current iteration
// refVector(i+1) = refVector(i) + LearningFactor(i) * NeighborhoodFunc(i) * (MatchingRefVector - refVector)
// refVector(i+1) = refVector(i) + LearningFactor(i) * NeighbourhoodFunc(i) * (MatchingRefVector - refVector)
using DistanceFunc = std::function<InputVector::value_type(const InputVector& /* a */, const InputVector& /* b */, const InputVector& /* weights */)>;
void setDistanceFunc(DistanceFunc distanceFunc);
struct Progress
struct CurrentIteration
{
std::size_t idIteration;
std::size_t iterationCount;
};
using LearningFactorFunc = std::function<InputVector::value_type(Progress)>;
using LearningFactorFunc = std::function<InputVector::value_type(CurrentIteration)>;
void setLearningFactorFunc(LearningFactorFunc learningFactorFunc);
using NeighborhoodFunc = std::function<InputVector::value_type(InputVector::value_type /* norm(Coords - CoordMatchingRefVector) */, Progress)>;
void setNeighborhoodFunc(NeighborhoodFunc neighborhoodFunc);
std::string serializeTo() const;
using NeighbourhoodFunc = std::function<InputVector::value_type(InputVector::value_type /* norm(Coords - CoordMatchingRefVector) */, CurrentIteration)>;
void setNeighbourhoodFunc(NeighbourhoodFunc neighbourhoodFunc);
private:
void serializeFrom(const std::string& data);
Coords getClosestRefVector(const InputVector& data) const;
void updateRefVectors(Coords closestRefVectorCoords, const InputVector& input, Progress progress);
void updateRefVectors(Coords closestRefVectorCoords, const InputVector& input, CurrentIteration iteration);
std::size_t _inputDimCount;
InputVector _weights; // weight for each dimension
@@ -104,7 +105,7 @@ class Network
DistanceFunc _distanceFunc;
LearningFactorFunc _learningFactorFunc;
NeighborhoodFunc _neighborhoodFunc;
NeighbourhoodFunc _neighbourhoodFunc;
};
} // namespace SOM
src/similarity/som/SimilaritySOMScannerAddon.cpp
-272
View File
@@ -1,272 +0,0 @@
/*
* Copyright (C) 2019 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "SimilaritySOMScannerAddon.hpp"
#include <cmath>
#include "database/Track.hpp"
#include "database/SimilaritySettings.hpp"
#include "database/TrackFeature.hpp"
#include "utils/Logger.hpp"
#include "AcousticBrainzUtils.hpp"
#include "DataNormalizer.hpp"
#include "Network.hpp"
namespace Similarity {
namespace {
struct TrackInfo
{
Database::IdType id;
std::string mbid;
};
std::vector<TrackInfo>
getTracksWithMBIDAndMissingFeatures(Wt::Dbo::Session& session)
{
std::vector<TrackInfo> res;
Wt::Dbo::Transaction transaction(session);
auto tracks = Database::Track::getAllWithMBIDAndMissingFeatures(session);
for (auto track : tracks)
res.push_back({track.id(), track->getMBID()});
return res;
}
std::vector<Database::TrackFeatureType::pointer>
getTrackFeatureTypes(Wt::Dbo::Session& session, const std::set<std::string>& featureNames)
{
std::vector<Database::TrackFeatureType::pointer> res;
for (const auto& featureName : featureNames)
{
auto trackFeatureType = Database::TrackFeatureType::getByName(session, featureName);
if (!trackFeatureType)
{
LMS_LOG(DBUPDATER, ERROR) << "Missing feature type '" << featureName << "'";
res.clear();
return res;
}
res.push_back(trackFeatureType);
}
return res;
}
bool
extractFeatures(const Database::Track::pointer& track, const std::vector<Database::TrackFeatureType::pointer>& trackFeatureTypes, std::vector<double>& features)
{
features.reserve(trackFeatureTypes.size());
for (const auto& trackFeatureType : trackFeatureTypes)
{
auto feature = track->getTrackFeature(trackFeatureType);
if (!feature)
{
LMS_LOG(DBUPDATER, ERROR) << "Missing feature " << trackFeatureType->getName() << " for track '" << track->getPath().string() << "'";
return false;
}
features.emplace_back(feature->getValue());
}
return true;
}
} // namespace
SOMScannerAddon::SOMScannerAddon(Wt::Dbo::SqlConnectionPool& connectionPool)
: _db(connectionPool)
{
refreshSettings();
clusterize();
}
std::shared_ptr<Similarity::SOMSearcher>
SOMScannerAddon::getSearcher()
{
return std::atomic_load(&_finder);
}
void
SOMScannerAddon::trackUpdated(Database::IdType trackId)
{
Wt::Dbo::Transaction transaction(_db.getSession());
auto track = Database::Track::getById(_db.getSession(), trackId);
if (!track)
return;
track.modify()->eraseFeatures();
}
void
SOMScannerAddon::preScanComplete()
{
auto tracksInfo = getTracksWithMBIDAndMissingFeatures(_db.getSession());
for (const auto& trackInfo : tracksInfo)
fetchFeatures(trackInfo.id, trackInfo.mbid);
LMS_LOG(DBUPDATER, INFO) << "Clustering tracks...";
clusterize();
LMS_LOG(DBUPDATER, INFO) << "Clusterization complete!";
}
void
SOMScannerAddon::clusterize()
{
Wt::Dbo::Transaction transaction(_db.getSession());
auto trackFeatureTypes = getTrackFeatureTypes(_db.getSession(), _featuresName);
LMS_LOG(DBUPDATER, DEBUG) << "Getting feature types DONE...";
LMS_LOG(DBUPDATER, DEBUG) << "Getting Tracks with features...";
auto tracks = Database::Track::getAllWithFeatures(_db.getSession());
LMS_LOG(DBUPDATER, DEBUG) << "Getting Tracks with features DONE";
std::vector<SOM::InputVector> samples;
std::vector<Database::IdType> tracksIds;
LMS_LOG(DBUPDATER, DEBUG) << "Extracting features...";
for (auto track : tracks)
{
SOM::InputVector sample;
if (!extractFeatures(track, trackFeatureTypes, sample))
continue;
samples.emplace_back(std::move(sample));
tracksIds.emplace_back(track.id());
}
LMS_LOG(DBUPDATER, DEBUG) << "Extracting features DONE";
transaction.commit();
if (tracksIds.empty())
{
LMS_LOG(DBUPDATER, INFO) << "Nothing to classify!";
std::atomic_store(&_finder, std::shared_ptr<SOMSearcher>());
return;
}
LMS_LOG(DBUPDATER, DEBUG) << "Normalizing data...";
SOM::DataNormalizer normalizer(_featuresName.size());
normalizer.computeNormalizationFactors(samples);
for (auto& sample : samples)
normalizer.normalizeData(sample);
std::size_t size = std::sqrt(samples.size()/5);
LMS_LOG(DBUPDATER, DEBUG) << "Found " << samples.size() << " tracks, Constructing a " << size << "*" << size << " network";
SOM::Network network(size, size, _featuresName.size());
LMS_LOG(DBUPDATER, DEBUG) << "Training network...";
network.train(samples, 20);
LMS_LOG(DBUPDATER, DEBUG) << "Training network DONE";
// Now classify all the tracks
LMS_LOG(DBUPDATER, DEBUG) << "Classifying tracks...";
SOM::Matrix<std::vector<Database::IdType>> tracksMap(network.getWidth(), network.getHeight());
std::map<Database::IdType, SOM::Coords> trackIdsCoords;
for (std::size_t i = 0; i < samples.size(); ++i)
{
const auto& sample = samples[i];
auto trackId = tracksIds[i];
auto coords = network.classify(sample);
tracksMap[coords].push_back(trackId);
trackIdsCoords[trackId] = coords;
}
Similarity::SOMSearcher::ConstructionParams params{std::move(network), std::move(normalizer), std::move(tracksMap), std::move(trackIdsCoords)};
auto finder = std::make_shared<Similarity::SOMSearcher>(std::move(params));
std::atomic_store(&_finder, finder);
LMS_LOG(DBUPDATER, DEBUG) << "Classifying tracks DONE";
LMS_LOG(DBUPDATER, DEBUG) << "Dumping classifier:";
std::ofstream ofs("/tmp/output");
finder->dump(_db.getSession(), ofs);
LMS_LOG(DBUPDATER, DEBUG) << "Dumping classifier DONE";
}
void
SOMScannerAddon::refreshSettings()
{
Wt::Dbo::Transaction transaction(_db.getSession());
auto settings = Database::SimilaritySettings::get(_db.getSession());
_settingsVersion = settings->getVersion();
for (auto trackFeatureType : settings->getTrackFeatureTypes())
{
_featuresName.insert(trackFeatureType->getName());
}
}
bool
SOMScannerAddon::fetchFeatures(Database::IdType trackId, const std::string& MBID)
{
std::map<std::string, double> features;
if (!AcousticBrainz::extractFeatures(MBID, _featuresName, features))
{
LMS_LOG(DBUPDATER, ERROR) << "Cannot extract features using AcousticBrainz!";
return false;
}
Wt::Dbo::Transaction transaction(_db.getSession());
Wt::Dbo::ptr<Database::Track> track = Database::Track::getById(_db.getSession(), trackId);
if (!track)
return false;
LMS_LOG(DBUPDATER, DEBUG) << "Successfully extracted AcousticBrainz lowlevel features for track '" << track->getPath().string() << "'";
for (const auto& feature : features)
{
auto featureType = Database::TrackFeatureType::getByName(_db.getSession(), feature.first);
if (!featureType)
return false;
Database::TrackFeature::create(_db.getSession(), featureType, track, feature.second);
}
return true;
}
} // namespace Similarity
src/similarity/som/SimilaritySOMSearcher.cpp
-259
View File
@@ -1,259 +0,0 @@
/*
* Copyright (C) 2018 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "SimilaritySOMSearcher.hpp"
#include <random>
#include "database/Artist.hpp"
#include "database/SimilaritySettings.hpp"
#include "database/Release.hpp"
#include "database/Track.hpp"
#include "utils/Logger.hpp"
#include "utils/Utils.hpp"
namespace Similarity {
SOMSearcher::SOMSearcher(ConstructionParams params)
: _network(std::move(params.network)),
_normalizer(std::move(params.normalizer)),
_tracksMap(std::move(params.tracksMap)),
_trackIdsCoords(std::move(params.trackIdsCoords))
{
}
std::vector<Database::IdType>
SOMSearcher::getSimilarTracks(const std::vector<Database::IdType>& tracksIds, std::size_t maxCount)
{
std::vector<Database::IdType> res;
auto bestCoords = getBestMatchingCoords(tracksIds);
if (!bestCoords)
return res;
auto tracks = _tracksMap[*bestCoords];
auto now = std::chrono::system_clock::now();
std::mt19937 randGenerator(std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count());
std::shuffle(tracks.begin(), tracks.end(), randGenerator);
if (tracks.size() > maxCount)
tracks.resize(maxCount);
return tracks;
}
std::vector<Database::IdType>
SOMSearcher::getSimilarReleases(Wt::Dbo::Session& session, Database::IdType releaseId, std::size_t maxCount)
{
std::vector<Database::IdType> res;
Wt::Dbo::Transaction transaction(session);
auto release = Database::Release::getById(session, releaseId);
if (!release)
return res;
auto tracks = release->getTracks();
std::vector<Database::IdType> tracksIds;
for (auto track : tracks)
tracksIds.push_back(track.id());
auto matchingCoords = getMatchingCoords(tracksIds);
if (matchingCoords.empty())
return res;
auto releases = getReleases(session, matchingCoords);
uniqueAndSortedByOccurence(releases.begin(), releases.end(), std::back_inserter(res));
res.erase(std::remove_if(res.begin(), res.end(), [&](auto releaseId) { return releaseId == release.id(); }), res.end());
if (res.size() > maxCount)
res.resize(maxCount);
LMS_LOG(SIMILARITY, DEBUG) << "*** SIMILARITY RESULT *** :";
for (auto id : res)
LMS_LOG(SIMILARITY, DEBUG) << id;
return res;
}
std::vector<Database::IdType>
SOMSearcher::getSimilarArtists(Wt::Dbo::Session& session, Database::IdType artistId, std::size_t maxCount)
{
std::vector<Database::IdType> res;
Wt::Dbo::Transaction transaction(session);
auto artist = Database::Artist::getById(session, artistId);
if (!artist)
return res;
auto tracks = artist->getTracks();
std::vector<Database::IdType> tracksIds;
for (auto track : tracks)
tracksIds.push_back(track.id());
auto matchingCoords = getMatchingCoords(tracksIds);
if (matchingCoords.empty())
return res;
auto artists = getArtists(session, matchingCoords);
uniqueAndSortedByOccurence(artists.begin(), artists.end(), std::back_inserter(res));
res.erase(std::remove_if(res.begin(), res.end(), [&](auto artistId) { return artistId == artist.id(); }), res.end());
if (res.size() > maxCount)
res.resize(maxCount);
LMS_LOG(SIMILARITY, DEBUG) << "*** SIMILARITY RESULT *** :";
for (auto id : res)
LMS_LOG(SIMILARITY, DEBUG) << id;
return res;
}
void
SOMSearcher::dump(Wt::Dbo::Session& session, std::ostream& os) const
{
os << "Number of tracks classified: " << _trackIdsCoords.size() << std::endl;
os << "Network size: " << _network.getWidth() << " * " << _network.getHeight() << std::endl;
Wt::Dbo::Transaction transaction(session);
for (std::size_t y = 0; y < _network.getHeight(); ++y)
{
for (std::size_t x = 0; x < _network.getWidth(); ++x)
{
const auto& trackIds = _tracksMap[{x, y}];
for (auto trackId : trackIds)
{
auto track = Database::Track::getById(session, trackId);
if (!track)
continue;
os << "{";
if (track->getArtist())
os << track->getArtist()->getName() << " ";
if (track->getRelease())
os << track->getRelease()->getName();
os << "} ";
}
os << "; ";
}
os << std::endl;
}
}
boost::optional<SOM::Coords>
SOMSearcher::getBestMatchingCoords(const std::vector<Database::IdType>& tracksIds) const
{
if (tracksIds.empty())
return boost::none;
std::map<SOM::Coords, std::size_t /*count*/> coordsCount;
for (auto trackId : tracksIds)
{
auto it = _trackIdsCoords.find(trackId);
if (it == _trackIdsCoords.end())
continue;
if (coordsCount.find(it->second) == coordsCount.end())
coordsCount[it->second] = 0;
coordsCount[it->second]++;
}
if (coordsCount.empty())
return boost::none;
auto bestCoords = std::max_element(std::begin(coordsCount), std::end(coordsCount),
[](const auto& a, const auto& b)
{
return a.second < b.second;
});
return bestCoords->first;
}
std::vector<SOM::Coords>
SOMSearcher::getMatchingCoords(const std::vector<Database::IdType>& tracksIds) const
{
std::vector<SOM::Coords> res;
if (tracksIds.empty())
return res;
for (auto trackId : tracksIds)
{
auto it = _trackIdsCoords.find(trackId);
if (it == _trackIdsCoords.end())
continue;
res.push_back(it->second);
}
return res;
}
std::vector<Database::IdType>
SOMSearcher::getReleases(Wt::Dbo::Session& session, const std::vector<SOM::Coords>& coords) const
{
std::vector<Database::IdType> res;
for (const auto& c : coords)
{
for (auto trackId : _tracksMap[c])
{
auto track = Database::Track::getById(session, trackId);
if (!track || !track->getRelease())
continue;
res.emplace_back(track->getRelease().id());
}
}
return res;
}
std::vector<Database::IdType>
SOMSearcher::getArtists(Wt::Dbo::Session& session, const std::vector<SOM::Coords>& coords) const
{
std::vector<Database::IdType> res;
for (const auto& c : coords)
{
for (auto trackId : _tracksMap[c])
{
auto track = Database::Track::getById(session, trackId);
if (!track || !track->getArtist())
continue;
res.emplace_back(track->getArtist().id());
}
}
return res;
}
} // ns Similarity
src/similarity/som/SimilaritySOMSearcher.hpp
-65
View File
@@ -1,65 +0,0 @@
/*
* Copyright (C) 2018 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <map>
#include <boost/optional.hpp>
#include "database/DatabaseHandler.hpp"
#include "database/Types.hpp"
#include "DataNormalizer.hpp"
#include "Network.hpp"
namespace Similarity {
class SOMSearcher
{
public:
struct ConstructionParams
{
SOM::Network network;
SOM::DataNormalizer normalizer;
SOM::Matrix<std::vector<Database::IdType>> tracksMap;
std::map<Database::IdType, SOM::Coords> trackIdsCoords;
};
SOMSearcher(ConstructionParams params);
std::vector<Database::IdType> getSimilarTracks(const std::vector<Database::IdType>& tracksId, std::size_t maxCount);
std::vector<Database::IdType> getSimilarReleases(Wt::Dbo::Session& session, Database::IdType releaseId, std::size_t maxCount);
std::vector<Database::IdType> getSimilarArtists(Wt::Dbo::Session& session, Database::IdType artistId, std::size_t maxCount);
void dump(Wt::Dbo::Session& session, std::ostream& os) const;
private:
boost::optional<SOM::Coords> getBestMatchingCoords(const std::vector<Database::IdType>& tracksIds) const;
std::vector<SOM::Coords> getMatchingCoords(const std::vector<Database::IdType>& tracksIds) const;
std::vector<Database::IdType> getReleases(Wt::Dbo::Session& session, const std::vector<SOM::Coords>& coords) const;
std::vector<Database::IdType> getArtists(Wt::Dbo::Session& session, const std::vector<SOM::Coords>& coords) const;
SOM::Network _network;
SOM::DataNormalizer _normalizer;
SOM::Matrix<std::vector<Database::IdType>> _tracksMap;
std::map<Database::IdType, SOM::Coords> _trackIdsCoords;
};
} // ns Similarity
src/ui/PlayQueueView.cpp
+1 -1
View File
@@ -388,7 +388,7 @@ PlayQueue::addRadioTrack()
if (trackIds.empty())
return;
auto res = getServices().similaritySearcher->getSimilarTracks(trackIds, 1);
auto res = getServices().similaritySearcher->getSimilarTracks(LmsApp->getDboSession(), std::set<Database::IdType>(trackIds.begin(), trackIds.end()), 1);
for (auto trackId : res)
{
auto trackToAdd = Database::Track::getById(LmsApp->getDboSession(), trackId);