diff --git a/lib/Global.hpp b/lib/Global.hpp index a8e3c1a..19852a3 100644 --- a/lib/Global.hpp +++ b/lib/Global.hpp @@ -24,6 +24,7 @@ #pragma GCC diagnostic ignored "-Wdeprecated-register" #include +#include #include #include #include @@ -77,15 +78,19 @@ using MatExpr = Eigen::MatrixBase; template using Mat = Eigen::Matrix; -typedef Mat IMat; -typedef Mat DMatBase; +typedef Mat IMat; +typedef Mat LMat; +typedef Mat DMatBase; +typedef Mat> CMat; // vector types template using Vec = Mat; -typedef Vec IVec; -typedef Vec DVec; +typedef Vec IVec; +typedef Vec LVec; +typedef Vec DVec; +typedef Vec> CVec; #define FOR_VEC(vec, i) for (Latan::Index i = 0; i < (vec).size(); ++i) #define FOR_ARRAY(ar, i) FOR_VEC(ar, i) diff --git a/lib/MatSample.hpp b/lib/MatSample.hpp index ea15948..27a3df3 100644 --- a/lib/MatSample.hpp +++ b/lib/MatSample.hpp @@ -27,7 +27,7 @@ BEGIN_NAMESPACE /****************************************************************************** - * DMat sample class * + * matrix sample class * ******************************************************************************/ class DMatSample: public Sample, public IoObject { diff --git a/lib/StatArray.hpp b/lib/StatArray.hpp index 3d8dba1..f662de2 100644 --- a/lib/StatArray.hpp +++ b/lib/StatArray.hpp @@ -90,6 +90,7 @@ template using Sample = StatArray; typedef Sample DSample; +typedef Sample CMatSample; /****************************************************************************** * StatArray class template implementation *