diff --git a/include/flucoma/algorithms/public/KMeans.hpp b/include/flucoma/algorithms/public/KMeans.hpp index 171a1c1b..77ba190c 100644 --- a/include/flucoma/algorithms/public/KMeans.hpp +++ b/include/flucoma/algorithms/public/KMeans.hpp @@ -224,6 +224,8 @@ class KMeans mMeans = _impl::asEigen(means); mDims = mMeans.cols(); mK = mMeans.rows(); + assert(mDims > 0); + assert(mK > 0); mEmpty = std::vector(asUnsigned(mK), false); mTrained = true; } diff --git a/include/flucoma/clients/nrt/KMeansClient.hpp b/include/flucoma/clients/nrt/KMeansClient.hpp index 1ffab321..580a31d8 100644 --- a/include/flucoma/clients/nrt/KMeansClient.hpp +++ b/include/flucoma/clients/nrt/KMeansClient.hpp @@ -36,7 +36,7 @@ class KMeansClient : public FluidBaseClient, public DataClient { enum {kName, kNumClusters, kMaxIter, kInit, kRandomSeed}; - ParameterTrackChanges mTracker; + public: using string = std::string; using BufferPtr = std::shared_ptr; @@ -49,6 +49,8 @@ class KMeansClient : public FluidBaseClient, using ParamDescType = decltype(KMeansParams); using ParamSetViewType = ParameterSetView; + using ParamValues = typename ParamSetViewType::ValueTuple; + std::reference_wrapper mParams; void setParams(ParamSetViewType& p) { mParams = p; } @@ -204,18 +206,16 @@ class KMeansClient : public FluidBaseClient, return OK(); } - MessageResult setMeans(InputDataSetClientRef srcClient) + MessageResult setMeans(InputDataSetClientRef srcClient) { auto srcPtr = srcClient.get().lock(); if (!srcPtr) return Error(NoDataSet); auto dataSet = srcPtr->getDataSet(); if (dataSet.size() == 0) return Error(EmptyDataSet); - if (dataSet.size() != get()) return Error(WrongNumInitial); mAlgorithm.setMeans(dataSet.getData()); - return OK(); + return updateParameters(); } - MessageResult transformPoint(InputBufferPtr in, BufferPtr out) const { if (!mAlgorithm.initialized()) return Error(NoDataFitted); @@ -234,6 +234,20 @@ class KMeansClient : public FluidBaseClient, return OK(); } + MessageResult read(string fileName) + { + auto result = DataClient::read(fileName); + if (result.ok()) return updateParameters(); + return {result.status(), result.message()}; + } + + MessageResult load(string s) + { + auto result = DataClient::load(s); + if (result.ok()) return updateParameters(); + return {result.status(), result.message()}; + } + static auto getMessageDescriptors() { return defineMessages( @@ -259,6 +273,15 @@ class KMeansClient : public FluidBaseClient, private: using DataSet = FluidDataSet; + ParameterTrackChanges mTracker; + + MessageResult updateParameters() + { + ParamValues newParams = mParams.get().toTuple(); + std::get(newParams) = mAlgorithm.getK(); + return newParams; + } + std::pair, IndexVector> train(DataSet const& dataSet, index k, index maxIter , index initMethod, index randomSeed) { diff --git a/include/flucoma/clients/nrt/NormalizeClient.hpp b/include/flucoma/clients/nrt/NormalizeClient.hpp index 5c3b951a..824f2744 100644 --- a/include/flucoma/clients/nrt/NormalizeClient.hpp +++ b/include/flucoma/clients/nrt/NormalizeClient.hpp @@ -38,8 +38,9 @@ class NormalizeClient : public FluidBaseClient, using StringVector = FluidTensor; using ParamDescType = decltype(NormalizeParams); - using ParamSetViewType = ParameterSetView; + using ParamValues = typename ParamSetViewType::ValueTuple; + std::reference_wrapper mParams; void setParams(ParamSetViewType& p) { mParams = p; } @@ -75,6 +76,7 @@ class NormalizeClient : public FluidBaseClient, } return {}; } + MessageResult transform(InputDataSetClientRef sourceClient, DataSetClientRef destClient) { @@ -91,19 +93,27 @@ class NormalizeClient : public FluidBaseClient, } MessageResult transformPoint(InputBufferPtr in, BufferPtr out) - { - return _transformPoint(in, out, false); - } - + { return _transformPoint(in, out, false); } + MessageResult inverseTransform(InputDataSetClientRef sourceClient, - DataSetClientRef destClient) + DataSetClientRef destClient) + { return _transform(sourceClient, destClient, true); } + + MessageResult inverseTransformPoint(InputBufferPtr in, BufferPtr out) + { return _transformPoint(in, out, true); } + + MessageResult read(string fileName) { - return _transform(sourceClient, destClient, true); + auto result = DataClient::read(fileName); + if (result.ok()) return updateParameters(); + return {result.status(), result.message()}; } - - MessageResult inverseTransformPoint(InputBufferPtr in, BufferPtr out) + + MessageResult load(string s) { - return _transformPoint(in, out, true); + auto result = DataClient::load(s); + if (result.ok()) return updateParameters(); + return {result.status(), result.message()}; } static auto getMessageDescriptors() @@ -126,6 +136,16 @@ class NormalizeClient : public FluidBaseClient, } private: + ParameterTrackChanges mTracker; + + MessageResult updateParameters() + { + ParamValues newParams = mParams.get().toTuple(); + std::get(newParams) = mAlgorithm.getMin(); + std::get(newParams) = mAlgorithm.getMax(); + return newParams; + } + MessageResult _transform(InputDataSetClientRef sourceClient, DataSetClientRef destClient, bool invert) { diff --git a/include/flucoma/clients/nrt/RobustScaleClient.hpp b/include/flucoma/clients/nrt/RobustScaleClient.hpp index f14cb88a..4f8b130e 100644 --- a/include/flucoma/clients/nrt/RobustScaleClient.hpp +++ b/include/flucoma/clients/nrt/RobustScaleClient.hpp @@ -39,8 +39,9 @@ class RobustScaleClient : public FluidBaseClient, using StringVector = FluidTensor; using ParamDescType = decltype(RobustScaleParams); - using ParamSetViewType = ParameterSetView; + using ParamValues = typename ParamSetViewType::ValueTuple; + std::reference_wrapper mParams; void setParams(ParamSetViewType& p) { mParams = p; } @@ -76,6 +77,7 @@ class RobustScaleClient : public FluidBaseClient, } return {}; } + MessageResult transform(InputDataSetClientRef sourceClient, DataSetClientRef destClient) { @@ -106,6 +108,20 @@ class RobustScaleClient : public FluidBaseClient, { return _transformPoint(in, out, true); } + + MessageResult read(string fileName) + { + auto result = DataClient::read(fileName); + if (result.ok()) return updateParameters(); + return {result.status(), result.message()}; + } + + MessageResult load(string s) + { + auto result = DataClient::load(s); + if (result.ok()) return updateParameters(); + return {result.status(), result.message()}; + } static auto getMessageDescriptors() { @@ -127,6 +143,16 @@ class RobustScaleClient : public FluidBaseClient, } private: + ParameterTrackChanges mTracker; + + MessageResult updateParameters() + { + ParamValues newParams = mParams.get().toTuple(); + std::get(newParams) = mAlgorithm.getLow(); + std::get(newParams) = mAlgorithm.getHigh(); + return newParams; + } + MessageResult _transform(InputDataSetClientRef sourceClient, DataSetClientRef destClient, bool invert) { @@ -168,7 +194,6 @@ class RobustScaleClient : public FluidBaseClient, outBuf.samps(0, mAlgorithm.dims(), 0) <<= dest; return OK(); } - }; using RobustScaleRef = SharedClientRef; diff --git a/include/flucoma/clients/nrt/SKMeansClient.hpp b/include/flucoma/clients/nrt/SKMeansClient.hpp index afd776d2..ea1d1d6c 100644 --- a/include/flucoma/clients/nrt/SKMeansClient.hpp +++ b/include/flucoma/clients/nrt/SKMeansClient.hpp @@ -37,7 +37,6 @@ class SKMeansClient : public FluidBaseClient, ModelObject, public DataClient { - ParameterTrackChanges mTracker; public: using string = std::string; using BufferPtr = std::shared_ptr; @@ -48,6 +47,8 @@ class SKMeansClient : public FluidBaseClient, using ParamDescType = decltype(SKMeansParams); using ParamSetViewType = ParameterSetView; + using ParamValues = typename ParamSetViewType::ValueTuple; + std::reference_wrapper mParams; void setParams(ParamSetViewType& p) { mParams = p; } @@ -204,18 +205,16 @@ auto [result, _] = train(dataSet, k, maxIter, get(), get()); return OK(); } - MessageResult setMeans(DataSetClientRef srcClient) + MessageResult setMeans(DataSetClientRef srcClient) { auto srcPtr = srcClient.get().lock(); if (!srcPtr) return Error(NoDataSet); auto dataSet = srcPtr->getDataSet(); if (dataSet.size() == 0) return Error(EmptyDataSet); - if (dataSet.size() != get()) return Error(WrongNumInitial); mAlgorithm.setMeans(dataSet.getData()); - return OK(); + return updateParameters(); } - MessageResult encodePoint(BufferPtr in, BufferPtr out) const { if (!mAlgorithm.initialized()) return Error(NoDataFitted); @@ -234,6 +233,20 @@ auto [result, _] = train(dataSet, k, maxIter, get(), get()); return OK(); } + MessageResult read(string fileName) + { + auto result = DataClient::read(fileName); + if (result.ok()) return updateParameters(); + return {result.status(), result.message()}; + } + + MessageResult load(string s) + { + auto result = DataClient::load(s); + if (result.ok()) return updateParameters(); + return {result.status(), result.message()}; + } + static auto getMessageDescriptors() { return defineMessages( @@ -259,21 +272,33 @@ auto [result, _] = train(dataSet, k, maxIter, get(), get()); private: using DataSet = FluidDataSet; + ParameterTrackChanges mTracker; + + MessageResult updateParameters() + { + ParamValues newParams = mParams.get().toTuple(); + std::get(newParams) = mAlgorithm.getK(); + return newParams; + } + std::pair, IndexVector> - train(DataSet const& dataSet, index k, index maxIter , index initMethod, index randomSeed) + train(DataSet const& dataSet, index k, index maxIter, index initMethod, + index randomSeed) { - mAlgorithm.train( - dataSet, k, maxIter, - static_cast(initMethod), randomSeed); + mAlgorithm.train(dataSet, k, maxIter, + static_cast(initMethod), + randomSeed); IndexVector assignments(dataSet.size()); mAlgorithm.getAssignments(assignments); - auto training_result = MessageResult(getCounts(assignments,k)); - if(mAlgorithm.nEmpty() > 0) + auto training_result = + MessageResult(getCounts(assignments, k)); + if (mAlgorithm.nEmpty() > 0) { - training_result.set(Result::Status::kWarning); - training_result.addMessage("There were empty clusters; perhaps numClusters is too high."); + training_result.set(Result::Status::kWarning); + training_result.addMessage( + "There were empty clusters; perhaps numClusters is too high."); } - return {training_result, assignments}; + return {training_result, assignments}; } IndexVector getCounts(IndexVector assignments, index k) const diff --git a/include/flucoma/clients/nrt/UMAPClient.hpp b/include/flucoma/clients/nrt/UMAPClient.hpp index e97bb600..d2a29d6d 100644 --- a/include/flucoma/clients/nrt/UMAPClient.hpp +++ b/include/flucoma/clients/nrt/UMAPClient.hpp @@ -50,8 +50,9 @@ class UMAPClient : public FluidBaseClient, using StringVector = FluidTensor; using ParamDescType = decltype(UMAPParams); - using ParamSetViewType = ParameterSetView; + using ParamValues = typename ParamSetViewType::ValueTuple; + std::reference_wrapper mParams; void setParams(ParamSetViewType& p) { mParams = p; } @@ -156,6 +157,20 @@ class UMAPClient : public FluidBaseClient, return OK(); } + MessageResult read(string fileName) + { + auto result = DataClient::read(fileName); + if (result.ok()) return updateParameters(); + return {result.status(), result.message()}; + } + + MessageResult load(string s) + { + auto result = DataClient::load(s); + if (result.ok()) return updateParameters(); + return {result.status(), result.message()}; + } + static auto getMessageDescriptors() { return defineMessages( @@ -171,6 +186,16 @@ class UMAPClient : public FluidBaseClient, makeMessage("write", &UMAPClient::write), makeMessage("read", &UMAPClient::read)); } + +private: + ParameterTrackChanges mTracker; + + MessageResult updateParameters() + { + ParamValues newParams = mParams.get().toTuple(); + std::get(newParams) = mAlgorithm.dims(); + return newParams; + } }; using UMAPRef = SharedClientRef;