diff --git a/contrib/other-builds/moses/.project b/contrib/other-builds/moses/.project
index de1fc48ce..85e27e694 100644
--- a/contrib/other-builds/moses/.project
+++ b/contrib/other-builds/moses/.project
@@ -1146,14 +1146,14 @@
PARENT-3-PROJECT_LOC/moses/Bitmap.h
- WordsRange.cpp
+ Range.cpp
1
- PARENT-3-PROJECT_LOC/moses/WordsRange.cpp
+ PARENT-3-PROJECT_LOC/moses/Range.cpp
- WordsRange.h
+ Range.h
1
- PARENT-3-PROJECT_LOC/moses/WordsRange.h
+ PARENT-3-PROJECT_LOC/moses/Range.h
XmlOption.cpp
@@ -4956,9 +4956,9 @@
PARENT-3-PROJECT_LOC/moses/bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/Bitmap.o
- bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/WordsRange.o
+ bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/Range.o
1
- PARENT-3-PROJECT_LOC/moses/bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/WordsRange.o
+ PARENT-3-PROJECT_LOC/moses/bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/Range.o
bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/XmlOption.o
diff --git a/contrib/other-builds/moses/moses.project b/contrib/other-builds/moses/moses.project
index a9cf931ed..a4817283d 100644
--- a/contrib/other-builds/moses/moses.project
+++ b/contrib/other-builds/moses/moses.project
@@ -771,8 +771,8 @@
-
-
+
+
diff --git a/moses/BaseManager.h b/moses/BaseManager.h
index ed9ccaffb..5206412db 100644
--- a/moses/BaseManager.h
+++ b/moses/BaseManager.h
@@ -22,7 +22,7 @@ protected:
BaseManager(ttasksptr const& ttask);
// output
- typedef std::vector > ApplicationContext;
+ typedef std::vector > ApplicationContext;
typedef std::set< std::pair > Alignments;
void OutputSurface(std::ostream &out,
diff --git a/moses/Bitmap.h b/moses/Bitmap.h
index ba2c7f941..178845185 100644
--- a/moses/Bitmap.h
+++ b/moses/Bitmap.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include
#include
#include "TypeDef.h"
-#include "WordsRange.h"
+#include "Range.h"
namespace Moses
{
@@ -162,7 +162,7 @@ public:
}
void
- SetValue(WordsRange const& range, bool val) {
+ SetValue(Range const& range, bool val) {
SetValue(range.GetStartPos(), range.GetEndPos(), val);
}
@@ -171,7 +171,7 @@ public:
return GetSize() == GetNumWordsCovered();
}
//! whether the wordrange overlaps with any translated word in this bitmap
- bool Overlap(const WordsRange &compare) const {
+ bool Overlap(const Range &compare) const {
for (size_t pos = compare.GetStartPos() ; pos <= compare.GetEndPos() ; pos++) {
if (m_bitmap[pos])
return true;
diff --git a/moses/BitmapContainer.cpp b/moses/BitmapContainer.cpp
index 794ea81ed..54207ba07 100644
--- a/moses/BitmapContainer.cpp
+++ b/moses/BitmapContainer.cpp
@@ -52,7 +52,7 @@ public:
class HypothesisScoreOrdererWithDistortion
{
public:
- HypothesisScoreOrdererWithDistortion(const WordsRange* transOptRange) :
+ HypothesisScoreOrdererWithDistortion(const Range* transOptRange) :
m_transOptRange(transOptRange) {
m_totalWeightDistortion = 0;
const StaticData &staticData = StaticData::Instance();
@@ -67,7 +67,7 @@ public:
}
}
- const WordsRange* m_transOptRange;
+ const Range* m_transOptRange;
float m_totalWeightDistortion;
bool operator()(const Hypothesis* hypoA, const Hypothesis* hypoB) const {
@@ -136,7 +136,7 @@ BackwardsEdge::BackwardsEdge(const BitmapContainer &prevBitmapContainer
return;
}
- const WordsRange &transOptRange = translations.Get(0)->GetSourceWordsRange();
+ const Range &transOptRange = translations.Get(0)->GetSourceWordsRange();
HypothesisSet::const_iterator iterHypo = m_prevBitmapContainer.GetHypotheses().begin();
HypothesisSet::const_iterator iterEnd = m_prevBitmapContainer.GetHypotheses().end();
@@ -196,7 +196,7 @@ BackwardsEdge::Initialize()
}
const Bitmap &bm = m_hypotheses[0]->GetWordsBitmap();
- const WordsRange &newRange = m_translations.Get(0)->GetSourceWordsRange();
+ const Range &newRange = m_translations.Get(0)->GetSourceWordsRange();
m_futureScore = m_futureScores.CalcFutureScore2(bm, newRange.GetStartPos(), newRange.GetEndPos());
Hypothesis *expanded = CreateHypothesis(*m_hypotheses[0], *m_translations.Get(0));
diff --git a/moses/Bitmaps.cpp b/moses/Bitmaps.cpp
index 9f59fac1c..e6be28cd2 100644
--- a/moses/Bitmaps.cpp
+++ b/moses/Bitmaps.cpp
@@ -20,7 +20,7 @@ Bitmaps::~Bitmaps()
}
}
-const Bitmap &Bitmaps::GetNextBitmap(const Bitmap &bm, const WordsRange &range)
+const Bitmap &Bitmaps::GetNextBitmap(const Bitmap &bm, const Range &range)
{
Bitmap *newBM = new Bitmap(bm);
newBM->SetValue(range, true);
@@ -35,7 +35,7 @@ const Bitmap &Bitmaps::GetNextBitmap(const Bitmap &bm, const WordsRange &range)
}
}
-const Bitmap &Bitmaps::GetBitmap(const Bitmap &bm, const WordsRange &range)
+const Bitmap &Bitmaps::GetBitmap(const Bitmap &bm, const Range &range)
{
Coll::iterator iter = m_coll.find(&bm);
assert(iter != m_coll.end());
diff --git a/moses/Bitmaps.h b/moses/Bitmaps.h
index ce43c6a03..1c49fd884 100644
--- a/moses/Bitmaps.h
+++ b/moses/Bitmaps.h
@@ -11,13 +11,13 @@ namespace Moses
class Bitmaps
{
- typedef boost::unordered_map NextBitmaps;
+ typedef boost::unordered_map NextBitmaps;
typedef boost::unordered_map, UnorderedComparer > Coll;
//typedef std::set > Coll;
Coll m_coll;
const Bitmap *m_initBitmap;
- const Bitmap &GetNextBitmap(const Bitmap &bm, const WordsRange &range);
+ const Bitmap &GetNextBitmap(const Bitmap &bm, const Range &range);
public:
Bitmaps(size_t inputSize, const std::vector &initSourceCompleted);
virtual ~Bitmaps();
@@ -25,7 +25,7 @@ public:
const Bitmap &GetInitialBitmap() const {
return *m_initBitmap;
}
- const Bitmap &GetBitmap(const Bitmap &bm, const WordsRange &range);
+ const Bitmap &GetBitmap(const Bitmap &bm, const Range &range);
};
diff --git a/moses/ChartCell.cpp b/moses/ChartCell.cpp
index 02f132bae..f0a25986a 100644
--- a/moses/ChartCell.cpp
+++ b/moses/ChartCell.cpp
@@ -25,7 +25,7 @@
#include "HypergraphOutput.h"
#include "RuleCubeQueue.h"
#include "RuleCube.h"
-#include "WordsRange.h"
+#include "Range.h"
#include "Util.h"
#include "StaticData.h"
#include "ChartTranslationOptions.h"
diff --git a/moses/ChartCell.h b/moses/ChartCell.h
index 348bfd336..9bd21f585 100644
--- a/moses/ChartCell.h
+++ b/moses/ChartCell.h
@@ -26,7 +26,7 @@
#include