File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 33
44#include < functional>
55#include < tuple>
6+ #include < map>
7+ #include < set>
68
79#include < Eigen/Eigen>
810#include < unsupported/Eigen/CXX11/Tensor> // For 3d rectangular grids
Original file line number Diff line number Diff line change 11#include < algorithm>
2- #include < set>
32
43#include < YamlCheck.H>
54#include < EXPException.H>
@@ -374,7 +373,7 @@ namespace BasisClasses
374373 {
375374 // Identifier
376375 //
377- BasisID = " sphereSL " ;
376+ BasisID = " SphereSL " ;
378377
379378 // Assign some defaults
380379 //
@@ -438,7 +437,7 @@ namespace BasisClasses
438437 {
439438 // Identifier
440439 //
441- BasisID = " bessel " ;
440+ BasisID = " Bessel " ;
442441
443442 try {
444443 if (conf[" rnum" ])
@@ -1026,8 +1025,8 @@ namespace BasisClasses
10261025 int ltot = (lmax+1 )*(lmax+2 )/2 ;
10271026 ret[T].resize (ltot);
10281027 for (int l=0 ; l<ltot; l++) {
1029- std::get<0 >(ret[T][l]) = meanV[T][l];
1030- std::get<1 >(ret[T][l]) = covrV[T][l];
1028+ std::get<0 >(ret[T][l]) = std::move ( meanV[T][l]) ;
1029+ std::get<1 >(ret[T][l]) = std::move ( covrV[T][l]) ;
10311030 }
10321031 }
10331032 }
@@ -5027,7 +5026,7 @@ namespace BasisClasses
50275026 int lmax, nmax, ltot;
50285027
50295028 // Current implemented spherical types
5030- const std::set<std::string> sphereType = {" Spherical" , " SphereSL" , " bessel " };
5029+ const std::set<std::string> sphereType = {" Spherical" , " SphereSL" , " Bessel " };
50315030
50325031 // Currently implemented cylindrical types
50335032 const std::set<std::string> cylinderType = {" Cylindrical" };
Original file line number Diff line number Diff line change @@ -2675,7 +2675,8 @@ void BasisFactoryClasses(py::module &m)
26752675 Returns
26762676 -------
26772677 list(list(tuple(numpy.ndarray, numpy.ndarray)))
2678- list of covariance matrices for each subsample
2678+ list of partitioned coefficients and their covariance matrices for
2679+ each subsample
26792680 )" ,
26802681 py::arg (" index" )=0 )
26812682 .def (" getCoefCovariance" , static_cast <std::vector<std::vector<std::tuple<Eigen::VectorXd, Eigen::MatrixXd>>>
@@ -2691,7 +2692,8 @@ void BasisFactoryClasses(py::module &m)
26912692 Returns
26922693 -------
26932694 list(list(tuple(numpy.ndarray, numpy.ndarray)))
2694- list of covariance matrices for each subsample
2695+ list of partitioned coefficients and their covariance matrices for
2696+ each subsample
26952697 )" ,
26962698 py::arg (" time" )=0.0 )
26972699 .def (" getCovarSamples" , static_cast <std::tuple<Eigen::VectorXi, Eigen::VectorXd>
You can’t perform that action at this time.
0 commit comments