diff options
186 files changed, 296 insertions, 296 deletions
diff --git a/experimental/alignment-enabled/MGIZA/src/AlignTables.h b/experimental/alignment-enabled/MGIZA/src/AlignTables.h index 773b172..28a2dd4 100644 --- a/experimental/alignment-enabled/MGIZA/src/AlignTables.h +++ b/experimental/alignment-enabled/MGIZA/src/AlignTables.h @@ -41,7 +41,7 @@ using __gnu_cxx::hash_map; #else #include <hash_map> #endif -#include <math.h> +#include <cmath> #include <fstream> #include "transpair_model1.h" diff --git a/experimental/alignment-enabled/MGIZA/src/D4Tables.h b/experimental/alignment-enabled/MGIZA/src/D4Tables.h index 9ec3a02..b9b3f5c 100644 --- a/experimental/alignment-enabled/MGIZA/src/D4Tables.h +++ b/experimental/alignment-enabled/MGIZA/src/D4Tables.h @@ -22,7 +22,7 @@ */ #ifndef _d4tables_h_define #define _d4tables_h_define -#include <math.h> +#include <cmath> #include "WordClasses.h" #include "Globals.h" #include "myassert.h" diff --git a/experimental/alignment-enabled/MGIZA/src/D5Tables.h b/experimental/alignment-enabled/MGIZA/src/D5Tables.h index 74693f0..0cfc0c6 100644 --- a/experimental/alignment-enabled/MGIZA/src/D5Tables.h +++ b/experimental/alignment-enabled/MGIZA/src/D5Tables.h @@ -22,7 +22,7 @@ USA. */ #ifndef _d5tables_h_define #define _d5tables_h_define -#include <math.h> +#include <cmath> #include "D4Tables.h" extern float d5modelsmooth_countoffset; diff --git a/experimental/alignment-enabled/MGIZA/src/Dictionary.cpp b/experimental/alignment-enabled/MGIZA/src/Dictionary.cpp index a0d9dc3..b12f9b2 100644 --- a/experimental/alignment-enabled/MGIZA/src/Dictionary.cpp +++ b/experimental/alignment-enabled/MGIZA/src/Dictionary.cpp @@ -29,7 +29,7 @@ USA. */ #include "Dictionary.h" -#include <string.h> +#include <cstring> Dictionary::Dictionary(const char *filename){ if(!strcmp(filename, "")){ diff --git a/experimental/alignment-enabled/MGIZA/src/NTables.h b/experimental/alignment-enabled/MGIZA/src/NTables.h index 90d1b3d..698a470 100644 --- a/experimental/alignment-enabled/MGIZA/src/NTables.h +++ b/experimental/alignment-enabled/MGIZA/src/NTables.h @@ -23,7 +23,7 @@ #define _ntables_h 1 #include "Array2.h" #include "Vector.h" -#include <assert.h> +#include <cassert> #include "defs.h" #include "vocab.h" #include "myassert.h" diff --git a/experimental/alignment-enabled/MGIZA/src/Parameter.h b/experimental/alignment-enabled/MGIZA/src/Parameter.h index 8429fda..9a6239d 100644 --- a/experimental/alignment-enabled/MGIZA/src/Parameter.h +++ b/experimental/alignment-enabled/MGIZA/src/Parameter.h @@ -29,7 +29,7 @@ USA. #include <string> #include "Globals.h" #include <fstream> -#include <string.h> +#include <cstring> inline unsigned int mConvert(const string&s,unsigned int &i) { diff --git a/experimental/alignment-enabled/MGIZA/src/Perplexity.h b/experimental/alignment-enabled/MGIZA/src/Perplexity.h index 45cc84f..6e24cf0 100644 --- a/experimental/alignment-enabled/MGIZA/src/Perplexity.h +++ b/experimental/alignment-enabled/MGIZA/src/Perplexity.h @@ -34,7 +34,7 @@ USA. #ifndef _PERPLEXITY_H #define _PERPLEXITY_H -#include <math.h> +#include <cmath> #include <fstream> #include "Vector.h" #include "defs.h" diff --git a/experimental/alignment-enabled/MGIZA/src/Pointer.h b/experimental/alignment-enabled/MGIZA/src/Pointer.h index 58de60c..fd05688 100644 --- a/experimental/alignment-enabled/MGIZA/src/Pointer.h +++ b/experimental/alignment-enabled/MGIZA/src/Pointer.h @@ -23,7 +23,7 @@ USA. #ifndef HEADER_Pointer_DEFINED #define HEADER_Pointer_DEFINED -#include <assert.h> +#include <cassert> #include <iostream> template<class T> diff --git a/experimental/alignment-enabled/MGIZA/src/SetArray.h b/experimental/alignment-enabled/MGIZA/src/SetArray.h index 9c49239..2a2125f 100644 --- a/experimental/alignment-enabled/MGIZA/src/SetArray.h +++ b/experimental/alignment-enabled/MGIZA/src/SetArray.h @@ -11,8 +11,8 @@ be threadsafe #include <vector> #include "defs.h" #include "vocab.h" -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <pthread.h> #include "syncObj.h" diff --git a/experimental/alignment-enabled/MGIZA/src/TTables.h b/experimental/alignment-enabled/MGIZA/src/TTables.h index eca24c4..a4e92e4 100644 --- a/experimental/alignment-enabled/MGIZA/src/TTables.h +++ b/experimental/alignment-enabled/MGIZA/src/TTables.h @@ -36,7 +36,7 @@ USA. #include "defs.h" #include "vocab.h" -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> diff --git a/experimental/alignment-enabled/MGIZA/src/Vector.h b/experimental/alignment-enabled/MGIZA/src/Vector.h index a48fd3e..5943181 100644 --- a/experimental/alignment-enabled/MGIZA/src/Vector.h +++ b/experimental/alignment-enabled/MGIZA/src/Vector.h @@ -31,7 +31,7 @@ Franz Josef Och (30/07/99) #include <string> #include <utility> #include <functional> -#include <assert.h> +#include <cassert> #ifdef NDEBUG diff --git a/experimental/alignment-enabled/MGIZA/src/alignment.h b/experimental/alignment-enabled/MGIZA/src/alignment.h index 17774c6..03cf028 100644 --- a/experimental/alignment-enabled/MGIZA/src/alignment.h +++ b/experimental/alignment-enabled/MGIZA/src/alignment.h @@ -26,7 +26,7 @@ Franz Josef Och (30/07/99) #ifndef alignment_h_fjo_defined #define alignment_h_fjo_defined #include "Vector.h" -#include <assert.h> +#include <cassert> #include "defs.h" #include "myassert.h" diff --git a/experimental/alignment-enabled/MGIZA/src/defs.h b/experimental/alignment-enabled/MGIZA/src/defs.h index e94addd..5fbc31d 100644 --- a/experimental/alignment-enabled/MGIZA/src/defs.h +++ b/experimental/alignment-enabled/MGIZA/src/defs.h @@ -22,8 +22,8 @@ USA. #ifndef _defs_h #define _defs_h 1 #include <string> -#include <math.h> -#include <limits.h> +#include <cmath> +#include <climits> const int TRANSFER_SIMPLE=1; const int TRANSFER=0; diff --git a/experimental/alignment-enabled/MGIZA/src/file_spec.h b/experimental/alignment-enabled/MGIZA/src/file_spec.h index d61746c..766257f 100644 --- a/experimental/alignment-enabled/MGIZA/src/file_spec.h +++ b/experimental/alignment-enabled/MGIZA/src/file_spec.h @@ -22,10 +22,10 @@ USA. #ifndef FILE_SPEC_H #define FILE_SPEC_H -#include <time.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> +#include <ctime> +#include <cstdlib> +#include <cstring> +#include <cstdio> /* This function returns a string, locally called file_spec. This string is the concatenation of the date and time of execution diff --git a/experimental/alignment-enabled/MGIZA/src/getSentence.cpp b/experimental/alignment-enabled/MGIZA/src/getSentence.cpp index c2adf0b..d2b7268 100644 --- a/experimental/alignment-enabled/MGIZA/src/getSentence.cpp +++ b/experimental/alignment-enabled/MGIZA/src/getSentence.cpp @@ -33,8 +33,8 @@ USA. #include "getSentence.h" #include <iostream> #include <strstream> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <boost/algorithm/string.hpp> #include <vector> #include <set> diff --git a/experimental/alignment-enabled/MGIZA/src/getSentence.h b/experimental/alignment-enabled/MGIZA/src/getSentence.h index c9ae490..d167fa8 100644 --- a/experimental/alignment-enabled/MGIZA/src/getSentence.h +++ b/experimental/alignment-enabled/MGIZA/src/getSentence.h @@ -41,8 +41,8 @@ USA. #include <fstream> #include <string> #include <set> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <pthread.h> #include "Vector.h" #include "defs.h" diff --git a/experimental/alignment-enabled/MGIZA/src/hmm.h b/experimental/alignment-enabled/MGIZA/src/hmm.h index c518144..b50b0be 100644 --- a/experimental/alignment-enabled/MGIZA/src/hmm.h +++ b/experimental/alignment-enabled/MGIZA/src/hmm.h @@ -22,7 +22,7 @@ USA. #ifndef _hmm_h #define _hmm_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> @@ -39,8 +39,8 @@ using __gnu_cxx::hash_map; #include <hash_map> #endif #include <fstream> -#include <math.h> -#include <time.h> +#include <cmath> +#include <ctime> #include "TTables.h" #include "ATables.h" diff --git a/experimental/alignment-enabled/MGIZA/src/logprob.cpp b/experimental/alignment-enabled/MGIZA/src/logprob.cpp index 9035f80..d1e3d52 100644 --- a/experimental/alignment-enabled/MGIZA/src/logprob.cpp +++ b/experimental/alignment-enabled/MGIZA/src/logprob.cpp @@ -25,8 +25,8 @@ USA. // It is assumed that b > 1, something like b = 1.001; #include "logprob.h" -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <iostream> #include <fstream> #include <string> diff --git a/experimental/alignment-enabled/MGIZA/src/logprob.h b/experimental/alignment-enabled/MGIZA/src/logprob.h index 14696ac..6c9bd20 100644 --- a/experimental/alignment-enabled/MGIZA/src/logprob.h +++ b/experimental/alignment-enabled/MGIZA/src/logprob.h @@ -27,7 +27,7 @@ USA. // It is assumed that b > 1, something like b = 1.001 #include <iostream> -#include <math.h> +#include <cmath> #include <algorithm> //#define MAX(A,B) ((A) > (B) ? (A) : (B)) diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblem.cpp b/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblem.cpp index 7318fb6..db2cf8a 100644 --- a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblem.cpp +++ b/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblem.cpp @@ -23,8 +23,8 @@ USA. -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include "KategProblem.h" #include "KategProblemTest.h" diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemKBC.cpp b/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemKBC.cpp index 97c40fc..4bd28f3 100644 --- a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemKBC.cpp +++ b/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemKBC.cpp @@ -24,7 +24,7 @@ USA. -#include <stdlib.h> +#include <cstdlib> #include "KategProblem.h" double rhoLo=0.75; diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemTest.cpp b/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemTest.cpp index 8c76ce5..3084a0b 100644 --- a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemTest.cpp +++ b/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemTest.cpp @@ -32,8 +32,8 @@ USA. #include "RRTOptimization.h" #include "GDAOptimization.h" -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <string> #include <strstream> diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemWBC.cpp b/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemWBC.cpp index 1a0d439..422b4a4 100644 --- a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemWBC.cpp +++ b/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemWBC.cpp @@ -24,7 +24,7 @@ USA. -#include <stdlib.h> +#include <cstdlib> #include "KategProblem.h" static int oneFreqCompareSteigend(const void *p,const void *j) diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/MSBOptimization.cpp b/experimental/alignment-enabled/MGIZA/src/mkcls/MSBOptimization.cpp index 9478826..0cd89bb 100644 --- a/experimental/alignment-enabled/MGIZA/src/mkcls/MSBOptimization.cpp +++ b/experimental/alignment-enabled/MGIZA/src/mkcls/MSBOptimization.cpp @@ -25,7 +25,7 @@ USA. #include "MSBOptimization.h" -#include <stdlib.h> +#include <cstdlib> #include "ProblemTest.h" #ifdef __GNUC__ diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/ProblemTest.cpp b/experimental/alignment-enabled/MGIZA/src/mkcls/ProblemTest.cpp index 40fea7a..675c8cb 100644 --- a/experimental/alignment-enabled/MGIZA/src/mkcls/ProblemTest.cpp +++ b/experimental/alignment-enabled/MGIZA/src/mkcls/ProblemTest.cpp @@ -31,9 +31,9 @@ USA. #include "TAOptimization.h" #include "GDAOptimization.h" #include "MYOptimization.h" -#include <stdio.h> +#include <cstdio> #include "general.h" -#include <stdlib.h> +#include <cstdlib> short ProblemTestVerboseMode=1; ofstream *PrintBestTo=0,*PrintBestTo2=0; diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/SAOptimization.cpp b/experimental/alignment-enabled/MGIZA/src/mkcls/SAOptimization.cpp index 6ae589a..d5ebd26 100644 --- a/experimental/alignment-enabled/MGIZA/src/mkcls/SAOptimization.cpp +++ b/experimental/alignment-enabled/MGIZA/src/mkcls/SAOptimization.cpp @@ -24,7 +24,7 @@ USA. -#include <stdlib.h> +#include <cstdlib> #include <iostream> #include "SAOptimization.h" diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/StatVar.cpp b/experimental/alignment-enabled/MGIZA/src/mkcls/StatVar.cpp index dbd76cd..a4605ea 100644 --- a/experimental/alignment-enabled/MGIZA/src/mkcls/StatVar.cpp +++ b/experimental/alignment-enabled/MGIZA/src/mkcls/StatVar.cpp @@ -25,7 +25,7 @@ USA. #include "StatVar.h" #include <iostream> -#include <stdlib.h> +#include <cstdlib> double compareStatVarQuantil=-1; diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/StatVar.h b/experimental/alignment-enabled/MGIZA/src/mkcls/StatVar.h index bdf1e19..edee026 100644 --- a/experimental/alignment-enabled/MGIZA/src/mkcls/StatVar.h +++ b/experimental/alignment-enabled/MGIZA/src/mkcls/StatVar.h @@ -26,7 +26,7 @@ USA. #ifndef STATVAR_H #define STATVAR_H -#include <stdlib.h> +#include <cstdlib> #include <iostream> #include "Array.h" #include "mystl.h" diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/general.cpp b/experimental/alignment-enabled/MGIZA/src/mkcls/general.cpp index ddd5fe4..810a747 100644 --- a/experimental/alignment-enabled/MGIZA/src/mkcls/general.cpp +++ b/experimental/alignment-enabled/MGIZA/src/mkcls/general.cpp @@ -25,8 +25,8 @@ USA. -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> extern "C" { diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/general.h b/experimental/alignment-enabled/MGIZA/src/mkcls/general.h index 8db48aa..8631002 100644 --- a/experimental/alignment-enabled/MGIZA/src/mkcls/general.h +++ b/experimental/alignment-enabled/MGIZA/src/mkcls/general.h @@ -35,7 +35,7 @@ USA. #ifdef NeXT #include <minmax.h> #endif -#include <string.h> +#include <cstring> diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/mkcls.cpp b/experimental/alignment-enabled/MGIZA/src/mkcls/mkcls.cpp index 90ebfde..326de81 100644 --- a/experimental/alignment-enabled/MGIZA/src/mkcls/mkcls.cpp +++ b/experimental/alignment-enabled/MGIZA/src/mkcls/mkcls.cpp @@ -24,10 +24,10 @@ USA. -#include <stdio.h> +#include <cstdio> #include <iostream> -#include <stdlib.h> -#include <ctype.h> +#include <cstdlib> +#include <cctype> #include "general.h" #include "KategProblem.h" diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/myassert.h b/experimental/alignment-enabled/MGIZA/src/mkcls/myassert.h index da86ffb..0276ba3 100644 --- a/experimental/alignment-enabled/MGIZA/src/mkcls/myassert.h +++ b/experimental/alignment-enabled/MGIZA/src/mkcls/myassert.h @@ -34,7 +34,7 @@ void imyerror(int line,const char *file,const char *expression); #define vassert(expr) do {} while(0) -#include <assert.h> +#include <cassert> #endif diff --git a/experimental/alignment-enabled/MGIZA/src/model1.h b/experimental/alignment-enabled/MGIZA/src/model1.h index cadc1e3..fc4ee88 100644 --- a/experimental/alignment-enabled/MGIZA/src/model1.h +++ b/experimental/alignment-enabled/MGIZA/src/model1.h @@ -22,7 +22,7 @@ USA. #ifndef _model1_h #define _model1_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <strstream> @@ -39,10 +39,10 @@ using __gnu_cxx::hash_map; #else #include <hash_map> #endif -#include <time.h> +#include <ctime> #include <fstream> -#include <math.h> -#include <stdio.h> +#include <cmath> +#include <cstdio> #include "Vector.h" #include "vocab.h" diff --git a/experimental/alignment-enabled/MGIZA/src/model2.h b/experimental/alignment-enabled/MGIZA/src/model2.h index ff8e993..d379f22 100644 --- a/experimental/alignment-enabled/MGIZA/src/model2.h +++ b/experimental/alignment-enabled/MGIZA/src/model2.h @@ -22,7 +22,7 @@ USA. #ifndef _model2_h #define _model2_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> @@ -40,8 +40,8 @@ using __gnu_cxx::hash_map; #endif #include <fstream> -#include <math.h> -#include <time.h> +#include <cmath> +#include <ctime> #include "TTables.h" #include "ATables.h" diff --git a/experimental/alignment-enabled/MGIZA/src/model3.h b/experimental/alignment-enabled/MGIZA/src/model3.h index c3e7d28..33e7dd1 100644 --- a/experimental/alignment-enabled/MGIZA/src/model3.h +++ b/experimental/alignment-enabled/MGIZA/src/model3.h @@ -21,7 +21,7 @@ */ #ifndef _model3_h #define _model3_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> #include <functional> @@ -36,9 +36,9 @@ using __gnu_cxx::hash_map; #include <hash_map> #endif -#include <time.h> +#include <ctime> #include <fstream> -#include <math.h> +#include <cmath> #include "MoveSwapMatrix.h" #include "TTables.h" #include "ATables.h" diff --git a/experimental/alignment-enabled/MGIZA/src/mymath.h b/experimental/alignment-enabled/MGIZA/src/mymath.h index f8ad926..47c5bfb 100644 --- a/experimental/alignment-enabled/MGIZA/src/mymath.h +++ b/experimental/alignment-enabled/MGIZA/src/mymath.h @@ -5,5 +5,5 @@ #ifndef HEADER_MYMATH_DEFINED #define HEADER_MYMATH_DEFINED inline double mfabs(double x){return (x<0)?(-x):x;} -#include <math.h> +#include <cmath> #endif diff --git a/experimental/alignment-enabled/MGIZA/src/plain2snt.cpp b/experimental/alignment-enabled/MGIZA/src/plain2snt.cpp index 6e8f0b7..8919cca 100644 --- a/experimental/alignment-enabled/MGIZA/src/plain2snt.cpp +++ b/experimental/alignment-enabled/MGIZA/src/plain2snt.cpp @@ -4,8 +4,8 @@ #include <fstream> #include <map> #include <vector> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> using namespace std; diff --git a/experimental/alignment-enabled/MGIZA/src/reports.cpp b/experimental/alignment-enabled/MGIZA/src/reports.cpp index 4d5873a..3ce3e80 100644 --- a/experimental/alignment-enabled/MGIZA/src/reports.cpp +++ b/experimental/alignment-enabled/MGIZA/src/reports.cpp @@ -20,7 +20,7 @@ USA. */ #include <strstream> -#include <time.h> +#include <ctime> #include <set> #include "defs.h" #include "vocab.h" diff --git a/experimental/alignment-enabled/MGIZA/src/snt2cooc.cpp b/experimental/alignment-enabled/MGIZA/src/snt2cooc.cpp index 0eb2aaf..48328dc 100644 --- a/experimental/alignment-enabled/MGIZA/src/snt2cooc.cpp +++ b/experimental/alignment-enabled/MGIZA/src/snt2cooc.cpp @@ -5,8 +5,8 @@ #include <map> #include <vector> #include <set> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> using namespace std; diff --git a/experimental/alignment-enabled/MGIZA/src/snt2plain.cpp b/experimental/alignment-enabled/MGIZA/src/snt2plain.cpp index 23dacbe..9950050 100644 --- a/experimental/alignment-enabled/MGIZA/src/snt2plain.cpp +++ b/experimental/alignment-enabled/MGIZA/src/snt2plain.cpp @@ -4,8 +4,8 @@ #include <fstream> #include <map> #include <vector> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> using namespace std; diff --git a/experimental/alignment-enabled/MGIZA/src/syncObj.h b/experimental/alignment-enabled/MGIZA/src/syncObj.h index 1c1b31d..8deda8f 100644 --- a/experimental/alignment-enabled/MGIZA/src/syncObj.h +++ b/experimental/alignment-enabled/MGIZA/src/syncObj.h @@ -1,8 +1,8 @@ #ifndef __SYNC_OBJ_H__ #define __SYNC_OBJ_H__ -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <pthread.h> #include <iostream> diff --git a/experimental/alignment-enabled/MGIZA/src/transpair_model1.h b/experimental/alignment-enabled/MGIZA/src/transpair_model1.h index 00d7875..dd1425d 100644 --- a/experimental/alignment-enabled/MGIZA/src/transpair_model1.h +++ b/experimental/alignment-enabled/MGIZA/src/transpair_model1.h @@ -31,7 +31,7 @@ USA. #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include <algorithm> #include "Array2.h" #include "mystl.h" diff --git a/experimental/alignment-enabled/MGIZA/src/transpair_model2.h b/experimental/alignment-enabled/MGIZA/src/transpair_model2.h index f3d53e3..751ce52 100644 --- a/experimental/alignment-enabled/MGIZA/src/transpair_model2.h +++ b/experimental/alignment-enabled/MGIZA/src/transpair_model2.h @@ -29,7 +29,7 @@ USA. #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include "transpair_model1.h" diff --git a/experimental/alignment-enabled/MGIZA/src/transpair_model3.h b/experimental/alignment-enabled/MGIZA/src/transpair_model3.h index 5fa43db..9c07fd9 100644 --- a/experimental/alignment-enabled/MGIZA/src/transpair_model3.h +++ b/experimental/alignment-enabled/MGIZA/src/transpair_model3.h @@ -34,7 +34,7 @@ Franz Josef Och (30/07/99) #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include "transpair_model2.h" extern double factorial(int n); diff --git a/experimental/alignment-enabled/MGIZA/src/transpair_modelhmm.h b/experimental/alignment-enabled/MGIZA/src/transpair_modelhmm.h index 2b38913..d836ad4 100644 --- a/experimental/alignment-enabled/MGIZA/src/transpair_modelhmm.h +++ b/experimental/alignment-enabled/MGIZA/src/transpair_modelhmm.h @@ -29,7 +29,7 @@ USA. #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include "transpair_model2.h" #include "ForwardBackward.h" #include "hmm.h" diff --git a/experimental/bidirectional/src/AlignTables.h b/experimental/bidirectional/src/AlignTables.h index 773b172..28a2dd4 100644 --- a/experimental/bidirectional/src/AlignTables.h +++ b/experimental/bidirectional/src/AlignTables.h @@ -41,7 +41,7 @@ using __gnu_cxx::hash_map; #else #include <hash_map> #endif -#include <math.h> +#include <cmath> #include <fstream> #include "transpair_model1.h" diff --git a/experimental/bidirectional/src/D4Tables.h b/experimental/bidirectional/src/D4Tables.h index 9ec3a02..b9b3f5c 100644 --- a/experimental/bidirectional/src/D4Tables.h +++ b/experimental/bidirectional/src/D4Tables.h @@ -22,7 +22,7 @@ */ #ifndef _d4tables_h_define #define _d4tables_h_define -#include <math.h> +#include <cmath> #include "WordClasses.h" #include "Globals.h" #include "myassert.h" diff --git a/experimental/bidirectional/src/D5Tables.h b/experimental/bidirectional/src/D5Tables.h index 74693f0..0cfc0c6 100644 --- a/experimental/bidirectional/src/D5Tables.h +++ b/experimental/bidirectional/src/D5Tables.h @@ -22,7 +22,7 @@ USA. */ #ifndef _d5tables_h_define #define _d5tables_h_define -#include <math.h> +#include <cmath> #include "D4Tables.h" extern float d5modelsmooth_countoffset; diff --git a/experimental/bidirectional/src/Dictionary.cpp b/experimental/bidirectional/src/Dictionary.cpp index a0d9dc3..b12f9b2 100644 --- a/experimental/bidirectional/src/Dictionary.cpp +++ b/experimental/bidirectional/src/Dictionary.cpp @@ -29,7 +29,7 @@ USA. */ #include "Dictionary.h" -#include <string.h> +#include <cstring> Dictionary::Dictionary(const char *filename){ if(!strcmp(filename, "")){ diff --git a/experimental/bidirectional/src/NTables.h b/experimental/bidirectional/src/NTables.h index 90d1b3d..698a470 100644 --- a/experimental/bidirectional/src/NTables.h +++ b/experimental/bidirectional/src/NTables.h @@ -23,7 +23,7 @@ #define _ntables_h 1 #include "Array2.h" #include "Vector.h" -#include <assert.h> +#include <cassert> #include "defs.h" #include "vocab.h" #include "myassert.h" diff --git a/experimental/bidirectional/src/Parameter.h b/experimental/bidirectional/src/Parameter.h index 8429fda..9a6239d 100644 --- a/experimental/bidirectional/src/Parameter.h +++ b/experimental/bidirectional/src/Parameter.h @@ -29,7 +29,7 @@ USA. #include <string> #include "Globals.h" #include <fstream> -#include <string.h> +#include <cstring> inline unsigned int mConvert(const string&s,unsigned int &i) { diff --git a/experimental/bidirectional/src/Perplexity.h b/experimental/bidirectional/src/Perplexity.h index 45cc84f..6e24cf0 100644 --- a/experimental/bidirectional/src/Perplexity.h +++ b/experimental/bidirectional/src/Perplexity.h @@ -34,7 +34,7 @@ USA. #ifndef _PERPLEXITY_H #define _PERPLEXITY_H -#include <math.h> +#include <cmath> #include <fstream> #include "Vector.h" #include "defs.h" diff --git a/experimental/bidirectional/src/Pointer.h b/experimental/bidirectional/src/Pointer.h index 58de60c..fd05688 100644 --- a/experimental/bidirectional/src/Pointer.h +++ b/experimental/bidirectional/src/Pointer.h @@ -23,7 +23,7 @@ USA. #ifndef HEADER_Pointer_DEFINED #define HEADER_Pointer_DEFINED -#include <assert.h> +#include <cassert> #include <iostream> template<class T> diff --git a/experimental/bidirectional/src/SetArray.h b/experimental/bidirectional/src/SetArray.h index 9c49239..2a2125f 100644 --- a/experimental/bidirectional/src/SetArray.h +++ b/experimental/bidirectional/src/SetArray.h @@ -11,8 +11,8 @@ be threadsafe #include <vector> #include "defs.h" #include "vocab.h" -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <pthread.h> #include "syncObj.h" diff --git a/experimental/bidirectional/src/TTables.h b/experimental/bidirectional/src/TTables.h index 2120ef6..dd48299 100644 --- a/experimental/bidirectional/src/TTables.h +++ b/experimental/bidirectional/src/TTables.h @@ -36,7 +36,7 @@ USA. #include "defs.h" #include "vocab.h" -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> diff --git a/experimental/bidirectional/src/Vector.h b/experimental/bidirectional/src/Vector.h index a48fd3e..5943181 100644 --- a/experimental/bidirectional/src/Vector.h +++ b/experimental/bidirectional/src/Vector.h @@ -31,7 +31,7 @@ Franz Josef Och (30/07/99) #include <string> #include <utility> #include <functional> -#include <assert.h> +#include <cassert> #ifdef NDEBUG diff --git a/experimental/bidirectional/src/alignment.h b/experimental/bidirectional/src/alignment.h index 17774c6..03cf028 100644 --- a/experimental/bidirectional/src/alignment.h +++ b/experimental/bidirectional/src/alignment.h @@ -26,7 +26,7 @@ Franz Josef Och (30/07/99) #ifndef alignment_h_fjo_defined #define alignment_h_fjo_defined #include "Vector.h" -#include <assert.h> +#include <cassert> #include "defs.h" #include "myassert.h" diff --git a/experimental/bidirectional/src/defs.h b/experimental/bidirectional/src/defs.h index e94addd..5fbc31d 100644 --- a/experimental/bidirectional/src/defs.h +++ b/experimental/bidirectional/src/defs.h @@ -22,8 +22,8 @@ USA. #ifndef _defs_h #define _defs_h 1 #include <string> -#include <math.h> -#include <limits.h> +#include <cmath> +#include <climits> const int TRANSFER_SIMPLE=1; const int TRANSFER=0; diff --git a/experimental/bidirectional/src/file_spec.h b/experimental/bidirectional/src/file_spec.h index d61746c..766257f 100644 --- a/experimental/bidirectional/src/file_spec.h +++ b/experimental/bidirectional/src/file_spec.h @@ -22,10 +22,10 @@ USA. #ifndef FILE_SPEC_H #define FILE_SPEC_H -#include <time.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> +#include <ctime> +#include <cstdlib> +#include <cstring> +#include <cstdio> /* This function returns a string, locally called file_spec. This string is the concatenation of the date and time of execution diff --git a/experimental/bidirectional/src/getSentence.cpp b/experimental/bidirectional/src/getSentence.cpp index cd86808..374f88e 100644 --- a/experimental/bidirectional/src/getSentence.cpp +++ b/experimental/bidirectional/src/getSentence.cpp @@ -33,8 +33,8 @@ USA. #include "getSentence.h" #include <iostream> #include <strstream> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <boost/algorithm/string.hpp> #include <vector> #include <set> diff --git a/experimental/bidirectional/src/getSentence.h b/experimental/bidirectional/src/getSentence.h index 424c49e..1367178 100644 --- a/experimental/bidirectional/src/getSentence.h +++ b/experimental/bidirectional/src/getSentence.h @@ -41,8 +41,8 @@ USA. #include <fstream> #include <string> #include <set> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <pthread.h> #include "Vector.h" #include "defs.h" diff --git a/experimental/bidirectional/src/hmm.h b/experimental/bidirectional/src/hmm.h index c518144..b50b0be 100644 --- a/experimental/bidirectional/src/hmm.h +++ b/experimental/bidirectional/src/hmm.h @@ -22,7 +22,7 @@ USA. #ifndef _hmm_h #define _hmm_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> @@ -39,8 +39,8 @@ using __gnu_cxx::hash_map; #include <hash_map> #endif #include <fstream> -#include <math.h> -#include <time.h> +#include <cmath> +#include <ctime> #include "TTables.h" #include "ATables.h" diff --git a/experimental/bidirectional/src/logprob.cpp b/experimental/bidirectional/src/logprob.cpp index 9035f80..d1e3d52 100644 --- a/experimental/bidirectional/src/logprob.cpp +++ b/experimental/bidirectional/src/logprob.cpp @@ -25,8 +25,8 @@ USA. // It is assumed that b > 1, something like b = 1.001; #include "logprob.h" -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <iostream> #include <fstream> #include <string> diff --git a/experimental/bidirectional/src/logprob.h b/experimental/bidirectional/src/logprob.h index 14696ac..6c9bd20 100644 --- a/experimental/bidirectional/src/logprob.h +++ b/experimental/bidirectional/src/logprob.h @@ -27,7 +27,7 @@ USA. // It is assumed that b > 1, something like b = 1.001 #include <iostream> -#include <math.h> +#include <cmath> #include <algorithm> //#define MAX(A,B) ((A) > (B) ? (A) : (B)) diff --git a/experimental/bidirectional/src/mkcls/KategProblem.cpp b/experimental/bidirectional/src/mkcls/KategProblem.cpp index 7318fb6..db2cf8a 100644 --- a/experimental/bidirectional/src/mkcls/KategProblem.cpp +++ b/experimental/bidirectional/src/mkcls/KategProblem.cpp @@ -23,8 +23,8 @@ USA. -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include "KategProblem.h" #include "KategProblemTest.h" diff --git a/experimental/bidirectional/src/mkcls/KategProblem.h b/experimental/bidirectional/src/mkcls/KategProblem.h index e5a5a46..f040b85 100644 --- a/experimental/bidirectional/src/mkcls/KategProblem.h +++ b/experimental/bidirectional/src/mkcls/KategProblem.h @@ -30,7 +30,7 @@ USA. #define KATEG_OPT_H #include <string> -#include <stdlib.h> +#include <cstdlib> #include "Problem.h" extern double rhoLo; diff --git a/experimental/bidirectional/src/mkcls/KategProblemKBC.cpp b/experimental/bidirectional/src/mkcls/KategProblemKBC.cpp index 97c40fc..4bd28f3 100644 --- a/experimental/bidirectional/src/mkcls/KategProblemKBC.cpp +++ b/experimental/bidirectional/src/mkcls/KategProblemKBC.cpp @@ -24,7 +24,7 @@ USA. -#include <stdlib.h> +#include <cstdlib> #include "KategProblem.h" double rhoLo=0.75; diff --git a/experimental/bidirectional/src/mkcls/KategProblemTest.cpp b/experimental/bidirectional/src/mkcls/KategProblemTest.cpp index 8c76ce5..3084a0b 100644 --- a/experimental/bidirectional/src/mkcls/KategProblemTest.cpp +++ b/experimental/bidirectional/src/mkcls/KategProblemTest.cpp @@ -32,8 +32,8 @@ USA. #include "RRTOptimization.h" #include "GDAOptimization.h" -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <string> #include <strstream> diff --git a/experimental/bidirectional/src/mkcls/KategProblemWBC.cpp b/experimental/bidirectional/src/mkcls/KategProblemWBC.cpp index 1a0d439..422b4a4 100644 --- a/experimental/bidirectional/src/mkcls/KategProblemWBC.cpp +++ b/experimental/bidirectional/src/mkcls/KategProblemWBC.cpp @@ -24,7 +24,7 @@ USA. -#include <stdlib.h> +#include <cstdlib> #include "KategProblem.h" static int oneFreqCompareSteigend(const void *p,const void *j) diff --git a/experimental/bidirectional/src/mkcls/MSBOptimization.cpp b/experimental/bidirectional/src/mkcls/MSBOptimization.cpp index 9478826..0cd89bb 100644 --- a/experimental/bidirectional/src/mkcls/MSBOptimization.cpp +++ b/experimental/bidirectional/src/mkcls/MSBOptimization.cpp @@ -25,7 +25,7 @@ USA. #include "MSBOptimization.h" -#include <stdlib.h> +#include <cstdlib> #include "ProblemTest.h" #ifdef __GNUC__ diff --git a/experimental/bidirectional/src/mkcls/ProblemTest.cpp b/experimental/bidirectional/src/mkcls/ProblemTest.cpp index 40fea7a..675c8cb 100644 --- a/experimental/bidirectional/src/mkcls/ProblemTest.cpp +++ b/experimental/bidirectional/src/mkcls/ProblemTest.cpp @@ -31,9 +31,9 @@ USA. #include "TAOptimization.h" #include "GDAOptimization.h" #include "MYOptimization.h" -#include <stdio.h> +#include <cstdio> #include "general.h" -#include <stdlib.h> +#include <cstdlib> short ProblemTestVerboseMode=1; ofstream *PrintBestTo=0,*PrintBestTo2=0; diff --git a/experimental/bidirectional/src/mkcls/SAOptimization.cpp b/experimental/bidirectional/src/mkcls/SAOptimization.cpp index 6ae589a..d5ebd26 100644 --- a/experimental/bidirectional/src/mkcls/SAOptimization.cpp +++ b/experimental/bidirectional/src/mkcls/SAOptimization.cpp @@ -24,7 +24,7 @@ USA. -#include <stdlib.h> +#include <cstdlib> #include <iostream> #include "SAOptimization.h" diff --git a/experimental/bidirectional/src/mkcls/StatVar.cpp b/experimental/bidirectional/src/mkcls/StatVar.cpp index dbd76cd..a4605ea 100644 --- a/experimental/bidirectional/src/mkcls/StatVar.cpp +++ b/experimental/bidirectional/src/mkcls/StatVar.cpp @@ -25,7 +25,7 @@ USA. #include "StatVar.h" #include <iostream> -#include <stdlib.h> +#include <cstdlib> double compareStatVarQuantil=-1; diff --git a/experimental/bidirectional/src/mkcls/StatVar.h b/experimental/bidirectional/src/mkcls/StatVar.h index bdf1e19..edee026 100644 --- a/experimental/bidirectional/src/mkcls/StatVar.h +++ b/experimental/bidirectional/src/mkcls/StatVar.h @@ -26,7 +26,7 @@ USA. #ifndef STATVAR_H #define STATVAR_H -#include <stdlib.h> +#include <cstdlib> #include <iostream> #include "Array.h" #include "mystl.h" diff --git a/experimental/bidirectional/src/mkcls/general.cpp b/experimental/bidirectional/src/mkcls/general.cpp index ddd5fe4..810a747 100644 --- a/experimental/bidirectional/src/mkcls/general.cpp +++ b/experimental/bidirectional/src/mkcls/general.cpp @@ -25,8 +25,8 @@ USA. -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> extern "C" { diff --git a/experimental/bidirectional/src/mkcls/general.h b/experimental/bidirectional/src/mkcls/general.h index 8db48aa..8631002 100644 --- a/experimental/bidirectional/src/mkcls/general.h +++ b/experimental/bidirectional/src/mkcls/general.h @@ -35,7 +35,7 @@ USA. #ifdef NeXT #include <minmax.h> #endif -#include <string.h> +#include <cstring> diff --git a/experimental/bidirectional/src/mkcls/mkcls.cpp b/experimental/bidirectional/src/mkcls/mkcls.cpp index 90ebfde..326de81 100644 --- a/experimental/bidirectional/src/mkcls/mkcls.cpp +++ b/experimental/bidirectional/src/mkcls/mkcls.cpp @@ -24,10 +24,10 @@ USA. -#include <stdio.h> +#include <cstdio> #include <iostream> -#include <stdlib.h> -#include <ctype.h> +#include <cstdlib> +#include <cctype> #include "general.h" #include "KategProblem.h" diff --git a/experimental/bidirectional/src/mkcls/myassert.h b/experimental/bidirectional/src/mkcls/myassert.h index da86ffb..0276ba3 100644 --- a/experimental/bidirectional/src/mkcls/myassert.h +++ b/experimental/bidirectional/src/mkcls/myassert.h @@ -34,7 +34,7 @@ void imyerror(int line,const char *file,const char *expression); #define vassert(expr) do {} while(0) -#include <assert.h> +#include <cassert> #endif diff --git a/experimental/bidirectional/src/model1.h b/experimental/bidirectional/src/model1.h index cadc1e3..fc4ee88 100644 --- a/experimental/bidirectional/src/model1.h +++ b/experimental/bidirectional/src/model1.h @@ -22,7 +22,7 @@ USA. #ifndef _model1_h #define _model1_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <strstream> @@ -39,10 +39,10 @@ using __gnu_cxx::hash_map; #else #include <hash_map> #endif -#include <time.h> +#include <ctime> #include <fstream> -#include <math.h> -#include <stdio.h> +#include <cmath> +#include <cstdio> #include "Vector.h" #include "vocab.h" diff --git a/experimental/bidirectional/src/model2.h b/experimental/bidirectional/src/model2.h index ff8e993..d379f22 100644 --- a/experimental/bidirectional/src/model2.h +++ b/experimental/bidirectional/src/model2.h @@ -22,7 +22,7 @@ USA. #ifndef _model2_h #define _model2_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> @@ -40,8 +40,8 @@ using __gnu_cxx::hash_map; #endif #include <fstream> -#include <math.h> -#include <time.h> +#include <cmath> +#include <ctime> #include "TTables.h" #include "ATables.h" diff --git a/experimental/bidirectional/src/model3.h b/experimental/bidirectional/src/model3.h index c3e7d28..33e7dd1 100644 --- a/experimental/bidirectional/src/model3.h +++ b/experimental/bidirectional/src/model3.h @@ -21,7 +21,7 @@ */ #ifndef _model3_h #define _model3_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> #include <functional> @@ -36,9 +36,9 @@ using __gnu_cxx::hash_map; #include <hash_map> #endif -#include <time.h> +#include <ctime> #include <fstream> -#include <math.h> +#include <cmath> #include "MoveSwapMatrix.h" #include "TTables.h" #include "ATables.h" diff --git a/experimental/bidirectional/src/mymath.h b/experimental/bidirectional/src/mymath.h index f8ad926..47c5bfb 100644 --- a/experimental/bidirectional/src/mymath.h +++ b/experimental/bidirectional/src/mymath.h @@ -5,5 +5,5 @@ #ifndef HEADER_MYMATH_DEFINED #define HEADER_MYMATH_DEFINED inline double mfabs(double x){return (x<0)?(-x):x;} -#include <math.h> +#include <cmath> #endif diff --git a/experimental/bidirectional/src/plain2snt.cpp b/experimental/bidirectional/src/plain2snt.cpp index 6e8f0b7..8919cca 100644 --- a/experimental/bidirectional/src/plain2snt.cpp +++ b/experimental/bidirectional/src/plain2snt.cpp @@ -4,8 +4,8 @@ #include <fstream> #include <map> #include <vector> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> using namespace std; diff --git a/experimental/bidirectional/src/reports.cpp b/experimental/bidirectional/src/reports.cpp index 4d5873a..3ce3e80 100644 --- a/experimental/bidirectional/src/reports.cpp +++ b/experimental/bidirectional/src/reports.cpp @@ -20,7 +20,7 @@ USA. */ #include <strstream> -#include <time.h> +#include <ctime> #include <set> #include "defs.h" #include "vocab.h" diff --git a/experimental/bidirectional/src/snt2cooc.cpp b/experimental/bidirectional/src/snt2cooc.cpp index 0eb2aaf..48328dc 100644 --- a/experimental/bidirectional/src/snt2cooc.cpp +++ b/experimental/bidirectional/src/snt2cooc.cpp @@ -5,8 +5,8 @@ #include <map> #include <vector> #include <set> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> using namespace std; diff --git a/experimental/bidirectional/src/snt2plain.cpp b/experimental/bidirectional/src/snt2plain.cpp index 23dacbe..9950050 100644 --- a/experimental/bidirectional/src/snt2plain.cpp +++ b/experimental/bidirectional/src/snt2plain.cpp @@ -4,8 +4,8 @@ #include <fstream> #include <map> #include <vector> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> using namespace std; diff --git a/experimental/bidirectional/src/syncObj.h b/experimental/bidirectional/src/syncObj.h index 1c1b31d..8deda8f 100644 --- a/experimental/bidirectional/src/syncObj.h +++ b/experimental/bidirectional/src/syncObj.h @@ -1,8 +1,8 @@ #ifndef __SYNC_OBJ_H__ #define __SYNC_OBJ_H__ -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <pthread.h> #include <iostream> diff --git a/experimental/bidirectional/src/transpair_model1.h b/experimental/bidirectional/src/transpair_model1.h index 00d7875..dd1425d 100644 --- a/experimental/bidirectional/src/transpair_model1.h +++ b/experimental/bidirectional/src/transpair_model1.h @@ -31,7 +31,7 @@ USA. #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include <algorithm> #include "Array2.h" #include "mystl.h" diff --git a/experimental/bidirectional/src/transpair_model2.h b/experimental/bidirectional/src/transpair_model2.h index f3d53e3..751ce52 100644 --- a/experimental/bidirectional/src/transpair_model2.h +++ b/experimental/bidirectional/src/transpair_model2.h @@ -29,7 +29,7 @@ USA. #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include "transpair_model1.h" diff --git a/experimental/bidirectional/src/transpair_model3.h b/experimental/bidirectional/src/transpair_model3.h index 5fa43db..9c07fd9 100644 --- a/experimental/bidirectional/src/transpair_model3.h +++ b/experimental/bidirectional/src/transpair_model3.h @@ -34,7 +34,7 @@ Franz Josef Och (30/07/99) #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include "transpair_model2.h" extern double factorial(int n); diff --git a/experimental/bidirectional/src/transpair_modelhmm.h b/experimental/bidirectional/src/transpair_modelhmm.h index 2b38913..d836ad4 100644 --- a/experimental/bidirectional/src/transpair_modelhmm.h +++ b/experimental/bidirectional/src/transpair_modelhmm.h @@ -29,7 +29,7 @@ USA. #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include "transpair_model2.h" #include "ForwardBackward.h" #include "hmm.h" diff --git a/experimental/dual-model/MGIZA/src/AlignTables.h b/experimental/dual-model/MGIZA/src/AlignTables.h index 773b172..28a2dd4 100644 --- a/experimental/dual-model/MGIZA/src/AlignTables.h +++ b/experimental/dual-model/MGIZA/src/AlignTables.h @@ -41,7 +41,7 @@ using __gnu_cxx::hash_map; #else #include <hash_map> #endif -#include <math.h> +#include <cmath> #include <fstream> #include "transpair_model1.h" diff --git a/experimental/dual-model/MGIZA/src/D4Tables.h b/experimental/dual-model/MGIZA/src/D4Tables.h index 9ec3a02..b9b3f5c 100644 --- a/experimental/dual-model/MGIZA/src/D4Tables.h +++ b/experimental/dual-model/MGIZA/src/D4Tables.h @@ -22,7 +22,7 @@ */ #ifndef _d4tables_h_define #define _d4tables_h_define -#include <math.h> +#include <cmath> #include "WordClasses.h" #include "Globals.h" #include "myassert.h" diff --git a/experimental/dual-model/MGIZA/src/D5Tables.h b/experimental/dual-model/MGIZA/src/D5Tables.h index 74693f0..0cfc0c6 100644 --- a/experimental/dual-model/MGIZA/src/D5Tables.h +++ b/experimental/dual-model/MGIZA/src/D5Tables.h @@ -22,7 +22,7 @@ USA. */ #ifndef _d5tables_h_define #define _d5tables_h_define -#include <math.h> +#include <cmath> #include "D4Tables.h" extern float d5modelsmooth_countoffset; diff --git a/experimental/dual-model/MGIZA/src/Dictionary.cpp b/experimental/dual-model/MGIZA/src/Dictionary.cpp index a0d9dc3..b12f9b2 100644 --- a/experimental/dual-model/MGIZA/src/Dictionary.cpp +++ b/experimental/dual-model/MGIZA/src/Dictionary.cpp @@ -29,7 +29,7 @@ USA. */ #include "Dictionary.h" -#include <string.h> +#include <cstring> Dictionary::Dictionary(const char *filename){ if(!strcmp(filename, "")){ diff --git a/experimental/dual-model/MGIZA/src/NTables.h b/experimental/dual-model/MGIZA/src/NTables.h index 90d1b3d..698a470 100644 --- a/experimental/dual-model/MGIZA/src/NTables.h +++ b/experimental/dual-model/MGIZA/src/NTables.h @@ -23,7 +23,7 @@ #define _ntables_h 1 #include "Array2.h" #include "Vector.h" -#include <assert.h> +#include <cassert> #include "defs.h" #include "vocab.h" #include "myassert.h" diff --git a/experimental/dual-model/MGIZA/src/Parameter.h b/experimental/dual-model/MGIZA/src/Parameter.h index 8429fda..9a6239d 100644 --- a/experimental/dual-model/MGIZA/src/Parameter.h +++ b/experimental/dual-model/MGIZA/src/Parameter.h @@ -29,7 +29,7 @@ USA. #include <string> #include "Globals.h" #include <fstream> -#include <string.h> +#include <cstring> inline unsigned int mConvert(const string&s,unsigned int &i) { diff --git a/experimental/dual-model/MGIZA/src/Perplexity.h b/experimental/dual-model/MGIZA/src/Perplexity.h index 45cc84f..6e24cf0 100644 --- a/experimental/dual-model/MGIZA/src/Perplexity.h +++ b/experimental/dual-model/MGIZA/src/Perplexity.h @@ -34,7 +34,7 @@ USA. #ifndef _PERPLEXITY_H #define _PERPLEXITY_H -#include <math.h> +#include <cmath> #include <fstream> #include "Vector.h" #include "defs.h" diff --git a/experimental/dual-model/MGIZA/src/Pointer.h b/experimental/dual-model/MGIZA/src/Pointer.h index 58de60c..fd05688 100644 --- a/experimental/dual-model/MGIZA/src/Pointer.h +++ b/experimental/dual-model/MGIZA/src/Pointer.h @@ -23,7 +23,7 @@ USA. #ifndef HEADER_Pointer_DEFINED #define HEADER_Pointer_DEFINED -#include <assert.h> +#include <cassert> #include <iostream> template<class T> diff --git a/experimental/dual-model/MGIZA/src/SetArray.h b/experimental/dual-model/MGIZA/src/SetArray.h index 9c49239..2a2125f 100644 --- a/experimental/dual-model/MGIZA/src/SetArray.h +++ b/experimental/dual-model/MGIZA/src/SetArray.h @@ -11,8 +11,8 @@ be threadsafe #include <vector> #include "defs.h" #include "vocab.h" -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <pthread.h> #include "syncObj.h" diff --git a/experimental/dual-model/MGIZA/src/TTables.h b/experimental/dual-model/MGIZA/src/TTables.h index 5a52a21..c00602f 100644 --- a/experimental/dual-model/MGIZA/src/TTables.h +++ b/experimental/dual-model/MGIZA/src/TTables.h @@ -36,7 +36,7 @@ USA. #include "defs.h" #include "vocab.h" -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> diff --git a/experimental/dual-model/MGIZA/src/Vector.h b/experimental/dual-model/MGIZA/src/Vector.h index a48fd3e..5943181 100644 --- a/experimental/dual-model/MGIZA/src/Vector.h +++ b/experimental/dual-model/MGIZA/src/Vector.h @@ -31,7 +31,7 @@ Franz Josef Och (30/07/99) #include <string> #include <utility> #include <functional> -#include <assert.h> +#include <cassert> #ifdef NDEBUG diff --git a/experimental/dual-model/MGIZA/src/alignment.h b/experimental/dual-model/MGIZA/src/alignment.h index 17774c6..03cf028 100644 --- a/experimental/dual-model/MGIZA/src/alignment.h +++ b/experimental/dual-model/MGIZA/src/alignment.h @@ -26,7 +26,7 @@ Franz Josef Och (30/07/99) #ifndef alignment_h_fjo_defined #define alignment_h_fjo_defined #include "Vector.h" -#include <assert.h> +#include <cassert> #include "defs.h" #include "myassert.h" diff --git a/experimental/dual-model/MGIZA/src/defs.h b/experimental/dual-model/MGIZA/src/defs.h index e94addd..5fbc31d 100644 --- a/experimental/dual-model/MGIZA/src/defs.h +++ b/experimental/dual-model/MGIZA/src/defs.h @@ -22,8 +22,8 @@ USA. #ifndef _defs_h #define _defs_h 1 #include <string> -#include <math.h> -#include <limits.h> +#include <cmath> +#include <climits> const int TRANSFER_SIMPLE=1; const int TRANSFER=0; diff --git a/experimental/dual-model/MGIZA/src/file_spec.h b/experimental/dual-model/MGIZA/src/file_spec.h index d61746c..766257f 100644 --- a/experimental/dual-model/MGIZA/src/file_spec.h +++ b/experimental/dual-model/MGIZA/src/file_spec.h @@ -22,10 +22,10 @@ USA. #ifndef FILE_SPEC_H #define FILE_SPEC_H -#include <time.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> +#include <ctime> +#include <cstdlib> +#include <cstring> +#include <cstdio> /* This function returns a string, locally called file_spec. This string is the concatenation of the date and time of execution diff --git a/experimental/dual-model/MGIZA/src/getSentence.cpp b/experimental/dual-model/MGIZA/src/getSentence.cpp index c2adf0b..d2b7268 100644 --- a/experimental/dual-model/MGIZA/src/getSentence.cpp +++ b/experimental/dual-model/MGIZA/src/getSentence.cpp @@ -33,8 +33,8 @@ USA. #include "getSentence.h" #include <iostream> #include <strstream> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <boost/algorithm/string.hpp> #include <vector> #include <set> diff --git a/experimental/dual-model/MGIZA/src/getSentence.h b/experimental/dual-model/MGIZA/src/getSentence.h index c9ae490..d167fa8 100644 --- a/experimental/dual-model/MGIZA/src/getSentence.h +++ b/experimental/dual-model/MGIZA/src/getSentence.h @@ -41,8 +41,8 @@ USA. #include <fstream> #include <string> #include <set> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <pthread.h> #include "Vector.h" #include "defs.h" diff --git a/experimental/dual-model/MGIZA/src/hmm.h b/experimental/dual-model/MGIZA/src/hmm.h index c518144..b50b0be 100644 --- a/experimental/dual-model/MGIZA/src/hmm.h +++ b/experimental/dual-model/MGIZA/src/hmm.h @@ -22,7 +22,7 @@ USA. #ifndef _hmm_h #define _hmm_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> @@ -39,8 +39,8 @@ using __gnu_cxx::hash_map; #include <hash_map> #endif #include <fstream> -#include <math.h> -#include <time.h> +#include <cmath> +#include <ctime> #include "TTables.h" #include "ATables.h" diff --git a/experimental/dual-model/MGIZA/src/logprob.cpp b/experimental/dual-model/MGIZA/src/logprob.cpp index 9035f80..d1e3d52 100644 --- a/experimental/dual-model/MGIZA/src/logprob.cpp +++ b/experimental/dual-model/MGIZA/src/logprob.cpp @@ -25,8 +25,8 @@ USA. // It is assumed that b > 1, something like b = 1.001; #include "logprob.h" -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <iostream> #include <fstream> #include <string> diff --git a/experimental/dual-model/MGIZA/src/logprob.h b/experimental/dual-model/MGIZA/src/logprob.h index 14696ac..6c9bd20 100644 --- a/experimental/dual-model/MGIZA/src/logprob.h +++ b/experimental/dual-model/MGIZA/src/logprob.h @@ -27,7 +27,7 @@ USA. // It is assumed that b > 1, something like b = 1.001 #include <iostream> -#include <math.h> +#include <cmath> #include <algorithm> //#define MAX(A,B) ((A) > (B) ? (A) : (B)) diff --git a/experimental/dual-model/MGIZA/src/mkcls/KategProblem.cpp b/experimental/dual-model/MGIZA/src/mkcls/KategProblem.cpp index 7318fb6..db2cf8a 100644 --- a/experimental/dual-model/MGIZA/src/mkcls/KategProblem.cpp +++ b/experimental/dual-model/MGIZA/src/mkcls/KategProblem.cpp @@ -23,8 +23,8 @@ USA. -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include "KategProblem.h" #include "KategProblemTest.h" diff --git a/experimental/dual-model/MGIZA/src/mkcls/KategProblem.h b/experimental/dual-model/MGIZA/src/mkcls/KategProblem.h index e5a5a46..f040b85 100644 --- a/experimental/dual-model/MGIZA/src/mkcls/KategProblem.h +++ b/experimental/dual-model/MGIZA/src/mkcls/KategProblem.h @@ -30,7 +30,7 @@ USA. #define KATEG_OPT_H #include <string> -#include <stdlib.h> +#include <cstdlib> #include "Problem.h" extern double rhoLo; diff --git a/experimental/dual-model/MGIZA/src/mkcls/KategProblemKBC.cpp b/experimental/dual-model/MGIZA/src/mkcls/KategProblemKBC.cpp index 97c40fc..4bd28f3 100644 --- a/experimental/dual-model/MGIZA/src/mkcls/KategProblemKBC.cpp +++ b/experimental/dual-model/MGIZA/src/mkcls/KategProblemKBC.cpp @@ -24,7 +24,7 @@ USA. -#include <stdlib.h> +#include <cstdlib> #include "KategProblem.h" double rhoLo=0.75; diff --git a/experimental/dual-model/MGIZA/src/mkcls/KategProblemTest.cpp b/experimental/dual-model/MGIZA/src/mkcls/KategProblemTest.cpp index 8c76ce5..3084a0b 100644 --- a/experimental/dual-model/MGIZA/src/mkcls/KategProblemTest.cpp +++ b/experimental/dual-model/MGIZA/src/mkcls/KategProblemTest.cpp @@ -32,8 +32,8 @@ USA. #include "RRTOptimization.h" #include "GDAOptimization.h" -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <string> #include <strstream> diff --git a/experimental/dual-model/MGIZA/src/mkcls/KategProblemWBC.cpp b/experimental/dual-model/MGIZA/src/mkcls/KategProblemWBC.cpp index 1a0d439..422b4a4 100644 --- a/experimental/dual-model/MGIZA/src/mkcls/KategProblemWBC.cpp +++ b/experimental/dual-model/MGIZA/src/mkcls/KategProblemWBC.cpp @@ -24,7 +24,7 @@ USA. -#include <stdlib.h> +#include <cstdlib> #include "KategProblem.h" static int oneFreqCompareSteigend(const void *p,const void *j) diff --git a/experimental/dual-model/MGIZA/src/mkcls/MSBOptimization.cpp b/experimental/dual-model/MGIZA/src/mkcls/MSBOptimization.cpp index 9478826..0cd89bb 100644 --- a/experimental/dual-model/MGIZA/src/mkcls/MSBOptimization.cpp +++ b/experimental/dual-model/MGIZA/src/mkcls/MSBOptimization.cpp @@ -25,7 +25,7 @@ USA. #include "MSBOptimization.h" -#include <stdlib.h> +#include <cstdlib> #include "ProblemTest.h" #ifdef __GNUC__ diff --git a/experimental/dual-model/MGIZA/src/mkcls/ProblemTest.cpp b/experimental/dual-model/MGIZA/src/mkcls/ProblemTest.cpp index 40fea7a..675c8cb 100644 --- a/experimental/dual-model/MGIZA/src/mkcls/ProblemTest.cpp +++ b/experimental/dual-model/MGIZA/src/mkcls/ProblemTest.cpp @@ -31,9 +31,9 @@ USA. #include "TAOptimization.h" #include "GDAOptimization.h" #include "MYOptimization.h" -#include <stdio.h> +#include <cstdio> #include "general.h" -#include <stdlib.h> +#include <cstdlib> short ProblemTestVerboseMode=1; ofstream *PrintBestTo=0,*PrintBestTo2=0; diff --git a/experimental/dual-model/MGIZA/src/mkcls/SAOptimization.cpp b/experimental/dual-model/MGIZA/src/mkcls/SAOptimization.cpp index 6ae589a..d5ebd26 100644 --- a/experimental/dual-model/MGIZA/src/mkcls/SAOptimization.cpp +++ b/experimental/dual-model/MGIZA/src/mkcls/SAOptimization.cpp @@ -24,7 +24,7 @@ USA. -#include <stdlib.h> +#include <cstdlib> #include <iostream> #include "SAOptimization.h" diff --git a/experimental/dual-model/MGIZA/src/mkcls/StatVar.cpp b/experimental/dual-model/MGIZA/src/mkcls/StatVar.cpp index dbd76cd..a4605ea 100644 --- a/experimental/dual-model/MGIZA/src/mkcls/StatVar.cpp +++ b/experimental/dual-model/MGIZA/src/mkcls/StatVar.cpp @@ -25,7 +25,7 @@ USA. #include "StatVar.h" #include <iostream> -#include <stdlib.h> +#include <cstdlib> double compareStatVarQuantil=-1; diff --git a/experimental/dual-model/MGIZA/src/mkcls/StatVar.h b/experimental/dual-model/MGIZA/src/mkcls/StatVar.h index bdf1e19..edee026 100644 --- a/experimental/dual-model/MGIZA/src/mkcls/StatVar.h +++ b/experimental/dual-model/MGIZA/src/mkcls/StatVar.h @@ -26,7 +26,7 @@ USA. #ifndef STATVAR_H #define STATVAR_H -#include <stdlib.h> +#include <cstdlib> #include <iostream> #include "Array.h" #include "mystl.h" diff --git a/experimental/dual-model/MGIZA/src/mkcls/general.cpp b/experimental/dual-model/MGIZA/src/mkcls/general.cpp index ddd5fe4..810a747 100644 --- a/experimental/dual-model/MGIZA/src/mkcls/general.cpp +++ b/experimental/dual-model/MGIZA/src/mkcls/general.cpp @@ -25,8 +25,8 @@ USA. -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> extern "C" { diff --git a/experimental/dual-model/MGIZA/src/mkcls/general.h b/experimental/dual-model/MGIZA/src/mkcls/general.h index 8db48aa..8631002 100644 --- a/experimental/dual-model/MGIZA/src/mkcls/general.h +++ b/experimental/dual-model/MGIZA/src/mkcls/general.h @@ -35,7 +35,7 @@ USA. #ifdef NeXT #include <minmax.h> #endif -#include <string.h> +#include <cstring> diff --git a/experimental/dual-model/MGIZA/src/mkcls/mkcls.cpp b/experimental/dual-model/MGIZA/src/mkcls/mkcls.cpp index 90ebfde..326de81 100644 --- a/experimental/dual-model/MGIZA/src/mkcls/mkcls.cpp +++ b/experimental/dual-model/MGIZA/src/mkcls/mkcls.cpp @@ -24,10 +24,10 @@ USA. -#include <stdio.h> +#include <cstdio> #include <iostream> -#include <stdlib.h> -#include <ctype.h> +#include <cstdlib> +#include <cctype> #include "general.h" #include "KategProblem.h" diff --git a/experimental/dual-model/MGIZA/src/mkcls/myassert.h b/experimental/dual-model/MGIZA/src/mkcls/myassert.h index da86ffb..0276ba3 100644 --- a/experimental/dual-model/MGIZA/src/mkcls/myassert.h +++ b/experimental/dual-model/MGIZA/src/mkcls/myassert.h @@ -34,7 +34,7 @@ void imyerror(int line,const char *file,const char *expression); #define vassert(expr) do {} while(0) -#include <assert.h> +#include <cassert> #endif diff --git a/experimental/dual-model/MGIZA/src/model1.h b/experimental/dual-model/MGIZA/src/model1.h index b152039..877b792 100644 --- a/experimental/dual-model/MGIZA/src/model1.h +++ b/experimental/dual-model/MGIZA/src/model1.h @@ -22,7 +22,7 @@ USA. #ifndef _model1_h #define _model1_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <strstream> @@ -39,10 +39,10 @@ using __gnu_cxx::hash_map; #else #include <hash_map> #endif -#include <time.h> +#include <ctime> #include <fstream> -#include <math.h> -#include <stdio.h> +#include <cmath> +#include <cstdio> #include "Vector.h" #include "vocab.h" diff --git a/experimental/dual-model/MGIZA/src/model2.h b/experimental/dual-model/MGIZA/src/model2.h index ff8e993..d379f22 100644 --- a/experimental/dual-model/MGIZA/src/model2.h +++ b/experimental/dual-model/MGIZA/src/model2.h @@ -22,7 +22,7 @@ USA. #ifndef _model2_h #define _model2_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> @@ -40,8 +40,8 @@ using __gnu_cxx::hash_map; #endif #include <fstream> -#include <math.h> -#include <time.h> +#include <cmath> +#include <ctime> #include "TTables.h" #include "ATables.h" diff --git a/experimental/dual-model/MGIZA/src/model3.h b/experimental/dual-model/MGIZA/src/model3.h index c3e7d28..33e7dd1 100644 --- a/experimental/dual-model/MGIZA/src/model3.h +++ b/experimental/dual-model/MGIZA/src/model3.h @@ -21,7 +21,7 @@ */ #ifndef _model3_h #define _model3_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> #include <functional> @@ -36,9 +36,9 @@ using __gnu_cxx::hash_map; #include <hash_map> #endif -#include <time.h> +#include <ctime> #include <fstream> -#include <math.h> +#include <cmath> #include "MoveSwapMatrix.h" #include "TTables.h" #include "ATables.h" diff --git a/experimental/dual-model/MGIZA/src/mymath.h b/experimental/dual-model/MGIZA/src/mymath.h index f8ad926..47c5bfb 100644 --- a/experimental/dual-model/MGIZA/src/mymath.h +++ b/experimental/dual-model/MGIZA/src/mymath.h @@ -5,5 +5,5 @@ #ifndef HEADER_MYMATH_DEFINED #define HEADER_MYMATH_DEFINED inline double mfabs(double x){return (x<0)?(-x):x;} -#include <math.h> +#include <cmath> #endif diff --git a/experimental/dual-model/MGIZA/src/plain2snt.cpp b/experimental/dual-model/MGIZA/src/plain2snt.cpp index 6e8f0b7..8919cca 100644 --- a/experimental/dual-model/MGIZA/src/plain2snt.cpp +++ b/experimental/dual-model/MGIZA/src/plain2snt.cpp @@ -4,8 +4,8 @@ #include <fstream> #include <map> #include <vector> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> using namespace std; diff --git a/experimental/dual-model/MGIZA/src/reports.cpp b/experimental/dual-model/MGIZA/src/reports.cpp index 4d5873a..3ce3e80 100644 --- a/experimental/dual-model/MGIZA/src/reports.cpp +++ b/experimental/dual-model/MGIZA/src/reports.cpp @@ -20,7 +20,7 @@ USA. */ #include <strstream> -#include <time.h> +#include <ctime> #include <set> #include "defs.h" #include "vocab.h" diff --git a/experimental/dual-model/MGIZA/src/snt2cooc.cpp b/experimental/dual-model/MGIZA/src/snt2cooc.cpp index 0eb2aaf..48328dc 100644 --- a/experimental/dual-model/MGIZA/src/snt2cooc.cpp +++ b/experimental/dual-model/MGIZA/src/snt2cooc.cpp @@ -5,8 +5,8 @@ #include <map> #include <vector> #include <set> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> using namespace std; diff --git a/experimental/dual-model/MGIZA/src/snt2plain.cpp b/experimental/dual-model/MGIZA/src/snt2plain.cpp index 23dacbe..9950050 100644 --- a/experimental/dual-model/MGIZA/src/snt2plain.cpp +++ b/experimental/dual-model/MGIZA/src/snt2plain.cpp @@ -4,8 +4,8 @@ #include <fstream> #include <map> #include <vector> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> using namespace std; diff --git a/experimental/dual-model/MGIZA/src/syncObj.h b/experimental/dual-model/MGIZA/src/syncObj.h index 1c1b31d..8deda8f 100644 --- a/experimental/dual-model/MGIZA/src/syncObj.h +++ b/experimental/dual-model/MGIZA/src/syncObj.h @@ -1,8 +1,8 @@ #ifndef __SYNC_OBJ_H__ #define __SYNC_OBJ_H__ -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <pthread.h> #include <iostream> diff --git a/experimental/dual-model/MGIZA/src/transpair_model1.h b/experimental/dual-model/MGIZA/src/transpair_model1.h index 00d7875..dd1425d 100644 --- a/experimental/dual-model/MGIZA/src/transpair_model1.h +++ b/experimental/dual-model/MGIZA/src/transpair_model1.h @@ -31,7 +31,7 @@ USA. #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include <algorithm> #include "Array2.h" #include "mystl.h" diff --git a/experimental/dual-model/MGIZA/src/transpair_model2.h b/experimental/dual-model/MGIZA/src/transpair_model2.h index f3d53e3..751ce52 100644 --- a/experimental/dual-model/MGIZA/src/transpair_model2.h +++ b/experimental/dual-model/MGIZA/src/transpair_model2.h @@ -29,7 +29,7 @@ USA. #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include "transpair_model1.h" diff --git a/experimental/dual-model/MGIZA/src/transpair_model3.h b/experimental/dual-model/MGIZA/src/transpair_model3.h index 5fa43db..9c07fd9 100644 --- a/experimental/dual-model/MGIZA/src/transpair_model3.h +++ b/experimental/dual-model/MGIZA/src/transpair_model3.h @@ -34,7 +34,7 @@ Franz Josef Och (30/07/99) #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include "transpair_model2.h" extern double factorial(int n); diff --git a/experimental/dual-model/MGIZA/src/transpair_modelhmm.h b/experimental/dual-model/MGIZA/src/transpair_modelhmm.h index 2b38913..d836ad4 100644 --- a/experimental/dual-model/MGIZA/src/transpair_modelhmm.h +++ b/experimental/dual-model/MGIZA/src/transpair_modelhmm.h @@ -29,7 +29,7 @@ USA. #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include "transpair_model2.h" #include "ForwardBackward.h" #include "hmm.h" diff --git a/mgizapp/src/AlignTables.h b/mgizapp/src/AlignTables.h index fcca7a6..d4bcf09 100644 --- a/mgizapp/src/AlignTables.h +++ b/mgizapp/src/AlignTables.h @@ -41,7 +41,7 @@ using __gnu_cxx::hash_map; #else
#include <hash_map>
#endif
-#include <math.h>
+#include <cmath>
#include <fstream>
#include "transpair_model1.h"
diff --git a/mgizapp/src/D4Tables.h b/mgizapp/src/D4Tables.h index 3e60dc8..ce9e7c3 100644 --- a/mgizapp/src/D4Tables.h +++ b/mgizapp/src/D4Tables.h @@ -22,7 +22,7 @@ */ #ifndef _d4tables_h_define #define _d4tables_h_define -#include <math.h> +#include <cmath> #include "WordClasses.h" #include "Globals.h" #include "myassert.h" diff --git a/mgizapp/src/D5Tables.h b/mgizapp/src/D5Tables.h index 74693f0..0cfc0c6 100644 --- a/mgizapp/src/D5Tables.h +++ b/mgizapp/src/D5Tables.h @@ -22,7 +22,7 @@ USA. */ #ifndef _d5tables_h_define #define _d5tables_h_define -#include <math.h> +#include <cmath> #include "D4Tables.h" extern float d5modelsmooth_countoffset; diff --git a/mgizapp/src/Dictionary.cpp b/mgizapp/src/Dictionary.cpp index a0d9dc3..b12f9b2 100644 --- a/mgizapp/src/Dictionary.cpp +++ b/mgizapp/src/Dictionary.cpp @@ -29,7 +29,7 @@ USA. */ #include "Dictionary.h" -#include <string.h> +#include <cstring> Dictionary::Dictionary(const char *filename){ if(!strcmp(filename, "")){ diff --git a/mgizapp/src/NTables.h b/mgizapp/src/NTables.h index 90d1b3d..698a470 100644 --- a/mgizapp/src/NTables.h +++ b/mgizapp/src/NTables.h @@ -23,7 +23,7 @@ #define _ntables_h 1 #include "Array2.h" #include "Vector.h" -#include <assert.h> +#include <cassert> #include "defs.h" #include "vocab.h" #include "myassert.h" diff --git a/mgizapp/src/Parameter.h b/mgizapp/src/Parameter.h index 312bfbc..64a9450 100644 --- a/mgizapp/src/Parameter.h +++ b/mgizapp/src/Parameter.h @@ -29,7 +29,7 @@ USA. #include <string> #include "Globals.h" #include <fstream> -#include <string.h> +#include <cstring> #ifdef WIN32 #define strcasecmp _strcmpi diff --git a/mgizapp/src/Perplexity.h b/mgizapp/src/Perplexity.h index 45cc84f..6e24cf0 100644 --- a/mgizapp/src/Perplexity.h +++ b/mgizapp/src/Perplexity.h @@ -34,7 +34,7 @@ USA. #ifndef _PERPLEXITY_H #define _PERPLEXITY_H -#include <math.h> +#include <cmath> #include <fstream> #include "Vector.h" #include "defs.h" diff --git a/mgizapp/src/Pointer.h b/mgizapp/src/Pointer.h index 58de60c..fd05688 100644 --- a/mgizapp/src/Pointer.h +++ b/mgizapp/src/Pointer.h @@ -23,7 +23,7 @@ USA. #ifndef HEADER_Pointer_DEFINED #define HEADER_Pointer_DEFINED -#include <assert.h> +#include <cassert> #include <iostream> template<class T> diff --git a/mgizapp/src/SetArray.h b/mgizapp/src/SetArray.h index 9c49239..2a2125f 100644 --- a/mgizapp/src/SetArray.h +++ b/mgizapp/src/SetArray.h @@ -11,8 +11,8 @@ be threadsafe #include <vector> #include "defs.h" #include "vocab.h" -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <pthread.h> #include "syncObj.h" diff --git a/mgizapp/src/TTables.h b/mgizapp/src/TTables.h index f6be652..8298deb 100644 --- a/mgizapp/src/TTables.h +++ b/mgizapp/src/TTables.h @@ -36,7 +36,7 @@ USA. #include "defs.h" #include "vocab.h" -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> diff --git a/mgizapp/src/Vector.h b/mgizapp/src/Vector.h index a48fd3e..5943181 100644 --- a/mgizapp/src/Vector.h +++ b/mgizapp/src/Vector.h @@ -31,7 +31,7 @@ Franz Josef Och (30/07/99) #include <string> #include <utility> #include <functional> -#include <assert.h> +#include <cassert> #ifdef NDEBUG diff --git a/mgizapp/src/alignment.h b/mgizapp/src/alignment.h index 17774c6..03cf028 100644 --- a/mgizapp/src/alignment.h +++ b/mgizapp/src/alignment.h @@ -26,7 +26,7 @@ Franz Josef Och (30/07/99) #ifndef alignment_h_fjo_defined #define alignment_h_fjo_defined #include "Vector.h" -#include <assert.h> +#include <cassert> #include "defs.h" #include "myassert.h" diff --git a/mgizapp/src/defs.h b/mgizapp/src/defs.h index e94addd..5fbc31d 100644 --- a/mgizapp/src/defs.h +++ b/mgizapp/src/defs.h @@ -22,8 +22,8 @@ USA. #ifndef _defs_h #define _defs_h 1 #include <string> -#include <math.h> -#include <limits.h> +#include <cmath> +#include <climits> const int TRANSFER_SIMPLE=1; const int TRANSFER=0; diff --git a/mgizapp/src/file_spec.h b/mgizapp/src/file_spec.h index 945aa5b..4c5e625 100644 --- a/mgizapp/src/file_spec.h +++ b/mgizapp/src/file_spec.h @@ -22,10 +22,10 @@ USA. #ifndef FILE_SPEC_H #define FILE_SPEC_H -#include <time.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> +#include <ctime> +#include <cstdlib> +#include <cstring> +#include <cstdio> /* This function returns a string, locally called file_spec. This string is the concatenation of the date and time of execution diff --git a/mgizapp/src/getSentence.cpp b/mgizapp/src/getSentence.cpp index ec1ad9d..24e15db 100644 --- a/mgizapp/src/getSentence.cpp +++ b/mgizapp/src/getSentence.cpp @@ -33,8 +33,8 @@ USA. #include "getSentence.h" #include <iostream> #include <strstream> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <boost/algorithm/string.hpp> #include <vector> #include <set> diff --git a/mgizapp/src/getSentence.h b/mgizapp/src/getSentence.h index d7d4e53..6a84abe 100644 --- a/mgizapp/src/getSentence.h +++ b/mgizapp/src/getSentence.h @@ -41,8 +41,8 @@ USA. #include <fstream> #include <string> #include <set> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <pthread.h> #include "Vector.h" #include "defs.h" diff --git a/mgizapp/src/hmm.h b/mgizapp/src/hmm.h index c518144..b50b0be 100644 --- a/mgizapp/src/hmm.h +++ b/mgizapp/src/hmm.h @@ -22,7 +22,7 @@ USA. #ifndef _hmm_h #define _hmm_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> @@ -39,8 +39,8 @@ using __gnu_cxx::hash_map; #include <hash_map> #endif #include <fstream> -#include <math.h> -#include <time.h> +#include <cmath> +#include <ctime> #include "TTables.h" #include "ATables.h" diff --git a/mgizapp/src/logprob.cpp b/mgizapp/src/logprob.cpp index 97464a7..a6130a5 100644 --- a/mgizapp/src/logprob.cpp +++ b/mgizapp/src/logprob.cpp @@ -25,8 +25,8 @@ USA. // It is assumed that b > 1, something like b = 1.001; #include "logprob.h" -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <iostream> #include <fstream> #include <string> diff --git a/mgizapp/src/logprob.h b/mgizapp/src/logprob.h index 1dfbb72..38b414d 100644 --- a/mgizapp/src/logprob.h +++ b/mgizapp/src/logprob.h @@ -27,7 +27,7 @@ USA. // It is assumed that b > 1, something like b = 1.001 #include <iostream> -#include <math.h> +#include <cmath> #include <algorithm> //#define MAX(A,B) ((A) > (B) ? (A) : (B)) diff --git a/mgizapp/src/mkcls/KategProblem.cpp b/mgizapp/src/mkcls/KategProblem.cpp index 7318fb6..db2cf8a 100644 --- a/mgizapp/src/mkcls/KategProblem.cpp +++ b/mgizapp/src/mkcls/KategProblem.cpp @@ -23,8 +23,8 @@ USA. -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include "KategProblem.h" #include "KategProblemTest.h" diff --git a/mgizapp/src/mkcls/KategProblem.h b/mgizapp/src/mkcls/KategProblem.h index e5a5a46..f040b85 100644 --- a/mgizapp/src/mkcls/KategProblem.h +++ b/mgizapp/src/mkcls/KategProblem.h @@ -30,7 +30,7 @@ USA. #define KATEG_OPT_H #include <string> -#include <stdlib.h> +#include <cstdlib> #include "Problem.h" extern double rhoLo; diff --git a/mgizapp/src/mkcls/KategProblemKBC.cpp b/mgizapp/src/mkcls/KategProblemKBC.cpp index a416bd9..ced780e 100644 --- a/mgizapp/src/mkcls/KategProblemKBC.cpp +++ b/mgizapp/src/mkcls/KategProblemKBC.cpp @@ -24,8 +24,8 @@ USA. -#include <stdlib.h> -#include <math.h> +#include <cstdlib> +#include <cmath> #include "KategProblem.h" #ifdef WIN32 diff --git a/mgizapp/src/mkcls/KategProblemTest.cpp b/mgizapp/src/mkcls/KategProblemTest.cpp index 8c76ce5..3084a0b 100644 --- a/mgizapp/src/mkcls/KategProblemTest.cpp +++ b/mgizapp/src/mkcls/KategProblemTest.cpp @@ -32,8 +32,8 @@ USA. #include "RRTOptimization.h" #include "GDAOptimization.h" -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <string> #include <strstream> diff --git a/mgizapp/src/mkcls/KategProblemWBC.cpp b/mgizapp/src/mkcls/KategProblemWBC.cpp index 1a0d439..422b4a4 100644 --- a/mgizapp/src/mkcls/KategProblemWBC.cpp +++ b/mgizapp/src/mkcls/KategProblemWBC.cpp @@ -24,7 +24,7 @@ USA. -#include <stdlib.h> +#include <cstdlib> #include "KategProblem.h" static int oneFreqCompareSteigend(const void *p,const void *j) diff --git a/mgizapp/src/mkcls/MSBOptimization.cpp b/mgizapp/src/mkcls/MSBOptimization.cpp index 9478826..0cd89bb 100644 --- a/mgizapp/src/mkcls/MSBOptimization.cpp +++ b/mgizapp/src/mkcls/MSBOptimization.cpp @@ -25,7 +25,7 @@ USA. #include "MSBOptimization.h" -#include <stdlib.h> +#include <cstdlib> #include "ProblemTest.h" #ifdef __GNUC__ diff --git a/mgizapp/src/mkcls/ProblemTest.cpp b/mgizapp/src/mkcls/ProblemTest.cpp index 40fea7a..675c8cb 100644 --- a/mgizapp/src/mkcls/ProblemTest.cpp +++ b/mgizapp/src/mkcls/ProblemTest.cpp @@ -31,9 +31,9 @@ USA. #include "TAOptimization.h" #include "GDAOptimization.h" #include "MYOptimization.h" -#include <stdio.h> +#include <cstdio> #include "general.h" -#include <stdlib.h> +#include <cstdlib> short ProblemTestVerboseMode=1; ofstream *PrintBestTo=0,*PrintBestTo2=0; diff --git a/mgizapp/src/mkcls/SAOptimization.cpp b/mgizapp/src/mkcls/SAOptimization.cpp index 6ae589a..d5ebd26 100644 --- a/mgizapp/src/mkcls/SAOptimization.cpp +++ b/mgizapp/src/mkcls/SAOptimization.cpp @@ -24,7 +24,7 @@ USA. -#include <stdlib.h> +#include <cstdlib> #include <iostream> #include "SAOptimization.h" diff --git a/mgizapp/src/mkcls/StatVar.cpp b/mgizapp/src/mkcls/StatVar.cpp index dbd76cd..a4605ea 100644 --- a/mgizapp/src/mkcls/StatVar.cpp +++ b/mgizapp/src/mkcls/StatVar.cpp @@ -25,7 +25,7 @@ USA. #include "StatVar.h" #include <iostream> -#include <stdlib.h> +#include <cstdlib> double compareStatVarQuantil=-1; diff --git a/mgizapp/src/mkcls/StatVar.h b/mgizapp/src/mkcls/StatVar.h index bdf1e19..edee026 100644 --- a/mgizapp/src/mkcls/StatVar.h +++ b/mgizapp/src/mkcls/StatVar.h @@ -26,7 +26,7 @@ USA. #ifndef STATVAR_H #define STATVAR_H -#include <stdlib.h> +#include <cstdlib> #include <iostream> #include "Array.h" #include "mystl.h" diff --git a/mgizapp/src/mkcls/general.cpp b/mgizapp/src/mkcls/general.cpp index cb3f27d..1d11e69 100644 --- a/mgizapp/src/mkcls/general.cpp +++ b/mgizapp/src/mkcls/general.cpp @@ -25,8 +25,8 @@ USA. -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> extern "C" { diff --git a/mgizapp/src/mkcls/general.h b/mgizapp/src/mkcls/general.h index 8db48aa..8631002 100644 --- a/mgizapp/src/mkcls/general.h +++ b/mgizapp/src/mkcls/general.h @@ -35,7 +35,7 @@ USA. #ifdef NeXT #include <minmax.h> #endif -#include <string.h> +#include <cstring> diff --git a/mgizapp/src/mkcls/mkcls.cpp b/mgizapp/src/mkcls/mkcls.cpp index a2bf695..3a950cf 100644 --- a/mgizapp/src/mkcls/mkcls.cpp +++ b/mgizapp/src/mkcls/mkcls.cpp @@ -26,10 +26,10 @@ USA. #define strcasecmp strcmpi #endif -#include <stdio.h> +#include <cstdio> #include <iostream> -#include <stdlib.h> -#include <ctype.h> +#include <cstdlib> +#include <cctype> #include "general.h" #include "KategProblem.h" diff --git a/mgizapp/src/mkcls/myassert.h b/mgizapp/src/mkcls/myassert.h index da86ffb..0276ba3 100644 --- a/mgizapp/src/mkcls/myassert.h +++ b/mgizapp/src/mkcls/myassert.h @@ -34,7 +34,7 @@ void imyerror(int line,const char *file,const char *expression); #define vassert(expr) do {} while(0) -#include <assert.h> +#include <cassert> #endif diff --git a/mgizapp/src/model1.h b/mgizapp/src/model1.h index cadc1e3..fc4ee88 100644 --- a/mgizapp/src/model1.h +++ b/mgizapp/src/model1.h @@ -22,7 +22,7 @@ USA. #ifndef _model1_h #define _model1_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <strstream> @@ -39,10 +39,10 @@ using __gnu_cxx::hash_map; #else #include <hash_map> #endif -#include <time.h> +#include <ctime> #include <fstream> -#include <math.h> -#include <stdio.h> +#include <cmath> +#include <cstdio> #include "Vector.h" #include "vocab.h" diff --git a/mgizapp/src/model2.h b/mgizapp/src/model2.h index ff8e993..d379f22 100644 --- a/mgizapp/src/model2.h +++ b/mgizapp/src/model2.h @@ -22,7 +22,7 @@ USA. #ifndef _model2_h #define _model2_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> @@ -40,8 +40,8 @@ using __gnu_cxx::hash_map; #endif #include <fstream> -#include <math.h> -#include <time.h> +#include <cmath> +#include <ctime> #include "TTables.h" #include "ATables.h" diff --git a/mgizapp/src/model3.h b/mgizapp/src/model3.h index c3e7d28..33e7dd1 100644 --- a/mgizapp/src/model3.h +++ b/mgizapp/src/model3.h @@ -21,7 +21,7 @@ */ #ifndef _model3_h #define _model3_h 1 -#include <assert.h> +#include <cassert> #include <iostream> #include <algorithm> #include <functional> @@ -36,9 +36,9 @@ using __gnu_cxx::hash_map; #include <hash_map> #endif -#include <time.h> +#include <ctime> #include <fstream> -#include <math.h> +#include <cmath> #include "MoveSwapMatrix.h" #include "TTables.h" #include "ATables.h" diff --git a/mgizapp/src/mymath.h b/mgizapp/src/mymath.h index f8ad926..47c5bfb 100644 --- a/mgizapp/src/mymath.h +++ b/mgizapp/src/mymath.h @@ -5,5 +5,5 @@ #ifndef HEADER_MYMATH_DEFINED #define HEADER_MYMATH_DEFINED inline double mfabs(double x){return (x<0)?(-x):x;} -#include <math.h> +#include <cmath> #endif diff --git a/mgizapp/src/plain2snt.cpp b/mgizapp/src/plain2snt.cpp index 2aae066..663d376 100644 --- a/mgizapp/src/plain2snt.cpp +++ b/mgizapp/src/plain2snt.cpp @@ -4,8 +4,8 @@ #include <fstream> #include <map> #include <vector> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> using namespace std; diff --git a/mgizapp/src/reports.cpp b/mgizapp/src/reports.cpp index 4d5873a..3ce3e80 100644 --- a/mgizapp/src/reports.cpp +++ b/mgizapp/src/reports.cpp @@ -20,7 +20,7 @@ USA. */ #include <strstream> -#include <time.h> +#include <ctime> #include <set> #include "defs.h" #include "vocab.h" diff --git a/mgizapp/src/snt2cooc-reduce-mem-preprocess.cpp b/mgizapp/src/snt2cooc-reduce-mem-preprocess.cpp index 3309a7e..8f05796 100644 --- a/mgizapp/src/snt2cooc-reduce-mem-preprocess.cpp +++ b/mgizapp/src/snt2cooc-reduce-mem-preprocess.cpp @@ -5,8 +5,8 @@ #include <map> #include <vector> #include <set> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> using namespace std; diff --git a/mgizapp/src/snt2cooc.cpp b/mgizapp/src/snt2cooc.cpp index 0eb2aaf..48328dc 100644 --- a/mgizapp/src/snt2cooc.cpp +++ b/mgizapp/src/snt2cooc.cpp @@ -5,8 +5,8 @@ #include <map> #include <vector> #include <set> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> using namespace std; diff --git a/mgizapp/src/snt2plain.cpp b/mgizapp/src/snt2plain.cpp index 23dacbe..9950050 100644 --- a/mgizapp/src/snt2plain.cpp +++ b/mgizapp/src/snt2plain.cpp @@ -4,8 +4,8 @@ #include <fstream> #include <map> #include <vector> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> using namespace std; diff --git a/mgizapp/src/syncObj.h b/mgizapp/src/syncObj.h index 86af946..9b1b7bf 100644 --- a/mgizapp/src/syncObj.h +++ b/mgizapp/src/syncObj.h @@ -1,8 +1,8 @@ #ifndef __SYNC_OBJ_H__ #define __SYNC_OBJ_H__ -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <pthread.h> #include <iostream> diff --git a/mgizapp/src/transpair_model1.h b/mgizapp/src/transpair_model1.h index 00d7875..dd1425d 100644 --- a/mgizapp/src/transpair_model1.h +++ b/mgizapp/src/transpair_model1.h @@ -31,7 +31,7 @@ USA. #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include <algorithm> #include "Array2.h" #include "mystl.h" diff --git a/mgizapp/src/transpair_model2.h b/mgizapp/src/transpair_model2.h index f3d53e3..751ce52 100644 --- a/mgizapp/src/transpair_model2.h +++ b/mgizapp/src/transpair_model2.h @@ -29,7 +29,7 @@ USA. #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include "transpair_model1.h" diff --git a/mgizapp/src/transpair_model3.h b/mgizapp/src/transpair_model3.h index 5fa43db..9c07fd9 100644 --- a/mgizapp/src/transpair_model3.h +++ b/mgizapp/src/transpair_model3.h @@ -34,7 +34,7 @@ Franz Josef Och (30/07/99) #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include "transpair_model2.h" extern double factorial(int n); diff --git a/mgizapp/src/transpair_modelhmm.h b/mgizapp/src/transpair_modelhmm.h index 2b38913..d836ad4 100644 --- a/mgizapp/src/transpair_modelhmm.h +++ b/mgizapp/src/transpair_modelhmm.h @@ -29,7 +29,7 @@ USA. #include "ATables.h" #include "TTables.h" #include "alignment.h" -#include <math.h> +#include <cmath> #include "transpair_model2.h" #include "ForwardBackward.h" #include "hmm.h" diff --git a/mgizapp/src/utility.cpp b/mgizapp/src/utility.cpp index 87051d2..c0350a0 100644 --- a/mgizapp/src/utility.cpp +++ b/mgizapp/src/utility.cpp @@ -20,7 +20,7 @@ USA. */ #include <string> -#include <time.h> +#include <ctime> #include "mymath.h" using namespace std; diff --git a/mgizapp/src/utility.h b/mgizapp/src/utility.h index fc6cded..0078a70 100644 --- a/mgizapp/src/utility.h +++ b/mgizapp/src/utility.h @@ -22,7 +22,7 @@ USA. #ifndef utility_h #define utility_h #include <iostream> -#include <time.h> +#include <ctime> #include "Perplexity.h" #include "Vector.h" #include "TTables.h" |