From e1abc9cfafacdde40b2e2774b303dbc95637e453 Mon Sep 17 00:00:00 2001 From: tremblap Date: Wed, 7 Feb 2024 16:26:19 +0000 Subject: [PATCH 1/3] a simple line... --- include/algorithms/public/Normalization.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/include/algorithms/public/Normalization.hpp b/include/algorithms/public/Normalization.hpp index 0c6e126fb..09a9d46ef 100644 --- a/include/algorithms/public/Normalization.hpp +++ b/include/algorithms/public/Normalization.hpp @@ -49,6 +49,7 @@ class Normalization using namespace _impl; mMin = min; mMax = max; + mRange = mMax - mMin; mDataMin = asEigen(dataMin); mDataMax = asEigen(dataMax); mDataRange = mDataMax - mDataMin; From bf3b65ff82d17bf9a7c999cfbfaf2322e7de2737 Mon Sep 17 00:00:00 2001 From: tremblap Date: Wed, 7 Feb 2024 16:49:51 +0000 Subject: [PATCH 2/3] proper initialisation --- include/algorithms/public/Normalization.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/algorithms/public/Normalization.hpp b/include/algorithms/public/Normalization.hpp index 09a9d46ef..3847c9d79 100644 --- a/include/algorithms/public/Normalization.hpp +++ b/include/algorithms/public/Normalization.hpp @@ -50,6 +50,7 @@ class Normalization mMin = min; mMax = max; mRange = mMax - mMin; + handleZerosInScale(mRange); mDataMin = asEigen(dataMin); mDataMax = asEigen(dataMax); mDataRange = mDataMax - mDataMin; @@ -133,6 +134,7 @@ class Normalization { mMin = 0; mMax = 1.0; + mRange = 1.0; mDataMin.setZero(); mDataMax.setZero(); mDataRange.setZero(); From e1f5b5a8c78d947a9e3898f1db3ef576c37538a6 Mon Sep 17 00:00:00 2001 From: tremblap Date: Wed, 7 Feb 2024 16:50:24 +0000 Subject: [PATCH 3/3] remove the change of scaling post fitting (as it was in the RT version in SC) --- include/clients/nrt/NormalizeClient.hpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/clients/nrt/NormalizeClient.hpp b/include/clients/nrt/NormalizeClient.hpp index bb218686c..b34f54162 100644 --- a/include/clients/nrt/NormalizeClient.hpp +++ b/include/clients/nrt/NormalizeClient.hpp @@ -139,8 +139,6 @@ class NormalizeClient : public FluidBaseClient, StringVector ids{srcDataSet.getIds()}; RealMatrix data(srcDataSet.size(), srcDataSet.pointSize()); if (!mAlgorithm.initialized()) return Error(NoDataFitted); - mAlgorithm.setMin(get()); - mAlgorithm.setMax(get()); mAlgorithm.process(srcDataSet.getData(), data, invert); FluidDataSet result(ids, data); destPtr->setDataSet(result); @@ -166,8 +164,6 @@ class NormalizeClient : public FluidBaseClient, RealVector src(mAlgorithm.dims()); RealVector dest(mAlgorithm.dims()); src <<= BufferAdaptor::ReadAccess(in.get()).samps(0, mAlgorithm.dims(), 0); - mAlgorithm.setMin(get()); - mAlgorithm.setMax(get()); mAlgorithm.processFrame(src, dest, invert); outBuf.samps(0, mAlgorithm.dims(), 0) <<= dest; return OK(); @@ -239,8 +235,6 @@ class NormalizeQuery : public FluidBaseClient, ControlIn, ControlOut RealVector dest(algorithm.dims()); src <<= BufferAdaptor::ReadAccess(get().get()) .samps(0, algorithm.dims(), 0); -// algorithm.setMin(get()); -// algorithm.setMax(get()); algorithm.processFrame(src, dest, get() == 1); outBuf.samps(0, algorithm.dims(), 0) <<= dest; }