diff --git a/include/flucoma/algorithms/public/Normalization.hpp b/include/flucoma/algorithms/public/Normalization.hpp index 3847c9d7..2099a5e1 100644 --- a/include/flucoma/algorithms/public/Normalization.hpp +++ b/include/flucoma/algorithms/public/Normalization.hpp @@ -26,7 +26,7 @@ class Normalization using ArrayXd = Eigen::ArrayXd; using ArrayXXd = Eigen::ArrayXXd; - void init(double min, double max, RealMatrixView in) + void init(double min, double max, RealMatrixView in, index axis) { using namespace Eigen; using namespace _impl; @@ -35,8 +35,16 @@ class Normalization mRange = mMax - mMin; handleZerosInScale(mRange); ArrayXXd input = asEigen(in); - mDataMin = input.colwise().minCoeff(); - mDataMax = input.colwise().maxCoeff(); + if (axis == 0) + { + mDataMin = input.colwise().minCoeff(); + mDataMax = input.colwise().maxCoeff(); + } + else + { + mDataMin.setConstant(input.cols(), input.minCoeff()); + mDataMax.setConstant(input.cols(), input.maxCoeff()); + } mDataRange = mDataMax - mDataMin; handleZerosInScale(mDataRange); mInitialized = true; diff --git a/include/flucoma/algorithms/public/RobustScaling.hpp b/include/flucoma/algorithms/public/RobustScaling.hpp index ddf0a898..a2a0fb96 100644 --- a/include/flucoma/algorithms/public/RobustScaling.hpp +++ b/include/flucoma/algorithms/public/RobustScaling.hpp @@ -27,7 +27,7 @@ class RobustScaling using ArrayXd = Eigen::ArrayXd; using ArrayXXd = Eigen::ArrayXXd; - void init(double low, double high, RealMatrixView in) + void init(double low, double high, RealMatrixView in, index axis) { using namespace Eigen; using namespace _impl; @@ -38,14 +38,27 @@ class RobustScaling mDataHigh.resize(input.cols()); mMedian.resize(input.cols()); mRange.resize(input.cols()); - index length = input.rows(); - for (index i = 0; i < input.cols(); i++) + if (axis == 0) { - ArrayXd sorted = input.col(i); - std::sort(sorted.data(), sorted.data() + length); - mMedian(i) = sorted(lrint(0.5 * (length - 1))); - mDataLow(i) = sorted(lrint((mLow / 100.0) * (length - 1))); - mDataHigh(i) = sorted(lrint((mHigh / 100.0) * (length - 1))); + index length = input.rows(); + for (index i = 0; i < input.cols(); i++) + { + ArrayXd sorted = input.col(i); + std::sort(sorted.data(), sorted.data() + length); + mMedian(i) = sorted(lrint(0.5 * (length - 1))); + mDataLow(i) = sorted(lrint((mLow / 100.0) * (length - 1))); + mDataHigh(i) = sorted(lrint((mHigh / 100.0) * (length - 1))); + } + } + else + { + index length = input.size(); + std::sort(input.data(), input.data() + length); + mMedian.setConstant(input.cols(), input(lrint(0.5 * (length - 1)))); + mDataLow.setConstant(input.cols(), + input(lrint((mLow / 100.0) * (length - 1)))); + mDataHigh.setConstant(input.cols(), + input(lrint((mHigh / 100.0) * (length - 1)))); } mRange = mDataHigh - mDataLow; handleZerosInScale(mRange); diff --git a/include/flucoma/algorithms/public/Standardization.hpp b/include/flucoma/algorithms/public/Standardization.hpp index bf8deb60..358db10f 100644 --- a/include/flucoma/algorithms/public/Standardization.hpp +++ b/include/flucoma/algorithms/public/Standardization.hpp @@ -26,14 +26,24 @@ class Standardization using ArrayXd = Eigen::ArrayXd; using ArrayXXd = Eigen::ArrayXXd; - void init(RealMatrixView in) + void init(RealMatrixView in, index axis) { using namespace Eigen; using namespace _impl; ArrayXXd input = asEigen(in); - mMean = input.colwise().mean(); - mStd = ((input.rowwise() - mMean.transpose()).square().colwise().mean()) - .sqrt(); + if (axis == 0) + { + mMean = input.colwise().mean(); + mStd = ((input.rowwise() - mMean.transpose()).square().colwise().mean()) + .sqrt(); + } + else + { + double overallmean = input.mean(); + double overallstd = std::sqrt((input - overallmean).square().mean()); + mMean.setConstant(input.cols(), overallmean); + mStd.setConstant(input.cols(), overallstd); + } handleZerosInScale(mStd); mInitialized = true; } diff --git a/include/flucoma/clients/nrt/NormalizeClient.hpp b/include/flucoma/clients/nrt/NormalizeClient.hpp index 5c3b951a..4a536b4b 100644 --- a/include/flucoma/clients/nrt/NormalizeClient.hpp +++ b/include/flucoma/clients/nrt/NormalizeClient.hpp @@ -18,10 +18,11 @@ namespace fluid { namespace client { namespace normalize { -constexpr auto NormalizeParams = defineParameters( - StringParam>("name", "Name"), - FloatParam("min", "Minimum Value", 0.0), - FloatParam("max", "Maximum Value", 1.0)); +constexpr auto NormalizeParams = + defineParameters(StringParam>("name", "Name"), + FloatParam("min", "Minimum Value", 0.0), + FloatParam("max", "Maximum Value", 1.0), + LongParam("axis", "Normalizing Axis", 0, Min(-1), Max(0))); class NormalizeClient : public FluidBaseClient, OfflineIn, @@ -29,7 +30,7 @@ class NormalizeClient : public FluidBaseClient, ModelObject, public DataClient { - enum { kName, kMin, kMax }; + enum { kName, kMin, kMax, kAxis }; public: using string = std::string; @@ -67,7 +68,8 @@ class NormalizeClient : public FluidBaseClient, { auto dataset = datasetClientPtr->getDataSet(); if (dataset.size() == 0) return Error(EmptyDataSet); - mAlgorithm.init(get(), get(), dataset.getData()); + mAlgorithm.init(get(), get(), dataset.getData(), + get()); } else { diff --git a/include/flucoma/clients/nrt/RobustScaleClient.hpp b/include/flucoma/clients/nrt/RobustScaleClient.hpp index f14cb88a..49e57e82 100644 --- a/include/flucoma/clients/nrt/RobustScaleClient.hpp +++ b/include/flucoma/clients/nrt/RobustScaleClient.hpp @@ -22,7 +22,8 @@ namespace robustscale { constexpr auto RobustScaleParams = defineParameters( StringParam>("name", "Name"), FloatParam("low", "Low Percentile", 25, Min(0), Max(100)), - FloatParam("high", "High Percentile", 75, Min(0), Max(100))); + FloatParam("high", "High Percentile", 75, Min(0), Max(100)), + LongParam("axis", "Scaling Axis", 0, Min(-1), Max(0))); class RobustScaleClient : public FluidBaseClient, OfflineIn, @@ -30,7 +31,7 @@ class RobustScaleClient : public FluidBaseClient, ModelObject, public DataClient { - enum { kName, kLow, kHigh }; + enum { kName, kLow, kHigh, kAxis }; public: using string = std::string; @@ -68,7 +69,8 @@ class RobustScaleClient : public FluidBaseClient, { auto dataset = datasetClientPtr->getDataSet(); if (dataset.size() == 0) return Error(EmptyDataSet); - mAlgorithm.init(get(), get(), dataset.getData()); + mAlgorithm.init(get(), get(), dataset.getData(), + get()); } else { diff --git a/include/flucoma/clients/nrt/StandardizeClient.hpp b/include/flucoma/clients/nrt/StandardizeClient.hpp index a0de70cb..68f0d4ea 100644 --- a/include/flucoma/clients/nrt/StandardizeClient.hpp +++ b/include/flucoma/clients/nrt/StandardizeClient.hpp @@ -19,7 +19,8 @@ namespace client { namespace standardize { constexpr auto StandardizeParams = - defineParameters(StringParam>("name", "Name")); + defineParameters(StringParam>("name", "Name"), + LongParam("axis", "Standardizing Axis", 0, Min(-1), Max(0))); class StandardizeClient : public FluidBaseClient, OfflineIn, @@ -27,7 +28,7 @@ class StandardizeClient : public FluidBaseClient, ModelObject, public DataClient { - enum { kName }; + enum { kName, kAxis }; public: using string = std::string; @@ -65,7 +66,7 @@ class StandardizeClient : public FluidBaseClient, { auto dataset = datasetClientPtr->getDataSet(); if (dataset.size() == 0) return Error(EmptyDataSet); - mAlgorithm.init(dataset.getData()); + mAlgorithm.init(dataset.getData(), get()); } else {