Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions include/flucoma/algorithms/public/Normalization.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -35,8 +35,16 @@ class Normalization
mRange = mMax - mMin;
handleZerosInScale(mRange);
ArrayXXd input = asEigen<Array>(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;
Expand Down
29 changes: 21 additions & 8 deletions include/flucoma/algorithms/public/RobustScaling.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
18 changes: 14 additions & 4 deletions include/flucoma/algorithms/public/Standardization.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Array>(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;
}
Expand Down
14 changes: 8 additions & 6 deletions include/flucoma/clients/nrt/NormalizeClient.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@ namespace fluid {
namespace client {
namespace normalize {

constexpr auto NormalizeParams = defineParameters(
StringParam<Fixed<true>>("name", "Name"),
FloatParam("min", "Minimum Value", 0.0),
FloatParam("max", "Maximum Value", 1.0));
constexpr auto NormalizeParams =
defineParameters(StringParam<Fixed<true>>("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,
OfflineOut,
ModelObject,
public DataClient<algorithm::Normalization>
{
enum { kName, kMin, kMax };
enum { kName, kMin, kMax, kAxis };

public:
using string = std::string;
Expand Down Expand Up @@ -67,7 +68,8 @@ class NormalizeClient : public FluidBaseClient,
{
auto dataset = datasetClientPtr->getDataSet();
if (dataset.size() == 0) return Error(EmptyDataSet);
mAlgorithm.init(get<kMin>(), get<kMax>(), dataset.getData());
mAlgorithm.init(get<kMin>(), get<kMax>(), dataset.getData(),
get<kAxis>());
}
else
{
Expand Down
8 changes: 5 additions & 3 deletions include/flucoma/clients/nrt/RobustScaleClient.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@ namespace robustscale {
constexpr auto RobustScaleParams = defineParameters(
StringParam<Fixed<true>>("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,
OfflineOut,
ModelObject,
public DataClient<algorithm::RobustScaling>
{
enum { kName, kLow, kHigh };
enum { kName, kLow, kHigh, kAxis };

public:
using string = std::string;
Expand Down Expand Up @@ -68,7 +69,8 @@ class RobustScaleClient : public FluidBaseClient,
{
auto dataset = datasetClientPtr->getDataSet();
if (dataset.size() == 0) return Error(EmptyDataSet);
mAlgorithm.init(get<kLow>(), get<kHigh>(), dataset.getData());
mAlgorithm.init(get<kLow>(), get<kHigh>(), dataset.getData(),
get<kAxis>());
}
else
{
Expand Down
7 changes: 4 additions & 3 deletions include/flucoma/clients/nrt/StandardizeClient.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ namespace client {
namespace standardize {

constexpr auto StandardizeParams =
defineParameters(StringParam<Fixed<true>>("name", "Name"));
defineParameters(StringParam<Fixed<true>>("name", "Name"),
LongParam("axis", "Standardizing Axis", 0, Min(-1), Max(0)));

class StandardizeClient : public FluidBaseClient,
OfflineIn,
OfflineOut,
ModelObject,
public DataClient<algorithm::Standardization>
{
enum { kName };
enum { kName, kAxis };

public:
using string = std::string;
Expand Down Expand Up @@ -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<kAxis>());
}
else
{
Expand Down
Loading