From 5d1e77c31df59121a1849beb1efd8d4efced46de Mon Sep 17 00:00:00 2001 From: Pierre Alexandre Tremblay Date: Tue, 27 Oct 2026 14:14:27 +0100 Subject: [PATCH 1/6] first, making the algo work. they do. --- .../flucoma/algorithms/public/Normalization.hpp | 4 ++-- .../flucoma/algorithms/public/RobustScaling.hpp | 16 +++++++--------- .../algorithms/public/Standardization.hpp | 7 ++++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/include/flucoma/algorithms/public/Normalization.hpp b/include/flucoma/algorithms/public/Normalization.hpp index 3847c9d79..5a4534183 100644 --- a/include/flucoma/algorithms/public/Normalization.hpp +++ b/include/flucoma/algorithms/public/Normalization.hpp @@ -35,8 +35,8 @@ class Normalization mRange = mMax - mMin; handleZerosInScale(mRange); ArrayXXd input = asEigen(in); - mDataMin = input.colwise().minCoeff(); - mDataMax = input.colwise().maxCoeff(); + 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 ddf0a8988..ef678d919 100644 --- a/include/flucoma/algorithms/public/RobustScaling.hpp +++ b/include/flucoma/algorithms/public/RobustScaling.hpp @@ -38,15 +38,13 @@ 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++) - { - 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.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); mInitialized = true; diff --git a/include/flucoma/algorithms/public/Standardization.hpp b/include/flucoma/algorithms/public/Standardization.hpp index bf8deb604..cdfd4d3fb 100644 --- a/include/flucoma/algorithms/public/Standardization.hpp +++ b/include/flucoma/algorithms/public/Standardization.hpp @@ -31,9 +31,10 @@ class Standardization using namespace Eigen; using namespace _impl; ArrayXXd input = asEigen(in); - mMean = input.colwise().mean(); - mStd = ((input.rowwise() - mMean.transpose()).square().colwise().mean()) - .sqrt(); + 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; } From aa071a34aca63e994221042276184133cf6b69a3 Mon Sep 17 00:00:00 2001 From: Pierre Alexandre Tremblay Date: Tue, 27 Oct 2026 14:32:19 +0100 Subject: [PATCH 2/6] now with a client passing an ugly bool to switch --- .../flucoma/algorithms/public/Normalization.hpp | 2 +- .../flucoma/algorithms/public/RobustScaling.hpp | 2 +- .../flucoma/algorithms/public/Standardization.hpp | 2 +- include/flucoma/clients/nrt/NormalizeClient.hpp | 14 ++++++++------ include/flucoma/clients/nrt/RobustScaleClient.hpp | 8 +++++--- include/flucoma/clients/nrt/StandardizeClient.hpp | 7 ++++--- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/include/flucoma/algorithms/public/Normalization.hpp b/include/flucoma/algorithms/public/Normalization.hpp index 5a4534183..4e86b9f48 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 dsWide) { using namespace Eigen; using namespace _impl; diff --git a/include/flucoma/algorithms/public/RobustScaling.hpp b/include/flucoma/algorithms/public/RobustScaling.hpp index ef678d919..846031648 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 dsWide) { using namespace Eigen; using namespace _impl; diff --git a/include/flucoma/algorithms/public/Standardization.hpp b/include/flucoma/algorithms/public/Standardization.hpp index cdfd4d3fb..0f1da7c6c 100644 --- a/include/flucoma/algorithms/public/Standardization.hpp +++ b/include/flucoma/algorithms/public/Standardization.hpp @@ -26,7 +26,7 @@ class Standardization using ArrayXd = Eigen::ArrayXd; using ArrayXXd = Eigen::ArrayXXd; - void init(RealMatrixView in) + void init(RealMatrixView in, index dsWide) { using namespace Eigen; using namespace _impl; diff --git a/include/flucoma/clients/nrt/NormalizeClient.hpp b/include/flucoma/clients/nrt/NormalizeClient.hpp index 5c3b951a5..34bac1f70 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), + EnumParam("dswide", "DataSet Wide", 1, "no", "yes")); class NormalizeClient : public FluidBaseClient, OfflineIn, @@ -29,7 +30,7 @@ class NormalizeClient : public FluidBaseClient, ModelObject, public DataClient { - enum { kName, kMin, kMax }; + enum { kName, kMin, kMax, kDSWide }; 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 f14cb88ad..92c0c1f5b 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)), + EnumParam("dswide", "DataSet Wide", 1, "no", "yes")); class RobustScaleClient : public FluidBaseClient, OfflineIn, @@ -30,7 +31,7 @@ class RobustScaleClient : public FluidBaseClient, ModelObject, public DataClient { - enum { kName, kLow, kHigh }; + enum { kName, kLow, kHigh, kDSWide }; 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 a0de70cb3..50ba009f2 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"), + EnumParam("dswide", "DataSet Wide", 1, "no", "yes")); class StandardizeClient : public FluidBaseClient, OfflineIn, @@ -27,7 +28,7 @@ class StandardizeClient : public FluidBaseClient, ModelObject, public DataClient { - enum { kName }; + enum { kName, kDSWide }; 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 { From 41de73959cf1a56e9b13f235a2e55e069171aec4 Mon Sep 17 00:00:00 2001 From: Pierre Alexandre Tremblay Date: Tue, 3 Nov 2026 17:21:08 +0100 Subject: [PATCH 3/6] better naming for the interface --- include/flucoma/algorithms/public/Normalization.hpp | 2 +- include/flucoma/algorithms/public/RobustScaling.hpp | 2 +- include/flucoma/algorithms/public/Standardization.hpp | 2 +- include/flucoma/clients/nrt/NormalizeClient.hpp | 6 +++--- include/flucoma/clients/nrt/RobustScaleClient.hpp | 6 +++--- include/flucoma/clients/nrt/StandardizeClient.hpp | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/flucoma/algorithms/public/Normalization.hpp b/include/flucoma/algorithms/public/Normalization.hpp index 4e86b9f48..16d878b48 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, index dsWide) + void init(double min, double max, RealMatrixView in, index byCol) { using namespace Eigen; using namespace _impl; diff --git a/include/flucoma/algorithms/public/RobustScaling.hpp b/include/flucoma/algorithms/public/RobustScaling.hpp index 846031648..26d5baa67 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, index dsWide) + void init(double low, double high, RealMatrixView in, index byCol) { using namespace Eigen; using namespace _impl; diff --git a/include/flucoma/algorithms/public/Standardization.hpp b/include/flucoma/algorithms/public/Standardization.hpp index 0f1da7c6c..79b9c3983 100644 --- a/include/flucoma/algorithms/public/Standardization.hpp +++ b/include/flucoma/algorithms/public/Standardization.hpp @@ -26,7 +26,7 @@ class Standardization using ArrayXd = Eigen::ArrayXd; using ArrayXXd = Eigen::ArrayXXd; - void init(RealMatrixView in, index dsWide) + void init(RealMatrixView in, index byCol) { using namespace Eigen; using namespace _impl; diff --git a/include/flucoma/clients/nrt/NormalizeClient.hpp b/include/flucoma/clients/nrt/NormalizeClient.hpp index 34bac1f70..d8379056e 100644 --- a/include/flucoma/clients/nrt/NormalizeClient.hpp +++ b/include/flucoma/clients/nrt/NormalizeClient.hpp @@ -22,7 +22,7 @@ constexpr auto NormalizeParams = defineParameters(StringParam>("name", "Name"), FloatParam("min", "Minimum Value", 0.0), FloatParam("max", "Maximum Value", 1.0), - EnumParam("dswide", "DataSet Wide", 1, "no", "yes")); + EnumParam("byCol", "Normalize by Column", 1, "no", "yes")); class NormalizeClient : public FluidBaseClient, OfflineIn, @@ -30,7 +30,7 @@ class NormalizeClient : public FluidBaseClient, ModelObject, public DataClient { - enum { kName, kMin, kMax, kDSWide }; + enum { kName, kMin, kMax, kByCol }; public: using string = std::string; @@ -69,7 +69,7 @@ class NormalizeClient : public FluidBaseClient, auto dataset = datasetClientPtr->getDataSet(); if (dataset.size() == 0) return Error(EmptyDataSet); mAlgorithm.init(get(), get(), dataset.getData(), - get()); + get()); } else { diff --git a/include/flucoma/clients/nrt/RobustScaleClient.hpp b/include/flucoma/clients/nrt/RobustScaleClient.hpp index 92c0c1f5b..8b1ceedac 100644 --- a/include/flucoma/clients/nrt/RobustScaleClient.hpp +++ b/include/flucoma/clients/nrt/RobustScaleClient.hpp @@ -23,7 +23,7 @@ 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)), - EnumParam("dswide", "DataSet Wide", 1, "no", "yes")); + EnumParam("byCol", "Scale by Column", 1, "no", "yes")); class RobustScaleClient : public FluidBaseClient, OfflineIn, @@ -31,7 +31,7 @@ class RobustScaleClient : public FluidBaseClient, ModelObject, public DataClient { - enum { kName, kLow, kHigh, kDSWide }; + enum { kName, kLow, kHigh, kByCol }; public: using string = std::string; @@ -70,7 +70,7 @@ class RobustScaleClient : public FluidBaseClient, auto dataset = datasetClientPtr->getDataSet(); if (dataset.size() == 0) return Error(EmptyDataSet); mAlgorithm.init(get(), get(), dataset.getData(), - get()); + get()); } else { diff --git a/include/flucoma/clients/nrt/StandardizeClient.hpp b/include/flucoma/clients/nrt/StandardizeClient.hpp index 50ba009f2..3cbba9535 100644 --- a/include/flucoma/clients/nrt/StandardizeClient.hpp +++ b/include/flucoma/clients/nrt/StandardizeClient.hpp @@ -20,7 +20,7 @@ namespace standardize { constexpr auto StandardizeParams = defineParameters(StringParam>("name", "Name"), - EnumParam("dswide", "DataSet Wide", 1, "no", "yes")); + EnumParam("byCol", "Standardize by Column", 1, "no", "yes")); class StandardizeClient : public FluidBaseClient, OfflineIn, @@ -28,7 +28,7 @@ class StandardizeClient : public FluidBaseClient, ModelObject, public DataClient { - enum { kName, kDSWide }; + enum { kName, kByCol }; public: using string = std::string; @@ -66,7 +66,7 @@ class StandardizeClient : public FluidBaseClient, { auto dataset = datasetClientPtr->getDataSet(); if (dataset.size() == 0) return Error(EmptyDataSet); - mAlgorithm.init(dataset.getData(), get()); + mAlgorithm.init(dataset.getData(), get()); } else { From 4c0c957f7723b16aa4faa5691d362dea751c9743 Mon Sep 17 00:00:00 2001 From: Pierre Alexandre Tremblay Date: Tue, 3 Nov 2026 17:40:13 +0100 Subject: [PATCH 4/6] forking in Normalize for approval --- include/flucoma/algorithms/public/Normalization.hpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/flucoma/algorithms/public/Normalization.hpp b/include/flucoma/algorithms/public/Normalization.hpp index 16d878b48..122cfa6bb 100644 --- a/include/flucoma/algorithms/public/Normalization.hpp +++ b/include/flucoma/algorithms/public/Normalization.hpp @@ -35,8 +35,16 @@ class Normalization mRange = mMax - mMin; handleZerosInScale(mRange); ArrayXXd input = asEigen(in); - mDataMin.setConstant(input.cols(), input.minCoeff()); - mDataMax.setConstant(input.cols(), input.maxCoeff()); + if (byCol) + { + 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; From 4e564c95d848b2bbedf0d5d4133a26d0e3f829d8 Mon Sep 17 00:00:00 2001 From: Pierre Alexandre Tremblay Date: Thu, 5 Nov 2026 20:15:17 +0100 Subject: [PATCH 5/6] change to 'axis' --- include/flucoma/algorithms/public/Normalization.hpp | 4 ++-- include/flucoma/algorithms/public/RobustScaling.hpp | 2 +- include/flucoma/algorithms/public/Standardization.hpp | 2 +- include/flucoma/clients/nrt/NormalizeClient.hpp | 6 +++--- include/flucoma/clients/nrt/RobustScaleClient.hpp | 6 +++--- include/flucoma/clients/nrt/StandardizeClient.hpp | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/flucoma/algorithms/public/Normalization.hpp b/include/flucoma/algorithms/public/Normalization.hpp index 122cfa6bb..2099a5e17 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, index byCol) + void init(double min, double max, RealMatrixView in, index axis) { using namespace Eigen; using namespace _impl; @@ -35,7 +35,7 @@ class Normalization mRange = mMax - mMin; handleZerosInScale(mRange); ArrayXXd input = asEigen(in); - if (byCol) + if (axis == 0) { mDataMin = input.colwise().minCoeff(); mDataMax = input.colwise().maxCoeff(); diff --git a/include/flucoma/algorithms/public/RobustScaling.hpp b/include/flucoma/algorithms/public/RobustScaling.hpp index 26d5baa67..1b8ec4367 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, index byCol) + void init(double low, double high, RealMatrixView in, index axis) { using namespace Eigen; using namespace _impl; diff --git a/include/flucoma/algorithms/public/Standardization.hpp b/include/flucoma/algorithms/public/Standardization.hpp index 79b9c3983..875c91c25 100644 --- a/include/flucoma/algorithms/public/Standardization.hpp +++ b/include/flucoma/algorithms/public/Standardization.hpp @@ -26,7 +26,7 @@ class Standardization using ArrayXd = Eigen::ArrayXd; using ArrayXXd = Eigen::ArrayXXd; - void init(RealMatrixView in, index byCol) + void init(RealMatrixView in, index axis) { using namespace Eigen; using namespace _impl; diff --git a/include/flucoma/clients/nrt/NormalizeClient.hpp b/include/flucoma/clients/nrt/NormalizeClient.hpp index d8379056e..4a536b4b3 100644 --- a/include/flucoma/clients/nrt/NormalizeClient.hpp +++ b/include/flucoma/clients/nrt/NormalizeClient.hpp @@ -22,7 +22,7 @@ constexpr auto NormalizeParams = defineParameters(StringParam>("name", "Name"), FloatParam("min", "Minimum Value", 0.0), FloatParam("max", "Maximum Value", 1.0), - EnumParam("byCol", "Normalize by Column", 1, "no", "yes")); + LongParam("axis", "Normalizing Axis", 0, Min(-1), Max(0))); class NormalizeClient : public FluidBaseClient, OfflineIn, @@ -30,7 +30,7 @@ class NormalizeClient : public FluidBaseClient, ModelObject, public DataClient { - enum { kName, kMin, kMax, kByCol }; + enum { kName, kMin, kMax, kAxis }; public: using string = std::string; @@ -69,7 +69,7 @@ class NormalizeClient : public FluidBaseClient, auto dataset = datasetClientPtr->getDataSet(); if (dataset.size() == 0) return Error(EmptyDataSet); mAlgorithm.init(get(), get(), dataset.getData(), - get()); + get()); } else { diff --git a/include/flucoma/clients/nrt/RobustScaleClient.hpp b/include/flucoma/clients/nrt/RobustScaleClient.hpp index 8b1ceedac..49e57e82a 100644 --- a/include/flucoma/clients/nrt/RobustScaleClient.hpp +++ b/include/flucoma/clients/nrt/RobustScaleClient.hpp @@ -23,7 +23,7 @@ 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)), - EnumParam("byCol", "Scale by Column", 1, "no", "yes")); + LongParam("axis", "Scaling Axis", 0, Min(-1), Max(0))); class RobustScaleClient : public FluidBaseClient, OfflineIn, @@ -31,7 +31,7 @@ class RobustScaleClient : public FluidBaseClient, ModelObject, public DataClient { - enum { kName, kLow, kHigh, kByCol }; + enum { kName, kLow, kHigh, kAxis }; public: using string = std::string; @@ -70,7 +70,7 @@ class RobustScaleClient : public FluidBaseClient, auto dataset = datasetClientPtr->getDataSet(); if (dataset.size() == 0) return Error(EmptyDataSet); mAlgorithm.init(get(), get(), dataset.getData(), - get()); + get()); } else { diff --git a/include/flucoma/clients/nrt/StandardizeClient.hpp b/include/flucoma/clients/nrt/StandardizeClient.hpp index 3cbba9535..68f0d4ea0 100644 --- a/include/flucoma/clients/nrt/StandardizeClient.hpp +++ b/include/flucoma/clients/nrt/StandardizeClient.hpp @@ -20,7 +20,7 @@ namespace standardize { constexpr auto StandardizeParams = defineParameters(StringParam>("name", "Name"), - EnumParam("byCol", "Standardize by Column", 1, "no", "yes")); + LongParam("axis", "Standardizing Axis", 0, Min(-1), Max(0))); class StandardizeClient : public FluidBaseClient, OfflineIn, @@ -28,7 +28,7 @@ class StandardizeClient : public FluidBaseClient, ModelObject, public DataClient { - enum { kName, kByCol }; + enum { kName, kAxis }; public: using string = std::string; @@ -66,7 +66,7 @@ class StandardizeClient : public FluidBaseClient, { auto dataset = datasetClientPtr->getDataSet(); if (dataset.size() == 0) return Error(EmptyDataSet); - mAlgorithm.init(dataset.getData(), get()); + mAlgorithm.init(dataset.getData(), get()); } else { From ec6e848812c45a9e30ff05495d3ecb18ee001afd Mon Sep 17 00:00:00 2001 From: Pierre Alexandre Tremblay Date: Thu, 5 Nov 2026 20:23:00 +0100 Subject: [PATCH 6/6] now robustscaling and standardizing --- .../algorithms/public/RobustScaling.hpp | 29 ++++++++++++++----- .../algorithms/public/Standardization.hpp | 17 ++++++++--- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/include/flucoma/algorithms/public/RobustScaling.hpp b/include/flucoma/algorithms/public/RobustScaling.hpp index 1b8ec4367..a2a0fb96a 100644 --- a/include/flucoma/algorithms/public/RobustScaling.hpp +++ b/include/flucoma/algorithms/public/RobustScaling.hpp @@ -38,13 +38,28 @@ class RobustScaling mDataHigh.resize(input.cols()); mMedian.resize(input.cols()); mRange.resize(input.cols()); - 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)))); + if (axis == 0) + { + 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); mInitialized = true; diff --git a/include/flucoma/algorithms/public/Standardization.hpp b/include/flucoma/algorithms/public/Standardization.hpp index 875c91c25..358db10fa 100644 --- a/include/flucoma/algorithms/public/Standardization.hpp +++ b/include/flucoma/algorithms/public/Standardization.hpp @@ -31,10 +31,19 @@ class Standardization using namespace Eigen; using namespace _impl; ArrayXXd input = asEigen(in); - double overallmean = input.mean(); - double overallstd = std::sqrt((input - overallmean).square().mean()); - mMean.setConstant(input.cols(), overallmean); - mStd.setConstant(input.cols(), overallstd); + 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; }