Mercurial > hg > aimc
changeset 334:4ee5bb246f60
- Windows python building magic
| author | tomwalters |
|---|---|
| date | Thu, 22 Jul 2010 19:03:51 +0000 |
| parents | 1a232b481f47 |
| children | 71c438f9daf7 |
| files | trunk/swig/aim_modules.i trunk/swig/setup.py |
| diffstat | 2 files changed, 27 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/trunk/swig/aim_modules.i Thu Jul 22 18:57:02 2010 +0000 +++ b/trunk/swig/aim_modules.i Thu Jul 22 19:03:51 2010 +0000 @@ -17,6 +17,7 @@ %module aimc %include "std_string.i" +%include stl.i %{ #include "Support/Common.h" #include "Support/Module.h" @@ -29,16 +30,36 @@ #include "Modules/Strobes/ModuleLocalMax.h" #include "Modules/SAI/ModuleSAI.h" #include "Modules/SSI/ModuleSSI.h" -#include "Modules/SNR/ModuleNoise.h" #include "Modules/Profile/ModuleSlice.h" #include "Modules/Profile/ModuleScaler.h" -#include "Modules/Features/ModuleGaussians.h" -#include "Modules/Output/FileOutputHTK.h" %} %include "Support/Parameters.h" %include "Support/SignalBank.h" -%include "Support/Module.h" + +namespace aimc { +using std::ostream; +using std::set; +using std::string; +class Module { + public: + explicit Module(Parameters *parameters); + virtual ~Module(); + virtual bool Initialize(const SignalBank &input); + bool initialized() const; + bool AddTarget(Module* target_module); + bool RemoveTarget(Module* target_module); + void RemoveAllTargets(); + virtual void Process(const SignalBank &input) = 0; + void Reset(); + const SignalBank* GetOutputBank() const; + string version() const; + string id() const; + string description() const; + string type() const; +}; +} + %include "Modules/BMM/ModuleGammatone.h" %include "Modules/BMM/ModulePZFC.h" %include "Modules/NAP/ModuleHCL.h" @@ -46,8 +67,5 @@ %include "Modules/Strobes/ModuleLocalMax.h" %include "Modules/SAI/ModuleSAI.h" %include "Modules/SSI/ModuleSSI.h" -%include "Modules/SNR/ModuleNoise.h" %include "Modules/Profile/ModuleSlice.h" %include "Modules/Profile/ModuleScaler.h" -%include "Modules/Features/ModuleGaussians.h" -%include "Modules/Output/FileOutputHTK.h"
--- a/trunk/swig/setup.py Thu Jul 22 18:57:02 2010 +0000 +++ b/trunk/swig/setup.py Thu Jul 22 19:03:51 2010 +0000 @@ -28,7 +28,6 @@ '../src/Support/Parameters.cc', '../src/Support/SignalBank.cc', '../src/Support/Module.cc', - '../src/Modules/Features/ModuleGaussians.cc', '../src/Modules/BMM/ModuleGammatone.cc', '../src/Modules/BMM/ModulePZFC.cc', '../src/Modules/NAP/ModuleHCL.cc', @@ -36,10 +35,8 @@ '../src/Modules/Strobes/ModuleLocalMax.cc', '../src/Modules/SAI/ModuleSAI.cc', '../src/Modules/SSI/ModuleSSI.cc', - '../src/Modules/SNR/ModuleNoise.cc', '../src/Modules/Profile/ModuleSlice.cc', - '../src/Modules/Profile/ModuleScaler.cc', - '../src/Modules/Output/FileOutputHTK.cc'], + '../src/Modules/Profile/ModuleScaler.cc'], swig_opts = ['-c++','-I../src/'], include_dirs=['../src/', '/opt/local/include/'] ) @@ -50,4 +47,4 @@ description = """SWIG wrapper round the core of aimc""", ext_modules = [aimc_module], py_modules = ["aimc"], - ) \ No newline at end of file + )