diff --git a/modules/base/pymod/__init__.py.in b/modules/base/pymod/__init__.py.in index 4b1be9f6cdfd7c504bf4cd7b0b5094b0f5b8a147..a57b7aedd199eac8e763fe6303594fea7c9c50d7 100644 --- a/modules/base/pymod/__init__.py.in +++ b/modules/base/pymod/__init__.py.in @@ -18,7 +18,7 @@ #------------------------------------------------------------------------------ -__all__=['Correl', 'FileLogSink', 'FloatList', 'GetCurrentLogSink', 'GetPrefixPath', 'GetSharedDataPath', 'GetVerbosityLevel', 'Histogram', 'IntList', 'LogDebug', 'LogError', 'LogInfo', 'LogScript', 'LogSink', 'LogTrace', 'LogVerbose', 'LogWarning', 'Max', 'Mean', 'Median', 'Min', 'MultiLogSink', 'PopLogSink', 'PopVerbosityLevel', 'PushLogSink', 'PushVerbosityLevel', 'Range', 'SetPrefixPath', 'StdDev', 'StreamLogSink', 'StringList', 'StringLogSink', 'Units', 'VERSION', 'VERSION_MAJOR', 'VERSION_MINOR', 'VERSION_PATCH', 'WITH_NUMPY', 'conop', 'geom', 'io', 'mol', 'seq', 'stutil' @ALL_ADDITIONAL_MODULES@] +__all__=['Correl', 'FileLogSink', 'FloatList', 'FloatMatrix', 'GetCurrentLogSink', 'GetPrefixPath', 'GetSharedDataPath', 'GetVerbosityLevel', 'Histogram', 'IntList', 'LogDebug', 'LogError', 'LogInfo', 'LogScript', 'LogSink', 'LogTrace', 'LogVerbose', 'LogWarning', 'Max', 'Mean', 'Median', 'Min', 'MultiLogSink', 'PopLogSink', 'PopVerbosityLevel', 'PushLogSink', 'PushVerbosityLevel', 'Range', 'SetPrefixPath', 'StdDev', 'StreamLogSink', 'StringList', 'StringLogSink', 'Units', 'VERSION', 'VERSION_MAJOR', 'VERSION_MINOR', 'VERSION_PATCH', 'WITH_NUMPY', 'conop', 'geom', 'io', 'mol', 'seq', 'stutil' @ALL_ADDITIONAL_MODULES@] from _ost_base import * from stutil import * diff --git a/modules/base/pymod/wrap_base.cc b/modules/base/pymod/wrap_base.cc index e1a74154acc8cd264166c732533c63f9adcd9556..835bc8e51e1ea4ba6b2426cd2cf2208bbf1ad9bb 100644 --- a/modules/base/pymod/wrap_base.cc +++ b/modules/base/pymod/wrap_base.cc @@ -110,4 +110,9 @@ BOOST_PYTHON_MODULE(_ost_base) .def(vector_indexing_suite<std::vector<int> >()) .def(geom::VectorAdditions<IntList>()) ; + + typedef std::vector< FloatList > FloatMatrix; + class_<FloatMatrix>("FloatMatrix", init<>()) + .def(vector_indexing_suite<FloatMatrix>()) + ; }