Updated treebank construction from folder.

Author: Olcay Taner YILDIZ

CorpusGenerator/NERCorpusGenerator.cpp

@@ -12,8 +12,8 @@
  * @param directory Directory where the treebank files reside.
  * @param pattern Pattern of the tree files to be included in the treebank. Use "." for all files.
  */
-NERCorpusGenerator::NERCorpusGenerator(const string &folder, const string &fileList) {
-    treeBank = new TreeBankDrawable(folder, fileList);
+NERCorpusGenerator::NERCorpusGenerator(const string &folder) {
+    treeBank = new TreeBankDrawable(folder);
 }
 
 NERCorpusGenerator::~NERCorpusGenerator() {

CorpusGenerator/NERCorpusGenerator.h

@@ -14,7 +14,7 @@ class NERCorpusGenerator {
     TreeBankDrawable* treeBank;
 public:
     ~NERCorpusGenerator();
-    NERCorpusGenerator(const string& folder, const string& fileList);
+    explicit NERCorpusGenerator(const string& folder);
     NERCorpus* generate();
 };
 

CorpusGenerator/SentenceDisambiguationCorpusGenerator.cpp

@@ -14,8 +14,8 @@
  * @param folder Directory where the sentence files reside.
  * @param filelist File list.
  */
-SentenceDisambiguationCorpusGenerator::SentenceDisambiguationCorpusGenerator(const string &folder, const string &fileList) {
-    annotatedCorpus = new AnnotatedCorpus(folder, fileList);
+SentenceDisambiguationCorpusGenerator::SentenceDisambiguationCorpusGenerator(const string &folder) {
+    annotatedCorpus = new AnnotatedCorpus(folder);
 }
 
 SentenceDisambiguationCorpusGenerator::~SentenceDisambiguationCorpusGenerator() {

CorpusGenerator/SentenceDisambiguationCorpusGenerator.h

@@ -14,7 +14,7 @@ class SentenceDisambiguationCorpusGenerator {
     AnnotatedCorpus* annotatedCorpus;
 public:
     ~SentenceDisambiguationCorpusGenerator();
-    SentenceDisambiguationCorpusGenerator(const string& folder, const string& fileList);
+    explicit SentenceDisambiguationCorpusGenerator(const string& folder);
     DisambiguationCorpus* generate();
 };
 

CorpusGenerator/TreeDisambiguationCorpusGenerator.cpp

@@ -14,8 +14,8 @@
  * @param folder Directory where the treebank files reside.
  * @param filelist File list.
  */
-TreeDisambiguationCorpusGenerator::TreeDisambiguationCorpusGenerator(const string &folder, const string &fileList) {
-    treeBank = new TreeBankDrawable(folder, fileList);
+TreeDisambiguationCorpusGenerator::TreeDisambiguationCorpusGenerator(const string &folder) {
+    treeBank = new TreeBankDrawable(folder);
 }
 
 TreeDisambiguationCorpusGenerator::~TreeDisambiguationCorpusGenerator() {

CorpusGenerator/TreeDisambiguationCorpusGenerator.h

@@ -13,7 +13,7 @@ class TreeDisambiguationCorpusGenerator {
     TreeBankDrawable* treeBank;
 public:
     ~TreeDisambiguationCorpusGenerator();
-    TreeDisambiguationCorpusGenerator(const string& folder, const string& fileList);
+    explicit TreeDisambiguationCorpusGenerator(const string& folder);
     DisambiguationCorpus* generate();
 };
 

DataSetGenerator/AnnotatedDataSetGenerator.cpp

@@ -13,9 +13,9 @@
  * @param pattern Pattern of the tree files to be included in the treebank. Use "." for all files.
  * @param instanceGenerator The instance generator used to generate the dataset.
  */
-AnnotatedDataSetGenerator::AnnotatedDataSetGenerator(const string &folder, const string &fileList,
+AnnotatedDataSetGenerator::AnnotatedDataSetGenerator(const string &folder,
                                                      InstanceGenerator *instanceGenerator) {
-    corpus = new AnnotatedCorpus(folder, fileList);
+    corpus = new AnnotatedCorpus(folder);
     this->instanceGenerator = instanceGenerator;
 }
 

DataSetGenerator/AnnotatedDataSetGenerator.h

@@ -15,7 +15,7 @@ class AnnotatedDataSetGenerator {
 protected:
     InstanceGenerator* instanceGenerator;
 public:
-    AnnotatedDataSetGenerator(const string& folder, const string& fileList, InstanceGenerator* instanceGenerator);
+    AnnotatedDataSetGenerator(const string& folder, InstanceGenerator* instanceGenerator);
     void setInstanceGenerator(InstanceGenerator* instanceGenerator);
     DataSet generate();
 };

DataSetGenerator/DataSetGenerator.cpp

@@ -14,8 +14,8 @@
  * @param includePunctuation If true, punctuation symbols are also included in the dataset, false otherwise.
  * @param instanceGenerator The instance generator used to generate the dataset.
  */
-DataSetGenerator::DataSetGenerator(const string &folder, const string &fileList, InstanceGenerator *instanceGenerator) {
-    treeBank = new TreeBankDrawable(folder, fileList);
+DataSetGenerator::DataSetGenerator(const string &folder, InstanceGenerator *instanceGenerator) {
+    treeBank = new TreeBankDrawable(folder);
     this->instanceGenerator = instanceGenerator;
 }
 

DataSetGenerator/DataSetGenerator.h

@@ -17,7 +17,7 @@ class DataSetGenerator {
     InstanceGenerator* instanceGenerator;
     vector<Instance*> generateInstanceListFromTree(ParseTreeDrawable* parseTree);
 public:
-    DataSetGenerator(const string &folder, const string &fileList, InstanceGenerator* instanceGenerator);
+    DataSetGenerator(const string &folder, InstanceGenerator* instanceGenerator);
     void setInstanceGenerator(InstanceGenerator* instanceGenerator);
     DataSet generate();
 };