Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/moses-smt/mosesdecoder.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mert/BleuScorer.h6
-rw-r--r--mert/CderScorer.h6
-rw-r--r--mert/Data.h6
-rw-r--r--mert/FeatureArray.h6
-rw-r--r--mert/FeatureData.h6
-rw-r--r--mert/FeatureDataIterator.h6
-rw-r--r--mert/FeatureStats.h6
-rw-r--r--mert/FileStream.h6
-rw-r--r--mert/Jamfile22
-rw-r--r--mert/MergeScorer.cpp4
-rw-r--r--mert/MergeScorer.h6
-rw-r--r--mert/Optimizer.h4
-rw-r--r--mert/PerScorer.h6
-rw-r--r--mert/Point.h6
-rw-r--r--mert/ScopedVector.h6
-rw-r--r--mert/ScoreArray.h6
-rw-r--r--mert/ScoreData.h6
-rw-r--r--mert/ScoreDataIterator.h6
-rw-r--r--mert/ScoreStats.h8
-rw-r--r--mert/Scorer.h6
-rw-r--r--mert/ScorerFactory.h6
-rw-r--r--mert/TER/alignmentStruct.cpp (renamed from mert/TERsrc/alignmentStruct.cpp)0
-rw-r--r--mert/TER/alignmentStruct.h (renamed from mert/TERsrc/alignmentStruct.h)8
-rw-r--r--mert/TER/bestShiftStruct.h (renamed from mert/TERsrc/bestShiftStruct.h)6
-rw-r--r--mert/TER/hashMap.cpp (renamed from mert/TERsrc/hashMap.cpp)0
-rw-r--r--mert/TER/hashMap.h (renamed from mert/TERsrc/hashMap.h)6
-rw-r--r--mert/TER/hashMapInfos.cpp (renamed from mert/TERsrc/hashMapInfos.cpp)0
-rw-r--r--mert/TER/hashMapInfos.h (renamed from mert/TERsrc/hashMapInfos.h)6
-rw-r--r--mert/TER/hashMapStringInfos.cpp (renamed from mert/TERsrc/hashMapStringInfos.cpp)0
-rw-r--r--mert/TER/hashMapStringInfos.h (renamed from mert/TERsrc/hashMapStringInfos.h)6
-rw-r--r--mert/TER/infosHasher.cpp (renamed from mert/TERsrc/infosHasher.cpp)0
-rw-r--r--mert/TER/infosHasher.h (renamed from mert/TERsrc/infosHasher.h)6
-rw-r--r--mert/TER/stringHasher.cpp (renamed from mert/TERsrc/stringHasher.cpp)0
-rw-r--r--mert/TER/stringHasher.h (renamed from mert/TERsrc/stringHasher.h)6
-rw-r--r--mert/TER/stringInfosHasher.cpp (renamed from mert/TERsrc/stringInfosHasher.cpp)0
-rw-r--r--mert/TER/stringInfosHasher.h (renamed from mert/TERsrc/stringInfosHasher.h)6
-rw-r--r--mert/TER/terAlignment.cpp (renamed from mert/TERsrc/terAlignment.cpp)0
-rw-r--r--mert/TER/terAlignment.h (renamed from mert/TERsrc/terAlignment.h)6
-rw-r--r--mert/TER/terShift.cpp (renamed from mert/TERsrc/terShift.cpp)0
-rw-r--r--mert/TER/terShift.h (renamed from mert/TERsrc/terShift.h)6
-rw-r--r--mert/TER/tercalc.cpp (renamed from mert/TERsrc/tercalc.cpp)0
-rw-r--r--mert/TER/tercalc.h (renamed from mert/TERsrc/tercalc.h)6
-rw-r--r--mert/TER/tools.cpp (renamed from mert/TERsrc/tools.cpp)0
-rw-r--r--mert/TER/tools.h (renamed from mert/TERsrc/tools.h)6
-rw-r--r--mert/TerScorer.cpp4
-rw-r--r--mert/TerScorer.h6
-rw-r--r--mert/Timer.h6
-rw-r--r--mert/Types.h6
-rw-r--r--mert/Util.h6
-rw-r--r--mert/gzfilebuf.h6
50 files changed, 123 insertions, 125 deletions
diff --git a/mert/BleuScorer.h b/mert/BleuScorer.h
index 5f105add2..9875b9c52 100644
--- a/mert/BleuScorer.h
+++ b/mert/BleuScorer.h
@@ -1,5 +1,5 @@
-#ifndef __BLEUSCORER_H__
-#define __BLEUSCORER_H__
+#ifndef MERT_BLEU_SCORER_H_
+#define MERT_BLEU_SCORER_H_
#include <iostream>
#include <string>
@@ -80,4 +80,4 @@ private:
BleuScorer& operator=(const BleuScorer&);
};
-#endif // __BLEUSCORER_H__
+#endif // MERT_BLEU_SCORER_H_
diff --git a/mert/CderScorer.h b/mert/CderScorer.h
index bcc4946dc..25d5b6bfb 100644
--- a/mert/CderScorer.h
+++ b/mert/CderScorer.h
@@ -1,5 +1,5 @@
-#ifndef __CDERSCORER_H__
-#define __CDERSCORER_H__
+#ifndef MERT_CDER_SCORER_H_
+#define MERT_CDER_SCORER_H_
#include <algorithm>
#include <iostream>
@@ -39,4 +39,4 @@ private:
CderScorer& operator=(const CderScorer&);
};
-#endif // __CDERSCORER_H__
+#endif // MERT_CDER_SCORER_H_
diff --git a/mert/Data.h b/mert/Data.h
index ffc6bfa26..6a64140ff 100644
--- a/mert/Data.h
+++ b/mert/Data.h
@@ -6,8 +6,8 @@
*
*/
-#ifndef DATA_H
-#define DATA_H
+#ifndef MERT_DATA_H_
+#define MERT_DATA_H_
using namespace std;
@@ -122,4 +122,4 @@ public:
std::vector<Data>& shards);
};
-#endif // DATA_H
+#endif // MERT_DATA_H_
diff --git a/mert/FeatureArray.h b/mert/FeatureArray.h
index cbb26907c..b4b305e39 100644
--- a/mert/FeatureArray.h
+++ b/mert/FeatureArray.h
@@ -6,8 +6,8 @@
*
*/
-#ifndef FEATURE_ARRAY_H
-#define FEATURE_ARRAY_H
+#ifndef MERT_FEATURE_ARRAY_H_
+#define MERT_FEATURE_ARRAY_H_
#include <vector>
#include <iostream>
@@ -107,4 +107,4 @@ public:
bool check_consistency() const;
};
-#endif // FEATURE_ARRAY_H
+#endif // MERT_FEATURE_ARRAY_H_
diff --git a/mert/FeatureData.h b/mert/FeatureData.h
index 013cee91a..09fb8e9be 100644
--- a/mert/FeatureData.h
+++ b/mert/FeatureData.h
@@ -6,8 +6,8 @@
*
*/
-#ifndef FEATURE_DATA_H
-#define FEATURE_DATA_H
+#ifndef MERT_FEATURE_DATA_H_
+#define MERT_FEATURE_DATA_H_
using namespace std;
@@ -141,4 +141,4 @@ public:
std::string ToString() const;
};
-#endif // FEATURE_DATA_H
+#endif // MERT_FEATURE_DATA_H_
diff --git a/mert/FeatureDataIterator.h b/mert/FeatureDataIterator.h
index 81f072970..58345829c 100644
--- a/mert/FeatureDataIterator.h
+++ b/mert/FeatureDataIterator.h
@@ -17,8 +17,8 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
***********************************************************************/
-#ifndef _FEATURE_DATA_ITERATOR_
-#define _FEATURE_DATA_ITERATOR_
+#ifndef MERT_FEATURE_DATA_ITERATOR_H_
+#define MERT_FEATURE_DATA_ITERATOR_H_
/**
* For loading from the feature data file.
@@ -88,4 +88,4 @@ class FeatureDataIterator :
std::vector<FeatureDataItem> m_next;
};
-#endif
+#endif // MERT_FEATURE_DATA_ITERATOR_H_
diff --git a/mert/FeatureStats.h b/mert/FeatureStats.h
index 7f24f874a..f29862c00 100644
--- a/mert/FeatureStats.h
+++ b/mert/FeatureStats.h
@@ -6,8 +6,8 @@
*
*/
-#ifndef FEATURE_STATS_H
-#define FEATURE_STATS_H
+#ifndef MERT_FEATURE_STATS_H_
+#define MERT_FEATURE_STATS_H_
#include <cstring>
#include <fstream>
@@ -138,4 +138,4 @@ public:
bool operator==(const FeatureStats& f1, const FeatureStats& f2);
//END_ADDED
-#endif // FEATURE_STATS_H
+#endif // MERT_FEATURE_STATS_H_
diff --git a/mert/FileStream.h b/mert/FileStream.h
index afa8d9a29..cdf786632 100644
--- a/mert/FileStream.h
+++ b/mert/FileStream.h
@@ -1,5 +1,5 @@
-#ifndef FILESTREAM_H_
-#define FILESTREAM_H_
+#ifndef MERT_FILE_STREAM_H_
+#define MERT_FILE_STREAM_H_
#include <fstream>
#include <streambuf>
@@ -31,4 +31,4 @@ public:
void close();
};
-#endif // FILESTREAM_H_
+#endif // MERT_FILE_STREAM_H_
diff --git a/mert/Jamfile b/mert/Jamfile
index 1ea403a07..69d59a30c 100644
--- a/mert/Jamfile
+++ b/mert/Jamfile
@@ -17,17 +17,17 @@ PerScorer.cpp
Scorer.cpp
ScorerFactory.cpp
Optimizer.cpp
-TERsrc/alignmentStruct.cpp
-TERsrc/hashMap.cpp
-TERsrc/hashMapStringInfos.cpp
-TERsrc/stringHasher.cpp
-TERsrc/terAlignment.cpp
-TERsrc/terShift.cpp
-TERsrc/hashMapInfos.cpp
-TERsrc/infosHasher.cpp
-TERsrc/stringInfosHasher.cpp
-TERsrc/tercalc.cpp
-TERsrc/tools.cpp
+TER/alignmentStruct.cpp
+TER/hashMap.cpp
+TER/hashMapStringInfos.cpp
+TER/stringHasher.cpp
+TER/terAlignment.cpp
+TER/terShift.cpp
+TER/hashMapInfos.cpp
+TER/infosHasher.cpp
+TER/stringInfosHasher.cpp
+TER/tercalc.cpp
+TER/tools.cpp
TerScorer.cpp
CderScorer.cpp
MergeScorer.cpp
diff --git a/mert/MergeScorer.cpp b/mert/MergeScorer.cpp
index 0f0da39c3..1dbae600f 100644
--- a/mert/MergeScorer.cpp
+++ b/mert/MergeScorer.cpp
@@ -8,8 +8,8 @@
#include "PerScorer.h"
#include "CderScorer.h"
-#include "TERsrc/tercalc.h"
-#include "TERsrc/terAlignment.h"
+#include "TER/tercalc.h"
+#include "TER/terAlignment.h"
using namespace TERCpp;
diff --git a/mert/MergeScorer.h b/mert/MergeScorer.h
index cc657b718..78d8551d6 100644
--- a/mert/MergeScorer.h
+++ b/mert/MergeScorer.h
@@ -1,5 +1,5 @@
-#ifndef __MERGESCORER_H__
-#define __MERGESCORER_H__
+#ifndef MERT_MERGE_SCORER_H_
+#define MERT_MERGE_SCORER_H_
#include <iostream>
#include <set>
@@ -40,4 +40,4 @@ protected:
MergeScorer& operator=(const MergeScorer&);
};
-#endif //__TERSCORER_H
+#endif // MERT_MERGE_SCORER_H_
diff --git a/mert/Optimizer.h b/mert/Optimizer.h
index 69c7a7641..4a964665d 100644
--- a/mert/Optimizer.h
+++ b/mert/Optimizer.h
@@ -1,5 +1,5 @@
-#ifndef OPTIMIZER_H
-#define OPTIMIZER_H
+#ifndef MERT_OPTIMIZER_H_
+#define MERT_OPTIMIZER_H_
#include <vector>
#include <string>
diff --git a/mert/PerScorer.h b/mert/PerScorer.h
index f06e2955a..f42974357 100644
--- a/mert/PerScorer.h
+++ b/mert/PerScorer.h
@@ -1,5 +1,5 @@
-#ifndef __PERSCORER_H__
-#define __PERSCORER_H__
+#ifndef MERT_PER_SCORER_H_
+#define MERT_PER_SCORER_H_
#include <iostream>
#include <set>
@@ -49,4 +49,4 @@ private:
vector<multiset<int> > m_ref_tokens;
};
-#endif // __PERSCORER_H__
+#endif // MERT_PER_SCORER_H_
diff --git a/mert/Point.h b/mert/Point.h
index 55d173215..79d7bca52 100644
--- a/mert/Point.h
+++ b/mert/Point.h
@@ -1,5 +1,5 @@
-#ifndef POINT_H
-#define POINT_H
+#ifndef MERT_POINT_H_
+#define MERT_POINT_H_
#include <fstream>
#include <map>
@@ -100,4 +100,4 @@ public:
void SetScore(statscore_t score) { score_ = score; }
};
-#endif // POINT_H
+#endif // MERT_POINT_H
diff --git a/mert/ScopedVector.h b/mert/ScopedVector.h
index 1fbce88b7..6bd84e8c5 100644
--- a/mert/ScopedVector.h
+++ b/mert/ScopedVector.h
@@ -1,5 +1,5 @@
-#ifndef SCOPEDVECTOR_H_
-#define SCOPEDVECTOR_H_
+#ifndef MERT_SCOPED_VECTOR_H_
+#define MERT_SCOPED_VECTOR_H_
#include <vector>
@@ -51,4 +51,4 @@ class ScopedVector {
void operator=(const ScopedVector<T>&);
};
-#endif // SCOPEDVECTOR_H_
+#endif // MERT_SCOPED_VECTOR_H_
diff --git a/mert/ScoreArray.h b/mert/ScoreArray.h
index d07351dc1..5b84e020f 100644
--- a/mert/ScoreArray.h
+++ b/mert/ScoreArray.h
@@ -6,8 +6,8 @@
*
*/
-#ifndef SCORE_ARRAY_H
-#define SCORE_ARRAY_H
+#ifndef MERT_SCORE_ARRAY_H_
+#define MERT_SCORE_ARRAY_H_
using namespace std;
@@ -108,4 +108,4 @@ public:
bool check_consistency() const;
};
-#endif // SCORE_ARRAY_H
+#endif // MERT_SCORE_ARRAY_H_
diff --git a/mert/ScoreData.h b/mert/ScoreData.h
index 68a205bb5..d1a635e9e 100644
--- a/mert/ScoreData.h
+++ b/mert/ScoreData.h
@@ -6,8 +6,8 @@
*
*/
-#ifndef SCORE_DATA_H
-#define SCORE_DATA_H
+#ifndef MERT_SCORE_DATA_H_
+#define MERT_SCORE_DATA_H_
#include <fstream>
#include <vector>
@@ -114,4 +114,4 @@ public:
}
};
-#endif // SCORE_DATA_H
+#endif // MERT_SCORE_DATA_H_
diff --git a/mert/ScoreDataIterator.h b/mert/ScoreDataIterator.h
index 4633b8651..910e92165 100644
--- a/mert/ScoreDataIterator.h
+++ b/mert/ScoreDataIterator.h
@@ -17,8 +17,8 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
***********************************************************************/
-#ifndef _SCORE_DATA_ITERATOR_
-#define _SCORE_DATA_ITERATOR_
+#ifndef MERT_SCORE_DATA_ITERATOR_H_
+#define MERT_SCORE_DATA_ITERATOR_H_
/*
* For loading from the score data file.
@@ -62,4 +62,4 @@ class ScoreDataIterator :
std::vector<ScoreDataItem> m_next;
};
-#endif
+#endif // MERT_SCORE_DATA_ITERATOR_H_
diff --git a/mert/ScoreStats.h b/mert/ScoreStats.h
index 74b9a2cf2..6e13f6795 100644
--- a/mert/ScoreStats.h
+++ b/mert/ScoreStats.h
@@ -6,8 +6,8 @@
*
*/
-#ifndef SCORE_STATS_H
-#define SCORE_STATS_H
+#ifndef MERT_SCORE_STATS_H_
+#define MERT_SCORE_STATS_H_
#include <vector>
#include <iostream>
@@ -101,7 +101,7 @@ public:
};
//ADDED_BY_TS
-bool operator==(const ScoreStats& s1, const ScoreStats& s2);
+bool operator==(const ScoreStats& s1, const ScoreStats& s2);
//END_ADDED
-#endif // SCORE_STATS_H
+#endif // MERT_SCORE_STATS_H_
diff --git a/mert/Scorer.h b/mert/Scorer.h
index f2f54670a..e5e386778 100644
--- a/mert/Scorer.h
+++ b/mert/Scorer.h
@@ -1,5 +1,5 @@
-#ifndef __SCORER_H__
-#define __SCORER_H__
+#ifndef MERT_SCORER_H_
+#define MERT_SCORER_H_
#include <iostream>
#include <sstream>
@@ -171,4 +171,4 @@ class StatisticsBasedScorer : public Scorer
size_t m_regularization_window;
};
-#endif // __SCORER_H__
+#endif // MERT_SCORER_H_
diff --git a/mert/ScorerFactory.h b/mert/ScorerFactory.h
index f6054c770..6752817ef 100644
--- a/mert/ScorerFactory.h
+++ b/mert/ScorerFactory.h
@@ -1,5 +1,5 @@
-#ifndef __SCORER_FACTORY_H
-#define __SCORER_FACTORY_H
+#ifndef MERT_SCORER_FACTORY_H_
+#define MERT_SCORER_FACTORY_H_
#include <vector>
#include <string>
@@ -18,4 +18,4 @@ private:
~ScorerFactory() {}
};
-#endif // __SCORER_FACTORY_H
+#endif // MERT_SCORER_FACTORY_H_
diff --git a/mert/TERsrc/alignmentStruct.cpp b/mert/TER/alignmentStruct.cpp
index 15b4a8032..15b4a8032 100644
--- a/mert/TERsrc/alignmentStruct.cpp
+++ b/mert/TER/alignmentStruct.cpp
diff --git a/mert/TERsrc/alignmentStruct.h b/mert/TER/alignmentStruct.h
index 27e8c35d3..9e9a75468 100644
--- a/mert/TERsrc/alignmentStruct.h
+++ b/mert/TER/alignmentStruct.h
@@ -1,6 +1,5 @@
-#ifndef __TERCPPALIGNMENTSTRUCT_H__
-#define __TERCPPALIGNMENTSTRUCT_H__
-
+#ifndef MERT_TER_ALIGNMENT_STRUCT_H_
+#define MERT_TER_ALIGNMENT_STRUCT_H_
#include <vector>
#include <stdio.h>
@@ -8,7 +7,6 @@
#include <sstream>
#include "tools.h"
-
using namespace std;
using namespace Tools;
@@ -44,4 +42,4 @@ public:
}
-#endif // __TERCPPALIGNMENTSTRUCT_H__
+#endif // MERT_TER_ALIGNMENT_STRUCT_H_
diff --git a/mert/TERsrc/bestShiftStruct.h b/mert/TER/bestShiftStruct.h
index 141ebdeb8..bfebe3b1e 100644
--- a/mert/TERsrc/bestShiftStruct.h
+++ b/mert/TER/bestShiftStruct.h
@@ -1,5 +1,5 @@
-#ifndef __BESTSHIFTSTRUCT_H__
-#define __BESTSHIFTSTRUCT_H__
+#ifndef MERT_TER_BEST_SHIFT_STRUCT_H_
+#define MERT_TER_BEST_SHIFT_STRUCT_H_
#include <vector>
#include <stdio.h>
@@ -47,4 +47,4 @@ public:
}
-#endif // __BESTSHIFTSTRUCT_H__
+#endif // MERT_TER_BEST_SHIFT_STRUCT_H_
diff --git a/mert/TERsrc/hashMap.cpp b/mert/TER/hashMap.cpp
index 469167aaa..469167aaa 100644
--- a/mert/TERsrc/hashMap.cpp
+++ b/mert/TER/hashMap.cpp
diff --git a/mert/TERsrc/hashMap.h b/mert/TER/hashMap.h
index c3e4578e5..85020d041 100644
--- a/mert/TERsrc/hashMap.h
+++ b/mert/TER/hashMap.h
@@ -2,8 +2,8 @@
* Generic hashmap manipulation functions
*/
-#ifndef __HASHMAP_H__
-#define __HASHMAP_H__
+#ifndef MERT_TER_HASHMAP_H_
+#define MERT_TER_HASHMAP_H_
#include "stringHasher.h"
#include <vector>
@@ -40,4 +40,4 @@ public:
}
-#endif // __HASHMAP_H__
+#endif // MERT_TER_HASHMAP_H_
diff --git a/mert/TERsrc/hashMapInfos.cpp b/mert/TER/hashMapInfos.cpp
index 9cd431196..9cd431196 100644
--- a/mert/TERsrc/hashMapInfos.cpp
+++ b/mert/TER/hashMapInfos.cpp
diff --git a/mert/TERsrc/hashMapInfos.h b/mert/TER/hashMapInfos.h
index f4a46acf8..8b56e9d02 100644
--- a/mert/TERsrc/hashMapInfos.h
+++ b/mert/TER/hashMapInfos.h
@@ -1,8 +1,8 @@
/*
* Generic hashmap manipulation functions
*/
-#ifndef __HASHMAPINFOS_H__
-#define __HASHMAPINFOS_H__
+#ifndef MERT_TER_HASHMAP_INFOS_H_
+#define MERT_TER_HASHMAP_INFOS_H_
#include "infosHasher.h"
#include <vector>
@@ -39,4 +39,4 @@ public:
}
-#endif // __HASHMAPINFOS_H__
+#endif // MERT_TER_HASHMAP_INFOS_H_
diff --git a/mert/TERsrc/hashMapStringInfos.cpp b/mert/TER/hashMapStringInfos.cpp
index 0fbb0a98a..0fbb0a98a 100644
--- a/mert/TERsrc/hashMapStringInfos.cpp
+++ b/mert/TER/hashMapStringInfos.cpp
diff --git a/mert/TERsrc/hashMapStringInfos.h b/mert/TER/hashMapStringInfos.h
index 7912be0a2..870274f3d 100644
--- a/mert/TERsrc/hashMapStringInfos.h
+++ b/mert/TER/hashMapStringInfos.h
@@ -1,8 +1,8 @@
/*
* Generic hashmap manipulation functions
*/
-#ifndef __HASHMAPSTRINGINFOS_H__
-#define __HASHMAPSTRINGINFOS_H__
+#ifndef MERT_TER_HASHMAP_STRING_INFOS_H_
+#define MERT_TER_HASHMAP_STRING_INFOS_H_
#include "stringInfosHasher.h"
#include <vector>
@@ -39,4 +39,4 @@ public:
}
-#endif // __HASHMAPSTRINGINFOS_H__
+#endif // MERT_TER_HASHMAP_STRING_INFOS_H_
diff --git a/mert/TERsrc/infosHasher.cpp b/mert/TER/infosHasher.cpp
index 654b0b26f..654b0b26f 100644
--- a/mert/TERsrc/infosHasher.cpp
+++ b/mert/TER/infosHasher.cpp
diff --git a/mert/TERsrc/infosHasher.h b/mert/TER/infosHasher.h
index 8bc2ccd00..02a32280b 100644
--- a/mert/TERsrc/infosHasher.h
+++ b/mert/TER/infosHasher.h
@@ -1,5 +1,5 @@
-#ifndef __INFOSHASHER_H__
-#define __INFOSHASHER_H__
+#ifndef MERT_TER_INFO_SHASHER_H_
+#define MERT_TER_INFO_SHASHER_H_
#include <string>
#include <stdio.h>
@@ -28,4 +28,4 @@ public:
}
-#endif // __INFOSHASHER_H__
+#endif // MERT_TER_INFO_SHASHER_H_
diff --git a/mert/TERsrc/stringHasher.cpp b/mert/TER/stringHasher.cpp
index 24fde0e32..24fde0e32 100644
--- a/mert/TERsrc/stringHasher.cpp
+++ b/mert/TER/stringHasher.cpp
diff --git a/mert/TERsrc/stringHasher.h b/mert/TER/stringHasher.h
index 0894812f0..897bd9ff5 100644
--- a/mert/TERsrc/stringHasher.h
+++ b/mert/TER/stringHasher.h
@@ -1,5 +1,5 @@
-#ifndef __STRINGHASHER_H__
-#define __STRINGHASHER_H__
+#ifndef MERT_TER_STRING_HASHER_H_
+#define MERT_TER_STRING_HASHER_H_
#include <string>
#include <iostream>
@@ -25,4 +25,4 @@ public:
}
-#endif // __STRINGHASHER_H__
+#endif // MERT_TER_STRING_HASHER_H_
diff --git a/mert/TERsrc/stringInfosHasher.cpp b/mert/TER/stringInfosHasher.cpp
index 3e02e7a20..3e02e7a20 100644
--- a/mert/TERsrc/stringInfosHasher.cpp
+++ b/mert/TER/stringInfosHasher.cpp
diff --git a/mert/TERsrc/stringInfosHasher.h b/mert/TER/stringInfosHasher.h
index e9324cc47..c1b891662 100644
--- a/mert/TERsrc/stringInfosHasher.h
+++ b/mert/TER/stringInfosHasher.h
@@ -1,5 +1,5 @@
-#ifndef __STRINGINFOSHASHER_H__
-#define __STRINGINFOSHASHER_H__
+#ifndef MERT_TER_STRING_INFOS_HASHER_H_
+#define MERT_TER_STRING_INFOS_HASHER_H_
#include <string>
#include <iostream>
@@ -25,4 +25,4 @@ public:
}
-#endif // __STRINGINFOSHASHER_H__
+#endif // MERT_TER_STRING_INFOS_HASHER_H_
diff --git a/mert/TERsrc/terAlignment.cpp b/mert/TER/terAlignment.cpp
index 87be53b11..87be53b11 100644
--- a/mert/TERsrc/terAlignment.cpp
+++ b/mert/TER/terAlignment.cpp
diff --git a/mert/TERsrc/terAlignment.h b/mert/TER/terAlignment.h
index bca00ead3..c8c82eac8 100644
--- a/mert/TERsrc/terAlignment.h
+++ b/mert/TER/terAlignment.h
@@ -1,5 +1,5 @@
-#ifndef __TERCPPTERALIGNMENT_H__
-#define __TERCPPTERALIGNMENT_H__
+#ifndef MERT_TER_TER_ALIGNMENT_H_
+#define MERT_TER_TER_ALIGNMENT_H_
#include <vector>
#include <stdio.h>
@@ -48,4 +48,4 @@ public:
}
-#endif // __TERCPPTERALIGNMENT_H__
+#endif // MERT_TER_TER_ALIGNMENT_H__
diff --git a/mert/TERsrc/terShift.cpp b/mert/TER/terShift.cpp
index 428803849..428803849 100644
--- a/mert/TERsrc/terShift.cpp
+++ b/mert/TER/terShift.cpp
diff --git a/mert/TERsrc/terShift.h b/mert/TER/terShift.h
index a54ba633d..679a7c8bb 100644
--- a/mert/TERsrc/terShift.h
+++ b/mert/TER/terShift.h
@@ -1,5 +1,5 @@
-#ifndef __TERCPPTERSHIFT_H__
-#define __TERCPPTERSHIFT_H__
+#ifndef MERT_TER_TER_SHIFT_H_
+#define MERT_TER_TER_SHIFT_H_
#include <vector>
#include <stdio.h>
@@ -41,4 +41,4 @@ public:
}
-#endif // __TERCPPTERSHIFT_H__
+#endif // MERT_TER_TER_SHIFT_H_
diff --git a/mert/TERsrc/tercalc.cpp b/mert/TER/tercalc.cpp
index e16f692e8..e16f692e8 100644
--- a/mert/TERsrc/tercalc.cpp
+++ b/mert/TER/tercalc.cpp
diff --git a/mert/TERsrc/tercalc.h b/mert/TER/tercalc.h
index cf205ccbb..9e1a01f65 100644
--- a/mert/TERsrc/tercalc.h
+++ b/mert/TER/tercalc.h
@@ -1,5 +1,5 @@
-#ifndef _TERCPPTERCALC_H___
-#define _TERCPPTERCALC_H___
+#ifndef MERT_TER_TER_CALC_H_
+#define MERT_TER_TER_CALC_H_
#include <vector>
#include <stdio.h>
@@ -79,4 +79,4 @@ public:
}
-#endif // _TERCPPTERCALC_H___
+#endif // MERT_TER_TER_CALC_H_
diff --git a/mert/TERsrc/tools.cpp b/mert/TER/tools.cpp
index 2d910ec05..2d910ec05 100644
--- a/mert/TERsrc/tools.cpp
+++ b/mert/TER/tools.cpp
diff --git a/mert/TERsrc/tools.h b/mert/TER/tools.h
index df681a2b2..6f78b9a6a 100644
--- a/mert/TERsrc/tools.h
+++ b/mert/TER/tools.h
@@ -1,5 +1,5 @@
-#ifndef __TERCPPTOOLS_H__
-#define __TERCPPTOOLS_H__
+#ifndef MERT_TER_TOOLS_H_
+#define MERT_TER_TOOLS_H_
#include <vector>
#include <iostream>
@@ -62,4 +62,4 @@ param copyParam(param p);
}
-#endif // __TERCPPTOOLS_H__
+#endif // MERT_TER_TOOLS_H_
diff --git a/mert/TerScorer.cpp b/mert/TerScorer.cpp
index ac029b027..e5e670cc2 100644
--- a/mert/TerScorer.cpp
+++ b/mert/TerScorer.cpp
@@ -5,8 +5,8 @@
#include <stdexcept>
#include "ScoreStats.h"
-#include "TERsrc/tercalc.h"
-#include "TERsrc/terAlignment.h"
+#include "TER/tercalc.h"
+#include "TER/terAlignment.h"
#include "Util.h"
using namespace TERCpp;
diff --git a/mert/TerScorer.h b/mert/TerScorer.h
index 7ffb4c741..46b02924e 100644
--- a/mert/TerScorer.h
+++ b/mert/TerScorer.h
@@ -1,5 +1,5 @@
-#ifndef __TERSCORER_H__
-#define __TERSCORER_H__
+#ifndef MERT_TER_SCORER_H_
+#define MERT_TER_SCORER_H_
#include <iostream>
#include <set>
@@ -54,4 +54,4 @@ private:
TerScorer& operator=(const TerScorer&);
};
-#endif // __TERSCORER_H__
+#endif // MERT_TER_SCORER_H_
diff --git a/mert/Timer.h b/mert/Timer.h
index 403547620..1b7d391fb 100644
--- a/mert/Timer.h
+++ b/mert/Timer.h
@@ -1,5 +1,5 @@
-#ifndef TIMER_H
-#define TIMER_H
+#ifndef MERT_TIMER_H_
+#define MERT_TIMER_H_
#include <ctime>
#include <iostream>
@@ -64,4 +64,4 @@ inline std::ostream& operator<<(std::ostream& os, Timer& t)
return os;
}
-#endif // TIMER_H
+#endif // MERT_TIMER_H_
diff --git a/mert/Types.h b/mert/Types.h
index 1d0fd0dd0..c65c6ffc2 100644
--- a/mert/Types.h
+++ b/mert/Types.h
@@ -1,5 +1,5 @@
-#ifndef TYPE_H
-#define TYPE_H
+#ifndef MERT_TYPE_H_
+#define MERT_TYPE_H_
#include <vector>
#include <map>
@@ -40,4 +40,4 @@ typedef vector<ScoreArray> scoredata_t;
typedef map<size_t, std::string> idx2name;
typedef map<std::string, size_t> name2idx;
-#endif // TYPE_H
+#endif // MERT_TYPE_H_
diff --git a/mert/Util.h b/mert/Util.h
index 103901efa..415dddd33 100644
--- a/mert/Util.h
+++ b/mert/Util.h
@@ -6,8 +6,8 @@
*
*/
-#ifndef UTIL_H
-#define UTIL_H
+#ifndef MERT_UTIL_H_
+#define MERT_UTIL_H_
#include <cstdlib>
#include <stdexcept>
@@ -100,4 +100,4 @@ void ResetUserTime();
void PrintUserTime(const std::string &message);
double GetUserTime();
-#endif // UTIL_H
+#endif // MERT_UTIL_H_
diff --git a/mert/gzfilebuf.h b/mert/gzfilebuf.h
index f9cd8a446..3a5ef90dd 100644
--- a/mert/gzfilebuf.h
+++ b/mert/gzfilebuf.h
@@ -1,5 +1,5 @@
-#ifndef _GZFILEBUF_H_
-#define _GZFILEBUF_H_
+#ifndef MERT_GZFILEBUF_H_
+#define MERT_GZFILEBUF_H_
#include <streambuf>
#include <zlib.h>
@@ -82,4 +82,4 @@ private:
char _buff[_buffsize];
};
-#endif // _GZFILEBUF_H_
+#endif // MERT_GZFILEBUF_H_
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 22:17:34 +0300