portelli/LatAnalyze
1
0
Fork 0
mirror of https://github.com/aportelli/LatAnalyze.git synced 2025-10-31 14:54:33 +00:00
Code Releases Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Antonin Portelli
2018-04-23 11:37:09 +01:00
parent 0735cd54ce 8a229ec0b0
commit c62f3a4b69
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/exRootFinder.cpp
View File

@@ -7,8 +7,8 @@ using namespace Latan;
int main(void) int main(void)
{ {
constexpr double a = 1., b = 10.; constexpr double a = 1., b = 10.;
DoubleFunction f1([a](const double *x){return a*(1.-x[0]);}, 2); DoubleFunction f1([](const double *x){return a*(1.-x[0]);}, 2);
DoubleFunction f2([b](const double *x){return b*(x[1]-x[0]*x[0]);}, 2); DoubleFunction f2([](const double *x){return b*(x[1]-x[0]*x[0]);}, 2);
vector<DoubleFunction *> system = {&f1, &f2}; vector<DoubleFunction *> system = {&f1, &f2};
GslHybridRootFinder solve; GslHybridRootFinder solve;
DVec init(2), x; DVec init(2), x;

4
lib/MatSample.hpp
View File

@@ -228,7 +228,7 @@ Index MatSample<T>::BlockTemplate<S>::getNCol(void) const
// assignement operators /////////////////////////////////////////////////////// // assignement operators ///////////////////////////////////////////////////////
template <typename T> template <typename T>
template <class S> template <class S>
MatSample<T>::BlockTemplate<S> & typename MatSample<T>::template BlockTemplate<S> &
MatSample<T>::BlockTemplate<S>::operator=(const S &sample) MatSample<T>::BlockTemplate<S>::operator=(const S &sample)
{ {
FOR_STAT_ARRAY(sample_, s) FOR_STAT_ARRAY(sample_, s)
@@ -241,7 +241,7 @@ MatSample<T>::BlockTemplate<S>::operator=(const S &sample)
template <typename T> template <typename T>
template <class S> template <class S>
MatSample<T>::BlockTemplate<S> & typename MatSample<T>::template BlockTemplate<S> &
MatSample<T>::BlockTemplate<S>::operator=(const S &&sample) MatSample<T>::BlockTemplate<S>::operator=(const S &&sample)
{ {
*this = sample; *this = sample;