From b4b3bf194efaf370f7fd0852c12ef05823896282 Mon Sep 17 00:00:00 2001 From: tremblap Date: Sat, 11 Jun 2022 15:07:26 +0100 Subject: [PATCH 1/2] change the client name - kept the algo name as it does what it says --- FlucomaClients.cmake | 2 +- .../nrt/{NNDSVDClient.hpp => NMFSeedClient.hpp} | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) rename include/clients/nrt/{NNDSVDClient.hpp => NMFSeedClient.hpp} (91%) diff --git a/FlucomaClients.cmake b/FlucomaClients.cmake index 2a9df87bd..bdfba4723 100644 --- a/FlucomaClients.cmake +++ b/FlucomaClients.cmake @@ -100,7 +100,7 @@ add_client(BufMFCC clients/rt/MFCCClient.hpp CLASS NRTThreadedMFCCClient ) add_client(BufMelBands clients/rt/MelBandsClient.hpp CLASS NRTThreadedMelBandsClient ) add_client(BufNMF clients/nrt/NMFClient.hpp CLASS NRTThreadedNMFClient ) add_client(BufNMFCross clients/nrt/NMFCrossClient.hpp CLASS NRTNMFCrossClient ) -add_client(BufNNDSVD clients/nrt/NNDSVDClient.hpp CLASS NRTThreadedNNDSVDClient ) +add_client(BufNMFSeed clients/nrt/NMFSeedClient.hpp CLASS NRTThreadedNMFSeedClient ) add_client(BufNoveltyFeature clients/rt/NoveltyFeatureClient.hpp CLASS NRTThreadedNoveltyFeatureClient ) add_client(BufNoveltySlice clients/rt/NoveltySliceClient.hpp CLASS NRTThreadingNoveltySliceClient ) add_client(BufOnsetFeature clients/rt/OnsetFeatureClient.hpp CLASS NRTThreadedOnsetFeatureClient ) diff --git a/include/clients/nrt/NNDSVDClient.hpp b/include/clients/nrt/NMFSeedClient.hpp similarity index 91% rename from include/clients/nrt/NNDSVDClient.hpp rename to include/clients/nrt/NMFSeedClient.hpp index 7fd31f347..3366c98ba 100644 --- a/include/clients/nrt/NNDSVDClient.hpp +++ b/include/clients/nrt/NMFSeedClient.hpp @@ -24,7 +24,7 @@ namespace fluid { namespace client { namespace nndsvd { -enum NNDSVDParamIndex { +enum NMFSeedParamIndex { kSource, kFilters, kEnvelopes, @@ -35,7 +35,7 @@ enum NNDSVDParamIndex { kFFT }; -constexpr auto NNDSVDParams = +constexpr auto NMFSeedParams = defineParameters(InputBufferParam("source", "Source Buffer"), BufferParam("bases", "Bases Buffer"), BufferParam("activations", "Activations Buffer"), @@ -48,10 +48,10 @@ constexpr auto NNDSVDParams = "NNDSVDar", "NNDSVDa", "NNDSVD"), FFTParam("fftSettings", "FFT Settings", 1024, -1, -1)); -class NNDSVDClient : public FluidBaseClient, public OfflineIn, public OfflineOut +class NMFSeedClient : public FluidBaseClient, public OfflineIn, public OfflineOut { public: - using ParamDescType = decltype(NNDSVDParams); + using ParamDescType = decltype(NMFSeedParams); using ParamSetViewType = ParameterSetView; std::reference_wrapper mParams; @@ -64,9 +64,9 @@ class NNDSVDClient : public FluidBaseClient, public OfflineIn, public OfflineOut return mParams.get().template get(); } - static constexpr auto getParameterDescriptors() { return NNDSVDParams; } + static constexpr auto getParameterDescriptors() { return NMFSeedParams; } - NNDSVDClient(ParamSetViewType& p) : mParams{p} {} + NMFSeedClient(ParamSetViewType& p) : mParams{p} {} template Result process(FluidContext&) @@ -130,8 +130,8 @@ class NNDSVDClient : public FluidBaseClient, public OfflineIn, public OfflineOut }; } // namespace nndsvd -using NRTThreadedNNDSVDClient = - NRTThreadingAdaptor>; +using NRTThreadedNMFSeedClient = + NRTThreadingAdaptor>; } // namespace client } // namespace fluid From 5967a66be74d056a83b5061919eaf993059a945c Mon Sep 17 00:00:00 2001 From: tremblap Date: Sat, 11 Jun 2022 15:48:50 +0100 Subject: [PATCH 2/2] algo name confounded with client name in the code --- include/clients/nrt/NMFSeedClient.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/clients/nrt/NMFSeedClient.hpp b/include/clients/nrt/NMFSeedClient.hpp index 3366c98ba..fdf5c730b 100644 --- a/include/clients/nrt/NMFSeedClient.hpp +++ b/include/clients/nrt/NMFSeedClient.hpp @@ -131,7 +131,7 @@ class NMFSeedClient : public FluidBaseClient, public OfflineIn, public OfflineOu } // namespace nndsvd using NRTThreadedNMFSeedClient = - NRTThreadingAdaptor>; + NRTThreadingAdaptor>; } // namespace client } // namespace fluid