Don't use “final” as an identifier: it's reserved.

This word is a C++ keyword as of C++14, so avoid using it.

Also updating some C-style use of “bool”.

4 files changed, 54 insertions, 54 deletions

diff --git a/mgizapp/src/Parameter.cpp b/mgizapp/src/Parameter.cpp
index d51554f..ff8c400 100644
--- a/mgizapp/src/Parameter.cpp
+++ b/mgizapp/src/Parameter.cpp
@@ -31,9 +31,9 @@ USA.
 #include <strstream>
 
 
-bool absolutePathNames=0;
+bool absolutePathNames = false;
 string ParameterPathPrefix;
-bool ParameterChangedFlag=0;
+bool ParameterChangedFlag = false;
 
 bool writeParameters(ofstream&of,const ParSet&parset,int level)
 {
@@ -56,7 +56,7 @@ bool writeParameters(ofstream&of,const ParSet&parset,int level)
       of << endl;
     }
   }
-  return 1;
+  return true;
 }
 
 bool readParameters(ifstream&f,const ParSet&parset,int verb,int level)
@@ -70,7 +70,7 @@ bool readParameters(ifstream&f,const ParSet&parset,int verb,int level)
     if(makeSetCommand(s1,s2,parset,verb,level)==0)
       cerr << "ERROR: could not set: (C) " << s1 << " " << s2 << endl;
   }
-  return 1;
+  return true;
 }
 
 
@@ -85,7 +85,7 @@ bool makeSetCommand(string _s1,string s2,const ParSet&parset,int verb,int level)
         (*i)->setParameter(s2,verb);
       else if(verb>1)
         cerr << "ERROR: Could not set: (A) " << s1 << " " << s2 << " " << level << " " << (*i)->getLevel() << endl;
-      return 1;
+      return true;
     } else if( (*i)->getString().substr(0,s1.length())==s1 ) {
       anf=(*i);
       anfset++;
@@ -96,13 +96,13 @@ bool makeSetCommand(string _s1,string s2,const ParSet&parset,int verb,int level)
       anf->setParameter(s2,verb);
     else if( verb>1 )
       cerr << "ERROR: Could not set: (B) " << s1 << " " << s2 << " " << level << " " << anf->getLevel() << endl;
-    return 1;
+    return true;
   }
   if( anfset>1 )
     cerr << "ERROR: ambiguous parameter '" << s1 << "'.\n";
   if( anfset==0 )
     cerr << "ERROR: parameter '" << s1 << "' does not exist.\n";
-  return 0;
+  return false;
 }
 
 ostream& printPars(ostream&of,const ParSet&parset,int level)
diff --git a/mgizapp/src/model3.cpp b/mgizapp/src/model3.cpp
index ec693ec..a906bfe 100644
--- a/mgizapp/src/model3.cpp
+++ b/mgizapp/src/model3.cpp
@@ -277,7 +277,7 @@ struct m3_em_loop_t {
   pthread_t thread;
   d4model* d4;
   d5model* d5;
-  bool final;
+  bool is_final;
   m3_em_loop_t() :
     m(0), done(0), valid(0),d4(0),d5(0) {
   }
@@ -287,14 +287,14 @@ struct m3_em_loop_t {
 void* m3_exe_emloop(void *arg)
 {
   m3_em_loop_t* em =(m3_em_loop_t *) arg;
-  em->m->viterbi_thread(em->it, em->alignfile, em->dump_files, *(em->d4),*(em->d5),em->final,em->fromModel,em->toModel,em->modelName);
+  em->m->viterbi_thread(em->it, em->alignfile, em->dump_files, *(em->d4),*(em->d5),em->is_final,em->fromModel,em->toModel,em->modelName);
   em->done = -1;
   return arg;
 }
 
-void model3::viterbi_thread(int it, string alignfile, bool dump_files,d4model& d4m,d5model& d5m,bool final,char fromModel,char toModel,string& modelName)
+void model3::viterbi_thread(int it, string alignfile, bool dump_files,d4model& d4m,d5model& d5m,bool is_final,char fromModel,char toModel,string& modelName)
 {
-#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    dump_files, alignfile.c_str(),     true,  modelName,final
+#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    dump_files, alignfile.c_str(),     true,  modelName,is_final
   switch (toModel) {
   case '3': {
     switch (fromModel) {
@@ -413,9 +413,9 @@ int model3::viterbi(int noIterationsModel3, int noIterationsModel4,
   }
 
   for (unsigned int it=1; it < trainingString.length(); it++) {
-    bool final=0;
+    bool is_final=false;
     if (it==trainingString.length()-1)
-      final=1;
+      is_final=true;
     string modelName;
     char fromModel=trainingString[it-1], toModel=trainingString[it];
     if (fromModel==toModel)
@@ -425,12 +425,12 @@ int model3::viterbi(int noIterationsModel3, int noIterationsModel4,
     it_st = time(NULL);
     cout <<"\n---------------------\n"<<modelName<<": Iteration " << it
          <<'\n';
-    dump_files = (final || ((Model3_Dump_Freq != 0) && ((it
+    dump_files = (is_final || ((Model3_Dump_Freq != 0) && ((it
                             % Model3_Dump_Freq) == 0))) && !NODUMPS;
     string d4file2;
     {
       // set up the names of the files where the tables will be printed
-      const string number = (final ? "final" : represent_number(it));
+      const string number = (is_final ? "final" : represent_number(it));
       tfile = Prefix + ".t3." + number;
       tfile_actual = Prefix + ".actual.t3." + number;
       afile = Prefix + ".a3." + number;
@@ -463,7 +463,7 @@ int model3::viterbi(int noIterationsModel3, int noIterationsModel4,
       th[k].done = 0;
       th[k].valid = 0;
       th[k].it = it;
-      th[k].final = final;
+      th[k].is_final = is_final;
       th[k].alignfile = alignfile + ".part" + represent_number(k, 3);
       th[k].dump_files = dump_files;
       th[k].fromModel = fromModel;
@@ -478,8 +478,8 @@ int model3::viterbi(int noIterationsModel3, int noIterationsModel4,
 
 #ifdef TRICKY_IBM3_TRAINING
 
-#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    dump_files, alignfile.c_str(),     true,  modelName,final
-#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,final
+#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    dump_files, alignfile.c_str(),     true,  modelName,is_final
+#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,is_final
     switch (toModel) {
     case '3':
       switch (fromModel) {
@@ -698,14 +698,14 @@ int model3::viterbi_hto3()
   string modelName="H23";
   //cout <<"\n---------------------\n"<<modelName<<": Iteration " << it<<'\n';
   int it = 1;
-  bool final =false;
+  bool is_final =false;
   ///ump_files = true;
-  dump_files = (final || ((Model3_Dump_Freq != 0) && ((it % Model3_Dump_Freq)
+  dump_files = (is_final || ((Model3_Dump_Freq != 0) && ((it % Model3_Dump_Freq)
                           == 0))) && !NODUMPS;
   string d4file2;
   {
     // set up the names of the files where the tables will be printed
-    const string number = (final ? "final" : represent_number(it));
+    const string number = (is_final ? "final" : represent_number(it));
     tfile = Prefix + ".t3." + number;
     tfile_actual = Prefix + ".actual.t3." + number;
     afile = Prefix + ".a3." + number;
@@ -732,8 +732,8 @@ int model3::viterbi_hto3()
 
 #ifdef TRICKY_IBM3_TRAINING
 
-#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    true, alignfile.c_str(),     true,  modelName,final
-#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,final
+#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    true, alignfile.c_str(),     true,  modelName,is_final
+#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,is_final
   viterbi_loop_with_tricks<transpair_modelhmm, const hmm>(TRAIN_ARGS,h,(void*)0);
   if (testPerp && testHandler)
     viterbi_loop_with_tricks<transpair_modelhmm, const hmm>(TEST_ARGS, h,(void*)0);
@@ -754,7 +754,7 @@ int model3::viterbi_hto3()
 
 int model3::viterbi_3to3()
 {
-  bool final = false;
+  bool is_final = false;
   double minErrors=1.0;
   int minIter=0;
   bool dump_files = false;
@@ -768,13 +768,13 @@ int model3::viterbi_3to3()
 
   // cout <<"\n---------------------\n"<<modelName<<": Iteration " << it<<'\n';
 
-  dump_files = (final || ((Model3_Dump_Freq != 0) && ((it % Model3_Dump_Freq)
+  dump_files = (is_final || ((Model3_Dump_Freq != 0) && ((it % Model3_Dump_Freq)
                           == 0))) && !NODUMPS;
   dump_files = true;
   string d4file2;
   {
     // set up the names of the files where the tables will be printed
-    const string number = (final ? "final" : represent_number(it));
+    const string number = (is_final ? "final" : represent_number(it));
     tfile = Prefix + ".t3." + number;
     tfile_actual = Prefix + ".actual.t3." + number;
     afile = Prefix + ".a3." + number;
@@ -800,8 +800,8 @@ int model3::viterbi_3to3()
 
 #ifdef TRICKY_IBM3_TRAINING
 
-#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    true, alignfile.c_str(),     true,  modelName,final
-#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,final
+#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    true, alignfile.c_str(),     true,  modelName,is_final
+#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,is_final
   viterbi_loop_with_tricks<transpair_model3>( TRAIN_ARGS, (void*)0,(void*)0);
   if (testPerp && testHandler)
     viterbi_loop_with_tricks<transpair_model3>( TEST_ARGS, (void*)0,(void*)0);
@@ -823,7 +823,7 @@ int model3::viterbi_3to3()
 d4model* model3::viterbi_3to4()
 {
   double minErrors=1.0;
-  bool final = false;
+  bool is_final = false;
   bool dump_files = false;
   if(ewordclasses==NULL)
     ewordclasses = new WordClasses;
@@ -844,13 +844,13 @@ d4model* model3::viterbi_3to4()
   int it = 1;
   //cout <<"\n---------------------\n"<<modelName<<": Iteration " << it<<'\n';
 
-  dump_files = (final || ((Model3_Dump_Freq != 0) && ((it % Model3_Dump_Freq)
+  dump_files = (is_final || ((Model3_Dump_Freq != 0) && ((it % Model3_Dump_Freq)
                           == 0))) && !NODUMPS;
   dump_files = true;
   string d4file2;
   {
     // set up the names of the files where the tables will be printed
-    const string number = (final ? "final" : represent_number(it));
+    const string number = (is_final ? "final" : represent_number(it));
     tfile = Prefix + ".t3." + number;
     tfile_actual = Prefix + ".actual.t3." + number;
     afile = Prefix + ".a3." + number;
@@ -876,8 +876,8 @@ d4model* model3::viterbi_3to4()
 
 #ifdef TRICKY_IBM3_TRAINING
 
-#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    true, alignfile.c_str(),     true,  modelName,final
-#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,final
+#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    true, alignfile.c_str(),     true,  modelName,is_final
+#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,is_final
   viterbi_loop_with_tricks<transpair_model3, void, d4model>(TRAIN_ARGS, (void*)0,&d4m);
   if (testPerp && testHandler)
     viterbi_loop_with_tricks<transpair_model3, void, d4model>( TEST_ARGS , (void*)0,&d4m);
@@ -908,8 +908,8 @@ int model3::viterbi_4to4(d4model& d4m)
 
   cout << "Starting Model4 To Model 4 Viterbi Training";
   int it = 1;
-  bool final = false;
-  dump_files = (final || ((Model3_Dump_Freq != 0) && ((it % Model3_Dump_Freq)
+  bool is_final = false;
+  dump_files = (is_final || ((Model3_Dump_Freq != 0) && ((it % Model3_Dump_Freq)
                           == 0))) && !NODUMPS;
   dump_files = true;
 
@@ -944,8 +944,8 @@ int model3::viterbi_4to4(d4model& d4m)
 
 #ifdef TRICKY_IBM3_TRAINING
 
-#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    true, alignfile.c_str(),     true,  modelName,final
-#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,final
+#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    true, alignfile.c_str(),     true,  modelName,is_final
+#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,is_final
 
   viterbi_loop_with_tricks<transpair_model4, d4model, d4model>(TRAIN_ARGS , &d4m,&d4m);
 
@@ -1054,21 +1054,21 @@ void multi_thread_m34_em(model3& m3, int ncpu, int Model3_Iterations,
     m3.perp.clear();
     m3.trainViterbiPerp.clear();
     m3.iter = i;
-    bool final = (i==Model3_Iterations-1 || i == Model4_Iterations
+    bool is_final = (i==Model3_Iterations-1 || i == Model4_Iterations
                   +Model3_Iterations-1);
-    dump_files = (final || ((Model3_Dump_Freq != 0) && ((i
+    dump_files = (is_final || ((Model3_Dump_Freq != 0) && ((i
                             % Model3_Dump_Freq) == 0))) && !NODUMPS;
     m3.sHandler1.rewind();
     m3.perp.clear() ; // clears cross_entrop & perplexity
     m3.trainViterbiPerp.clear() ; // clears cross_entrop & perplexity
     string modelName;
     it_st = time(NULL);
-    dump_files = (final || ((Model3_Dump_Freq != 0) && ((i
+    dump_files = (is_final || ((Model3_Dump_Freq != 0) && ((i
                             % Model3_Dump_Freq) == 0))) && !NODUMPS;
     string d4file2;
     {
       // set up the names of the files where the tables will be printed
-      const string number = (final ? "final": represent_number(i));
+      const string number = (is_final ? "final": represent_number(i));
       tfile = Prefix + ".t3." + number;
       tfile_actual = Prefix + ".actual.t3." + number;
       afile = Prefix + ".a3." + number;
diff --git a/mgizapp/src/model3.h b/mgizapp/src/model3.h
index 5e95f7d..81f5840 100644
--- a/mgizapp/src/model3.h
+++ b/mgizapp/src/model3.h
@@ -99,7 +99,7 @@ public:
   d4model* viterbi_3to4();
   int viterbi_3to3();
   int viterbi_4to4(d4model& d4m);
-  void viterbi_thread(int it, string alignfile, bool dump_files,d4model& d4m,d5model& d5m,bool final,char fromModel,char toModel,string& modelName);
+  void viterbi_thread(int it, string alignfile, bool dump_files,d4model& d4m,d5model& d5m,bool is_final,char fromModel,char toModel,string& modelName);
 private:
 
 
@@ -145,7 +145,7 @@ private:
 
   template<class MODEL_TYPE, class A, class B> void viterbi_loop_with_tricks(
     Perplexity&, Perplexity&, sentenceHandler&, bool, const char*,
-    bool, string model, bool final, A*d4m, B*d5m);
+    bool, string model, bool is_final, A*d4m, B*d5m);
 
 };
 
diff --git a/mgizapp/src/model3_viterbi_with_tricks.cpp b/mgizapp/src/model3_viterbi_with_tricks.cpp
index 021a3d3..7ae3e1d 100644
--- a/mgizapp/src/model3_viterbi_with_tricks.cpp
+++ b/mgizapp/src/model3_viterbi_with_tricks.cpp
@@ -378,7 +378,7 @@ inline bool operator<(const Als&x,const Als&y)
 template<class MODEL_TYPE, class ADDITIONAL_MODEL_DATA_IN,class ADDITIONAL_MODEL_DATA_OUT>
 void model3::viterbi_loop_with_tricks(Perplexity& perp, Perplexity& viterbiPerp, sentenceHandler& sHandler1,
                                       bool dump_files, const char* alignfile,
-                                      bool collect_counts, string model, bool final,
+                                      bool collect_counts, string model, bool is_final,
                                       ADDITIONAL_MODEL_DATA_IN*dm_in,
                                       ADDITIONAL_MODEL_DATA_OUT*dm_out)
 {
@@ -393,7 +393,7 @@ void model3::viterbi_loop_with_tricks(Perplexity& perp, Perplexity& viterbiPerp,
   int pair_no;
   int HillClimbingSteps=0;
   NumberOfAlignmentsInSophisticatedCountCollection=0;
-  if (dump_files||FEWDUMPS||(final&&(ONLYALDUMPS)) ) {
+  if (dump_files||FEWDUMPS||(is_final&&(ONLYALDUMPS)) ) {
     of2.open(alignfile);
     if(of2.is_open()) {
       cout << "I will write alignment to " << alignfile << endl;
@@ -402,7 +402,7 @@ void model3::viterbi_loop_with_tricks(Perplexity& perp, Perplexity& viterbiPerp,
   /*  if(!of2.is_open()){
           cerr << "I don't know why you do not let me dump file " << alignfile << endl;
       }*/
-  if( dump_files&&PrintN&&final ) {
+  if( dump_files&&PrintN&&is_final ) {
     string x=alignfile+string("NBEST");
     of3= new ofstream(x.c_str());
   }
@@ -525,7 +525,7 @@ void model3::viterbi_loop_with_tricks(Perplexity& perp, Perplexity& viterbiPerp,
     perp.addFactor(log(double(align_total_count)), count, l, m,0);
     viterbiPerp.addFactor(log(double(setOfGoodCenters[bestAlignment].second)), count, l, m,0);
     massert(log(double(setOfGoodCenters[bestAlignment].second)) <= log(double(align_total_count)));
-    if (dump_files||(FEWDUMPS&&sent.sentenceNo<1000)||(final&&(ONLYALDUMPS)) )
+    if (dump_files||(FEWDUMPS&&sent.sentenceNo<1000)||(is_final&&(ONLYALDUMPS)) )
       printAlignToFile(es, fs, Elist.getVocabList(), Flist.getVocabList(), of2, (setOfGoodCenters[bestAlignment].first)->getAlignment(), sent.sentenceNo,
                        setOfGoodCenters[bestAlignment].second);
     for(unsigned int i=0; i<setOfGoodCenters.size(); ++i)
@@ -590,7 +590,7 @@ void model3::viterbi_loop_with_tricks(Perplexity& perp, Perplexity& viterbiPerp,
 
   } /* of sentence pair E, F */
   //sHandler1.rewind();
-  if (dump_files||FEWDUMPS||(final&&(ONLYALDUMPS)) )
+  if (dump_files||FEWDUMPS||(is_final&&(ONLYALDUMPS)) )
     of2.close();
   delete of3;
   delete writeNBestErrorsFile;
@@ -604,7 +604,7 @@ void model3::viterbi_loop_with_tricks(Perplexity& perp, Perplexity& viterbiPerp,
 template<class MODEL_TYPE, class ADDITIONAL_MODEL_DATA_IN,class ADDITIONAL_MODEL_DATA_OUT>
 void model3::viterbi_loop_with_tricks_1(Perplexity& perp, Perplexity& viterbiPerp, sentenceHandler& sHandler1,
                                         bool dump_files, const char* alignfile,
-                                        bool collect_counts, string model, bool final,
+                                        bool collect_counts, string model, bool is_final,
                                         ADDITIONAL_MODEL_DATA_IN*dm_in,
                                         ADDITIONAL_MODEL_DATA_OUT*dm_out)
 {
@@ -618,9 +618,9 @@ void model3::viterbi_loop_with_tricks_1(Perplexity& perp, Perplexity& viterbiPer
   int pair_no;
   HillClimbingSteps=0;
   NumberOfAlignmentsInSophisticatedCountCollection=0;
-  if (dump_files||FEWDUMPS||(final&&(ONLYALDUMPS)) )
+  if (dump_files||FEWDUMPS||(is_final&&(ONLYALDUMPS)) )
     of2.open(alignfile);
-  if( dump_files&&PrintN&&final ) {
+  if( dump_files&&PrintN&&is_final ) {
     string x=alignfile+string("NBEST");
     of3= new ofstream(x.c_str());
   }
@@ -759,7 +759,7 @@ void model3::viterbi_loop_with_tricks_1(Perplexity& perp, Perplexity& viterbiPer
     perp.addFactor(log(double(align_total_count)), count, l, m,0);
     viterbiPerp.addFactor(log(double(setOfGoodCenters[bestAlignment].second)), count, l, m,0);
     massert(log(double(setOfGoodCenters[bestAlignment].second)) <= log(double(align_total_count)));
-    if (dump_files||(FEWDUMPS&&sent.sentenceNo<1000)||(final&&(ONLYALDUMPS)) )
+    if (dump_files||(FEWDUMPS&&sent.sentenceNo<1000)||(is_final&&(ONLYALDUMPS)) )
       printAlignToFile(es, fs, Elist.getVocabList(), Flist.getVocabList(), of2, (setOfGoodCenters[bestAlignment].first)->getAlignment(), sent.sentenceNo,
                        setOfGoodCenters[bestAlignment].second);
     for(unsigned int i=0; i<setOfGoodCenters.size(); ++i)
@@ -824,7 +824,7 @@ void model3::viterbi_loop_with_tricks_1(Perplexity& perp, Perplexity& viterbiPer
 
   } /* of sentence pair E, F */
   //sHandler1.rewind();
-  if (dump_files||FEWDUMPS||(final&&(ONLYALDUMPS)) )
+  if (dump_files||FEWDUMPS||(is_final&&(ONLYALDUMPS)) )
     of2.close();
   delete of3;
   delete writeNBestErrorsFile;
@@ -839,7 +839,7 @@ void model3::viterbi_loop_with_tricks_1(Perplexity& perp, Perplexity& viterbiPer
 #include "collCounts.cpp"
 #define INSTANTIATE(A,B,C) template \
 void model3::viterbi_loop_with_tricks<A,B,C>(Perplexity& perp, Perplexity& viterbiPerp, sentenceHandler& sHandler1,  \
-					     bool dump_files, const char* alignfile,bool collect_counts, string, bool final,\
+					     bool dump_files, const char* alignfile,bool collect_counts, string, bool is_final,\
 					     B*d4m,C*d5m);
 
 INSTANTIATE(transpair_model3, void, void);