Skip to content

BufNNDSVD -> BufNMFSeed #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tremblap merged 2 commits into from
Jun 13, 2022
Merged

BufNNDSVD -> BufNMFSeed #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4b3bf1
change the client name - kept the algo name as it does what it says
tremblap Jun 11, 2022
5967a66
algo name confounded with client name in the code
tremblap Jun 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FlucomaClients.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
16 changes: 8 additions & 8 deletions include/clients/nrt/NNDSVDClient.hpp → include/clients/nrt/NMFSeedClient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace fluid {
namespace client {
namespace nndsvd {

enum NNDSVDParamIndex {
enum NMFSeedParamIndex {
kSource,
kFilters,
kEnvelopes,
Expand All @@ -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"),
Expand All @@ -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<ParamDescType>;
std::reference_wrapper<ParamSetViewType> mParams;
Expand All @@ -64,9 +64,9 @@ class NNDSVDClient : public FluidBaseClient, public OfflineIn, public OfflineOut
return mParams.get().template get<N>();
}

static constexpr auto getParameterDescriptors() { return NNDSVDParams; }
static constexpr auto getParameterDescriptors() { return NMFSeedParams; }

NNDSVDClient(ParamSetViewType& p) : mParams{p} {}
NMFSeedClient(ParamSetViewType& p) : mParams{p} {}

template <typename T>
Result process(FluidContext&)
Expand Down Expand Up @@ -130,8 +130,8 @@ class NNDSVDClient : public FluidBaseClient, public OfflineIn, public OfflineOut
};
} // namespace nndsvd

using NRTThreadedNNDSVDClient =
NRTThreadingAdaptor<ClientWrapper<nndsvd::NNDSVDClient>>;
using NRTThreadedNMFSeedClient =
NRTThreadingAdaptor<ClientWrapper<nndsvd::NMFSeedClient>>;

} // namespace client
} // namespace fluid