changeset 285:3ef86b0f8202

-Updated the SWIG wrapper to include all the modules. Now employing a lazier strategy for the SWIG interface file.

--- a/trunk/src/Modules/SSI/ModuleSSI.cc	Fri Feb 19 13:07:54 2010 +0000
+++ b/trunk/src/Modules/SSI/ModuleSSI.cc	Fri Feb 19 14:17:42 2010 +0000
@@ -61,7 +61,7 @@
   // Check to see if the module has been initialized. If not, processing
   // should not continue.
   if (!initialized_) {
-    LOG_ERROR(_T("Module ModuleSSI not initialized."));
+    LOG_ERROR(_T("Module %s not initialized."), module_identifier_.c_str());
     return;
   }
 
@@ -70,7 +70,7 @@
   if (buffer_length_ != input.buffer_length()
       || channel_count_ != input.channel_count()) {
     LOG_ERROR(_T("Mismatch between input to Initialize() and input to "
-                 "Process() in module %s"), module_identifier_.c_str());
+                 "Process() in module %s."), module_identifier_.c_str());
     return;
   }
 

--- a/trunk/swig/aim_modules.i	Fri Feb 19 13:07:54 2010 +0000
+++ b/trunk/swig/aim_modules.i	Fri Feb 19 14:17:42 2010 +0000
@@ -23,92 +23,26 @@
 #include "Support/Module.h"
 #include "Support/Parameters.h"
 #include "Support/SignalBank.h"
+#include "Modules/BMM/ModuleGammatone.h"
+#include "Modules/BMM/ModulePZFC.h"
+#include "Modules/NAP/ModuleHCL.h"
+#include "Modules/Strobes/ModuleParabola.h"
+#include "Modules/SAI/ModuleSAI.h"
+#include "Modules/SSI/ModuleSSI.h"
+#include "Modules/Profile/ModuleSlice.h"
 #include "Modules/Features/ModuleGaussians.h"
-#include "Modules/BMM/ModuleGammatone.h"
+#include "Modules/Output/FileOutputHTK.h"
 %}
 
-namespace aimc {
-class Parameters {
-public:
-	Parameters();
-	~Parameters();
-	bool Load(const char *sParamFilename);
-	bool Save(const char *sParamFilename);
-  std::string WriteString();
-	bool Merge(const char *sParamFilename);
-	const char* DefaultString(const char *sName, const char *val);
-	int DefaultInt(const char *sName, int val);
-	unsigned int DefaultUInt(const char *sName, unsigned int val);
-	float DefaultFloat(const char *sName, float val);
-	bool DefaultBool(const char *sName, bool val);
-	void SetString(const char *sName, const char *val);
-	void SetInt(const char *sName, int val);
-	void SetUInt(const char *sName, unsigned int val);
-	void SetFloat(const char *sName, float val);
-	void SetBool(const char *sName, bool val);
-	const char *GetString(const char *sName);
-	int GetInt(const char *sName);
-	unsigned int GetUInt(const char *sName);
-	float GetFloat(const char *sName);
-	bool GetBool(const char *sName);
-	bool IsSet(const char *sName);
-	bool Parse(const char *sCmd);
-	bool Delete(const char *sName);
-	static const unsigned int MaxParamNameLength = 128;
-};
-
-class SignalBank {
- public:
-   SignalBank();
-    ~SignalBank();
-    bool Initialize(int channel_count, int signal_length, float sample_rate);
-    bool Initialize(const SignalBank &input);
-    bool Validate() const;
-    const vector<float> &operator[](int channel) const;
-    float sample(int channel, int index) const;
-    void set_sample(int channel, int index, float value);
-    float sample_rate() const;
-    int buffer_length() const;
-    int start_time() const;
-    void set_start_time(int start_time);
-    float centre_frequency(int i) const;
-    void set_centre_frequency(int i, float cf);
-    bool initialized() const;
-    int channel_count() const;
-};
-
-class Module {
- public:
-  explicit Module(Parameters *parameters);
-  virtual ~Module();
-  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;
-  virtual void Reset() = 0;
-  const SignalBank* GetOutputBank() const;
- private:
-  DISALLOW_COPY_AND_ASSIGN(Module);
-};
-
-class ModuleGaussians : public Module
-{
- public:
-	ModuleGaussians(Parameters *pParam);
-	virtual ~ModuleGaussians();
-	virtual void Process(const SignalBank &input);
-	void Reset();
-};
-
-class ModuleGammatone : public Module
-{
- public:
-	ModuleGammatone(Parameters *pParam);
-	virtual ~ModuleGammatone();
-	virtual void Process(const SignalBank &input);
-	void Reset();
-};
-}  // namespace aimc
-
+%include "Support/Parameters.h"
+%include "Support/SignalBank.h"
+%include "Support/Module.h"
+%include "Modules/BMM/ModuleGammatone.h"
+%include "Modules/BMM/ModulePZFC.h"
+%include "Modules/NAP/ModuleHCL.h"
+%include "Modules/Strobes/ModuleParabola.h"
+%include "Modules/SAI/ModuleSAI.h"
+%include "Modules/SSI/ModuleSSI.h"
+%include "Modules/Profile/ModuleSlice.h"
+%include "Modules/Features/ModuleGaussians.h"
+%include "Modules/Output/FileOutputHTK.h"

--- a/trunk/swig/setup.py	Fri Feb 19 13:07:54 2010 +0000
+++ b/trunk/swig/setup.py	Fri Feb 19 14:17:42 2010 +0000
@@ -30,7 +30,14 @@
                                    '../src/Support/SignalBank.cc', 
                                    '../src/Support/Module.cc',
                                    '../src/Modules/Features/ModuleGaussians.cc',
-                                   '../src/Modules/BMM/ModuleGammatone.cc'],
+                                   '../src/Modules/BMM/ModuleGammatone.cc', 
+                                   '../src/Modules/BMM/ModulePZFC.cc',
+                                   '../src/Modules/NAP/ModuleHCL.cc',
+                                   '../src/Modules/Strobes/ModuleParabola.cc',
+                                   '../src/Modules/SAI/ModuleSAI.cc',
+                                   '../src/Modules/SSI/ModuleSSI.cc',
+                                   '../src/Modules/Profile/ModuleSlice.cc',
+                                   '../src/Modules/Output/FileOutputHTK.cc'],
                         swig_opts = ['-c++','-I../src/'], 
                         include_dirs=['../src/']
                         )