portelli/LatAnalyze
1
0
Fork 0
mirror of https://github.com/aportelli/LatAnalyze.git synced 2025-04-10 11:10:46 +01:00
Code Releases Activity

Merge branch 'release/3.2.2'

Browse Source
This commit is contained in:
Antonin Portelli 2017-07-05 15:09:04 +01:00
commit 90fc90957a
5 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -3,7 +3,7 @@ build/*
build_debug/* build_debug/*
sandbox/* sandbox/*
# Apple stuffs # Apple stuff
*.xcodeproj *.xcodeproj
.DS_Store .DS_Store
@ -30,3 +30,8 @@ lib/eigen_files.mk
# CI builds # CI builds
ci-scripts/local/* ci-scripts/local/*
# CLion stuff
.idea/*
CMakeLists.txt
cmake-build-debug/*

2
configure.ac
View File

@ -2,7 +2,7 @@
# Initialization # Initialization
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AC_INIT([LatAnalyze],[3.2.1],[antonin.portelli@me.com],[LatAnalyze]) AC_INIT([LatAnalyze],[3.2.1-dev],[antonin.portelli@me.com],[LatAnalyze])
AC_CONFIG_AUX_DIR([.buildutils]) AC_CONFIG_AUX_DIR([.buildutils])
AC_CONFIG_SRCDIR([lib/Global.cpp]) AC_CONFIG_SRCDIR([lib/Global.cpp])
AC_CONFIG_SRCDIR([utils/sample_read.cpp]) AC_CONFIG_SRCDIR([utils/sample_read.cpp])

1
lib/MathInterpreter.cpp
View File

@ -690,6 +690,7 @@ void MathInterpreter::compile(RunContext &context)
if (root_) if (root_)
{ {
context.addVariable("pi", Math::pi); context.addVariable("pi", Math::pi);
context.addVariable("inf", HUGE_VAL);
ADD_STDMATH_FUNCS(context); ADD_STDMATH_FUNCS(context);
root_->compile(program_, context); root_->compile(program_, context);
for (unsigned int i = 0; i < program_.size(); ++i) for (unsigned int i = 0; i < program_.size(); ++i)

15
lib/XYSampleData.cpp
View File

@ -171,6 +171,20 @@ const DSample & XYSampleData::y(const Index k, const Index j) const
return yData_[j].at(k); return yData_[j].at(k);
} }
void XYSampleData::setUnidimData(const DMatSample &xData,
const vector<const DMatSample *> &v)
{
FOR_STAT_ARRAY(xData, s)
FOR_VEC(xData[central], r)
{
x(r, 0)[s] = xData[s](r);
for (unsigned int j = 0; j < v.size(); ++j)
{
y(r, j)[s] = (*(v[j]))[s](r);
}
}
}
const DMat & XYSampleData::getXXVar(const Index i1, const Index i2) const DMat & XYSampleData::getXXVar(const Index i1, const Index i2)
{ {
checkXDim(i1); checkXDim(i1);
@ -253,6 +267,7 @@ void XYSampleData::setDataToSample(const Index s)
const XYStatData & XYSampleData::getData(void) const XYStatData & XYSampleData::getData(void)
{ {
setDataToSample(central); setDataToSample(central);
computeVarMat();
return data_; return data_;
} }

14
lib/XYSampleData.hpp
View File

@ -80,6 +80,8 @@ public:
const DMatSample & x(const Index k); const DMatSample & x(const Index k);
DSample & y(const Index k, const Index j); DSample & y(const Index k, const Index j);
const DSample & y(const Index k, const Index j) const; const DSample & y(const Index k, const Index j) const;
void setUnidimData(const DMatSample &xData,
const std::vector<const DMatSample *> &v);
template <typename... Ts> template <typename... Ts>
void setUnidimData(const DMatSample &xData, void setUnidimData(const DMatSample &xData,
const Ts & ...yDatas); const Ts & ...yDatas);
@ -141,17 +143,9 @@ void XYSampleData::setUnidimData(const DMatSample &xData, const Ts & ...yDatas)
static_assert(static_or<std::is_assignable<DMatSample, Ts>::value...>::value, static_assert(static_or<std::is_assignable<DMatSample, Ts>::value...>::value,
"y data arguments are not compatible with DMatSample"); "y data arguments are not compatible with DMatSample");
std::vector<const DMatSample *> yData{&yDatas...}; std::vector<const DMatSample *> v{&yDatas...};
FOR_STAT_ARRAY(xData, s) setUnidimData(xData, v);
FOR_VEC(xData[central], r)
{
x(r, 0)[s] = xData[s](r);
for (unsigned int j = 0; j < yData.size(); ++j)
{
y(r, j)[s] = (*(yData[j]))[s](r);
}
}
} }
template <typename... Ts> template <typename... Ts>