comparison src/Support/ModuleTree.h @ 195:0db637cac96b

- Added as-yet-unfinished support for a proper configuraiton file format
- Added a couple of pythin scripts to generate HMM configuration files
- Variable name changes and other cosmetic things
- Added the option for the noise generation to do pink noise (untested)

 /*! \author: Thomas Walters <[e-mail]>
  *  \date 2010/08/08
  *  \version \$Id: $
  */
 
-#include <iostream>
-#include <map>
 #include <string>
-
-#include "Support/Common.h"
-#include "Support/Module.h"
-#include "Support/Parameters.h"
-#include "Support/SignalBank.h"
-#include "Support/linked_ptr.h"
 
 namespace aimc {
 using std::string;
-using std::map;
-using std::ostream;
-
 class ModuleTree {
  public:
-  ModuleTree();
-  bool LoadConfigFile(const string &filename);
-  bool LoadConfigText(const string &config_text);
-  string GetFullConfig();
-  bool Initialize(Parameters *global_parameters);
-  void Reset();
-  void PrintConfiguration(ostream &out);
-  void Process();
-  void MakeDotGraph(ostream &out);
-  void set_output_filename_prefix(const string &prefix) {
-    output_filename_prefix_ = prefix;
-  };
+  bool ParseConfigFile(const string &filename);
+  bool ParseConfigText(const string &config_text);
+  void set_output_filename_prefix(const string &prefix);
   string output_filename_prefix() {
     return output_filename_prefix_;
-  };
+  }
  private:
-  bool ConstructTree();
-  Parameters config_;
-  SignalBank s_;
   string output_filename_prefix_;
-  map<string, linked_ptr<Module> > modules_;
-  Module *root_module_;
-  map<string, linked_ptr<Parameters> > parameters_;
-  bool initialized_;
   DISALLOW_COPY_AND_ASSIGN(ModuleTree);
 };
 }  // namespace aimc