comparison src/Support/ModuleFactory.cc @ 121:3cdaa81c3aca

- Massive refactoring to make module tree stuff work. In theory we now support configuration files again. The graphics stuff is untested as yet.
author tomwalters
date Mon, 18 Oct 2010 04:42:28 +0000
parents e914b02b31b0
children 3172b041d3b9
comparison
equal deleted inserted replaced
120:89e4facffd93 121:3cdaa81c3aca
13 // distributed under the License is distributed on an "AS IS" BASIS, 13 // distributed under the License is distributed on an "AS IS" BASIS,
14 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 14 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15 // See the License for the specific language governing permissions and 15 // See the License for the specific language governing permissions and
16 // limitations under the License. 16 // limitations under the License.
17 17
18 #include "Modules/Input/ModuleFileInput.h" 18 #include "Modules/Features/ModuleGaussians.h"
19 #include "Modules/Features/ModuleDCT.h"
19 #include "Modules/BMM/ModuleGammatone.h" 20 #include "Modules/BMM/ModuleGammatone.h"
20 #include "Modules/BMM/ModulePZFC.h" 21 #include "Modules/BMM/ModulePZFC.h"
22 #include "Modules/Input/ModuleFileInput.h"
21 #include "Modules/NAP/ModuleHCL.h" 23 #include "Modules/NAP/ModuleHCL.h"
22 #include "Modules/Strobes/ModuleParabola.h" 24 #include "Modules/Output/FileOutputHTK.h"
25 #include "Modules/Output/FileOutputAIMC.h"
26 #include "Modules/Output/Graphics/GraphicsViewTime.h"
27 #include "Modules/Profile/ModuleSlice.h"
28 #include "Modules/Profile/ModuleScaler.h"
23 #include "Modules/SAI/ModuleSAI.h" 29 #include "Modules/SAI/ModuleSAI.h"
24 #include "Modules/SSI/ModuleSSI.h" 30 #include "Modules/SSI/ModuleSSI.h"
25 #include "Modules/Profile/ModuleSlice.h" 31 #include "Modules/SNR/ModuleNoise.h"
26 #include "Modules/Profile/ModuleScaler.h" 32 #include "Modules/Strobes/ModuleParabola.h"
27 //#include "Modules/Features/ModuleGaussians.h" 33 #include "Modules/Strobes/ModuleLocalMax.h"
28 #include "Modules/Output/FileOutputHTK.h"
29 34
30 #include "Support/ModuleFactory.h" 35 #include "Support/ModuleFactory.h"
31 36
32 namespace aimc { 37 namespace aimc {
33 Module* ModuleFactory::Create(string module_name_, Parameters* params) { 38 Module* ModuleFactory::Create(string module_name_, Parameters* params) {
39 if (module_name_.compare("gaussians") == 0)
40 return new ModuleGaussians(params);
41
42 if (module_name_.compare("dct") == 0)
43 return new ModuleDCT(params);
44
34 if (module_name_.compare("gt") == 0) 45 if (module_name_.compare("gt") == 0)
35 return new ModuleGammatone(params); 46 return new ModuleGammatone(params);
36 47
37 if (module_name_.compare("pzfc") == 0) 48 if (module_name_.compare("pzfc") == 0)
38 return new ModulePZFC(params); 49 return new ModulePZFC(params);
39
40 //if (module_name_.compare("gaussians") == 0)
41 // return new ModuleGaussians(params);
42 50
43 if (module_name_.compare("file_input") == 0) 51 if (module_name_.compare("file_input") == 0)
44 return new ModuleFileInput(params); 52 return new ModuleFileInput(params);
45 53
46 if (module_name_.compare("hcl") == 0) 54 if (module_name_.compare("hcl") == 0)
47 return new ModuleHCL(params); 55 return new ModuleHCL(params);
48 56
49 if (module_name_.compare("htk_out") == 0) 57 if (module_name_.compare("htk_out") == 0)
50 return new FileOutputHTK(params); 58 return new FileOutputHTK(params);
59
60 if (module_name_.compare("aimc_out") == 0)
61 return new FileOutputAIMC(params);
62
63 if (module_name_.compare("graphics_time") == 0)
64 return new GraphicsViewTime(params);
51 65
52 if (module_name_.compare("scaler") == 0) 66 if (module_name_.compare("scaler") == 0)
53 return new ModuleScaler(params); 67 return new ModuleScaler(params);
54 68
55 if (module_name_.compare("slice") == 0) 69 if (module_name_.compare("slice") == 0)
62 return new ModuleSSI(params); 76 return new ModuleSSI(params);
63 77
64 if (module_name_.compare("parabola") == 0) 78 if (module_name_.compare("parabola") == 0)
65 return new ModuleParabola(params); 79 return new ModuleParabola(params);
66 80
81 if (module_name_.compare("local_max") == 0)
82 return new ModuleLocalMax(params);
83
67 return NULL; 84 return NULL;
68 } 85 }
69 } // namespace aimc 86 } // namespace aimc