diff options
author | Hieu Hoang <hieuhoang@gmail.com> | 2017-09-26 12:54:39 +0300 |
---|---|---|
committer | Hieu Hoang <hieuhoang@gmail.com> | 2017-09-26 12:54:39 +0300 |
commit | 65c75ff0739ee2f88fc423ec1ad074e1b9b4a9b8 (patch) | |
tree | b54a4affcbe560b6b71ccf55c3d4a8f102b992e0 | |
parent | d3c2c0bda54cd8992742953d68dc06d86284d196 (diff) |
use std::unordered_set instead of boost::unordered_set for all instances in moses2. To avoid confusionRELEASE-4.0RELEASE-4.0
22 files changed, 23 insertions, 36 deletions
diff --git a/moses2/FF/StatefulFeatureFunction.h b/moses2/FF/StatefulFeatureFunction.h index 7cb3eaae9..c88eddead 100644 --- a/moses2/FF/StatefulFeatureFunction.h +++ b/moses2/FF/StatefulFeatureFunction.h @@ -5,8 +5,7 @@ * Author: hieu */ -#ifndef STATEFULFEATUREFUNCTION_H_ -#define STATEFULFEATUREFUNCTION_H_ +#pragma once #include "FeatureFunction.h" #include "FFState.h" @@ -63,4 +62,3 @@ protected: } -#endif /* STATEFULFEATUREFUNCTION_H_ */ diff --git a/moses2/FF/StatelessFeatureFunction.h b/moses2/FF/StatelessFeatureFunction.h index 249e4fdfe..0ad0aaba4 100644 --- a/moses2/FF/StatelessFeatureFunction.h +++ b/moses2/FF/StatelessFeatureFunction.h @@ -5,8 +5,7 @@ * Author: hieu */ -#ifndef STATELESSFEATUREFUNCTION_H_ -#define STATELESSFEATUREFUNCTION_H_ +#pragma once #include "FeatureFunction.h" @@ -22,4 +21,3 @@ public: } -#endif /* STATELESSFEATUREFUNCTION_H_ */ diff --git a/moses2/HypothesisColl.h b/moses2/HypothesisColl.h index f00a2efb0..0c89e8382 100644 --- a/moses2/HypothesisColl.h +++ b/moses2/HypothesisColl.h @@ -6,7 +6,6 @@ */ #pragma once #include <unordered_set> -#include <boost/unordered_set.hpp> #include "HypothesisBase.h" #include "MemPoolAllocator.h" #include "Recycler.h" diff --git a/moses2/Main.cpp b/moses2/Main.cpp index cf833760a..dfdb9de3a 100644 --- a/moses2/Main.cpp +++ b/moses2/Main.cpp @@ -107,7 +107,7 @@ void Temp() Moses2::MemPool pool; Moses2::MemPoolAllocator<int> a(pool); - boost::unordered_set<int, boost::hash<int>, std::equal_to<int>, Moses2::MemPoolAllocator<int> > s(a); + std::unordered_set<int, boost::hash<int>, std::equal_to<int>, Moses2::MemPoolAllocator<int> > s(a); s.insert(3); s.insert(4); s.insert(3); diff --git a/moses2/Phrase.h b/moses2/Phrase.h index 100701483..a6f496184 100644 --- a/moses2/Phrase.h +++ b/moses2/Phrase.h @@ -7,6 +7,7 @@ #pragma once +#include <boost/functional/hash.hpp> #include <cstddef> #include <string> #include <sstream> diff --git a/moses2/PhraseBased/CubePruningMiniStack/Misc.h b/moses2/PhraseBased/CubePruningMiniStack/Misc.h index 4fc576cba..8e746a83e 100644 --- a/moses2/PhraseBased/CubePruningMiniStack/Misc.h +++ b/moses2/PhraseBased/CubePruningMiniStack/Misc.h @@ -7,7 +7,7 @@ #pragma once #include <boost/pool/pool_alloc.hpp> #include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> +#include <unordered_set> #include <vector> #include <queue> #include "../../legacy/Range.h" @@ -70,7 +70,7 @@ public: std::vector<QueueItem*, MemPoolAllocator<QueueItem*> >, QueueItemOrderer> Queue; typedef std::pair<const CubeEdge*, int> SeenPositionItem; - typedef boost::unordered_set<SeenPositionItem, boost::hash<SeenPositionItem>, + typedef std::unordered_set<SeenPositionItem, boost::hash<SeenPositionItem>, std::equal_to<SeenPositionItem>, MemPoolAllocator<SeenPositionItem> > SeenPositions; const Hypotheses &hypos; diff --git a/moses2/PhraseBased/CubePruningMiniStack/Search.cpp b/moses2/PhraseBased/CubePruningMiniStack/Search.cpp index 74103d211..785eff926 100644 --- a/moses2/PhraseBased/CubePruningMiniStack/Search.cpp +++ b/moses2/PhraseBased/CubePruningMiniStack/Search.cpp @@ -110,7 +110,7 @@ void Search::Decode(size_t stackInd) /* cerr << "edges: "; - boost::unordered_set<const Bitmap*> uniqueBM; + std::unordered_set<const Bitmap*> uniqueBM; BOOST_FOREACH(CubeEdge *edge, edges) { uniqueBM.insert(&edge->newBitmap); //cerr << *edge << " "; diff --git a/moses2/PhraseBased/CubePruningMiniStack/Stack.h b/moses2/PhraseBased/CubePruningMiniStack/Stack.h index abd564b3f..c3a14b222 100644 --- a/moses2/PhraseBased/CubePruningMiniStack/Stack.h +++ b/moses2/PhraseBased/CubePruningMiniStack/Stack.h @@ -6,7 +6,6 @@ */ #pragma once #include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <deque> #include "../Hypothesis.h" #include "../../TypeDef.h" diff --git a/moses2/PhraseBased/Manager.cpp b/moses2/PhraseBased/Manager.cpp index 28073d4f6..0a1f51dbd 100644 --- a/moses2/PhraseBased/Manager.cpp +++ b/moses2/PhraseBased/Manager.cpp @@ -6,7 +6,7 @@ */ #include <boost/foreach.hpp> #include <boost/functional/hash.hpp> -#include <boost/unordered_set.hpp> +#include <unordered_set> #include <vector> #include <sstream> #include "Manager.h" @@ -218,7 +218,7 @@ std::string Manager::OutputNBest() { arcLists.Sort(); - boost::unordered_set<size_t> distinctHypos; + std::unordered_set<size_t> distinctHypos; TrellisPaths<TrellisPath> contenders; m_search->AddInitialTrellisPaths(contenders); diff --git a/moses2/PhraseBased/Normal/Stack.h b/moses2/PhraseBased/Normal/Stack.h index 4ad707ce4..62675a5c1 100644 --- a/moses2/PhraseBased/Normal/Stack.h +++ b/moses2/PhraseBased/Normal/Stack.h @@ -6,7 +6,6 @@ */ #pragma once -#include <boost/unordered_set.hpp> #include <deque> #include "../Hypothesis.h" #include "../../TypeDef.h" diff --git a/moses2/SCFG/Misc.h b/moses2/SCFG/Misc.h index 27b9df79a..6eb107499 100644 --- a/moses2/SCFG/Misc.h +++ b/moses2/SCFG/Misc.h @@ -7,7 +7,7 @@ #pragma once #include <vector> #include <queue> -#include <boost/unordered_set.hpp> +#include <unordered_set> #include "../HypothesisColl.h" #include "../Vector.h" #include "Hypothesis.h" @@ -60,7 +60,7 @@ public: protected: - typedef boost::unordered_set<const SeenPosition*, + typedef std::unordered_set<const SeenPosition*, UnorderedComparer<SeenPosition>, UnorderedComparer<SeenPosition> > Coll; Coll m_coll; }; diff --git a/moses2/SCFG/nbest/NBests.h b/moses2/SCFG/nbest/NBests.h index 97fe9a025..7cddec1be 100644 --- a/moses2/SCFG/nbest/NBests.h +++ b/moses2/SCFG/nbest/NBests.h @@ -6,7 +6,7 @@ */ #pragma once -#include <boost/unordered_set.hpp> +#include <unordered_set> #include "NBest.h" namespace Moses2 @@ -18,7 +18,7 @@ class NBests { public: Contenders contenders; - boost::unordered_set<size_t> distinctHypos; + std::unordered_set<size_t> distinctHypos; NBests(const SCFG::Manager &mgr, const ArcList &arcList, diff --git a/moses2/defer/CubePruningBitmapStack/Misc.h b/moses2/defer/CubePruningBitmapStack/Misc.h index 355f8f4c2..e0acdcd1a 100644 --- a/moses2/defer/CubePruningBitmapStack/Misc.h +++ b/moses2/defer/CubePruningBitmapStack/Misc.h @@ -7,7 +7,6 @@ #pragma once #include <boost/pool/pool_alloc.hpp> #include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <vector> #include <queue> #include "../../legacy/Range.h" @@ -72,7 +71,7 @@ public: QueueItemOrderer> Queue; typedef std::pair<const CubeEdge*, int> SeenPositionItem; - typedef boost::unordered_set<SeenPositionItem, + typedef std::unordered_set<SeenPositionItem, boost::hash<SeenPositionItem>, std::equal_to<SeenPositionItem> > SeenPositions; diff --git a/moses2/defer/CubePruningBitmapStack/Search.cpp b/moses2/defer/CubePruningBitmapStack/Search.cpp index 8c06f1340..19e247796 100644 --- a/moses2/defer/CubePruningBitmapStack/Search.cpp +++ b/moses2/defer/CubePruningBitmapStack/Search.cpp @@ -96,7 +96,7 @@ void Search::Decode(size_t stackInd) /* cerr << "edges: "; - boost::unordered_set<const Bitmap*> uniqueBM; + std::unordered_set<const Bitmap*> uniqueBM; BOOST_FOREACH(CubeEdge *edge, edges) { uniqueBM.insert(&edge->newBitmap); //cerr << *edge << " "; diff --git a/moses2/defer/CubePruningBitmapStack/Stack.h b/moses2/defer/CubePruningBitmapStack/Stack.h index f052fab42..b4d6ee1be 100644 --- a/moses2/defer/CubePruningBitmapStack/Stack.h +++ b/moses2/defer/CubePruningBitmapStack/Stack.h @@ -6,7 +6,6 @@ */ #pragma once #include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <deque> #include "../Hypothesis.h" #include "../../TypeDef.h" @@ -27,7 +26,7 @@ typedef Vector<const Hypothesis*> Hypotheses; class MiniStack { public: - typedef boost::unordered_set<const Hypothesis*, + typedef std::unordered_set<const Hypothesis*, UnorderedComparer<Hypothesis>, UnorderedComparer<Hypothesis> > _HCType; diff --git a/moses2/defer/CubePruningCardinalStack/Misc.h b/moses2/defer/CubePruningCardinalStack/Misc.h index 9f5d28f1e..d04c299d1 100644 --- a/moses2/defer/CubePruningCardinalStack/Misc.h +++ b/moses2/defer/CubePruningCardinalStack/Misc.h @@ -7,7 +7,6 @@ #pragma once #include <boost/pool/pool_alloc.hpp> #include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <vector> #include <queue> #include "../../legacy/Range.h" @@ -72,7 +71,7 @@ public: QueueItemOrderer> Queue; typedef std::pair<const CubeEdge*, int> SeenPositionItem; - typedef boost::unordered_set<SeenPositionItem, + typedef std::unordered_set<SeenPositionItem, boost::hash<SeenPositionItem>, std::equal_to<SeenPositionItem> > SeenPositions; diff --git a/moses2/defer/CubePruningCardinalStack/Search.cpp b/moses2/defer/CubePruningCardinalStack/Search.cpp index 23cae74eb..6f72a53f8 100644 --- a/moses2/defer/CubePruningCardinalStack/Search.cpp +++ b/moses2/defer/CubePruningCardinalStack/Search.cpp @@ -96,7 +96,7 @@ void Search::Decode(size_t stackInd) /* cerr << "edges: "; - boost::unordered_set<const Bitmap*> uniqueBM; + std::unordered_set<const Bitmap*> uniqueBM; BOOST_FOREACH(CubeEdge *edge, edges) { uniqueBM.insert(&edge->newBitmap); //cerr << *edge << " "; diff --git a/moses2/defer/CubePruningCardinalStack/Stack.h b/moses2/defer/CubePruningCardinalStack/Stack.h index 94e987b7b..06ca54a57 100644 --- a/moses2/defer/CubePruningCardinalStack/Stack.h +++ b/moses2/defer/CubePruningCardinalStack/Stack.h @@ -6,7 +6,6 @@ */ #pragma once #include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <deque> #include "../Hypothesis.h" #include "../../TypeDef.h" @@ -29,7 +28,7 @@ typedef Vector<const Hypothesis*> Hypotheses; class Stack { protected: - typedef boost::unordered_set<const Hypothesis*, + typedef std::unordered_set<const Hypothesis*, UnorderedComparer<Hypothesis>, UnorderedComparer<Hypothesis> > _HCType; diff --git a/moses2/defer/CubePruningPerBitmap/Misc.h b/moses2/defer/CubePruningPerBitmap/Misc.h index 3fa22f9a6..6a17e66a3 100644 --- a/moses2/defer/CubePruningPerBitmap/Misc.h +++ b/moses2/defer/CubePruningPerBitmap/Misc.h @@ -7,7 +7,6 @@ #pragma once #include <boost/pool/pool_alloc.hpp> #include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <vector> #include <queue> #include "../../legacy/Range.h" @@ -72,7 +71,7 @@ public: QueueItemOrderer> Queue; typedef std::pair<const CubeEdge*, int> SeenPositionItem; - typedef boost::unordered_set<SeenPositionItem, + typedef std::unordered_set<SeenPositionItem, boost::hash<SeenPositionItem>, std::equal_to<SeenPositionItem> > SeenPositions; diff --git a/moses2/defer/CubePruningPerMiniStack/Misc.h b/moses2/defer/CubePruningPerMiniStack/Misc.h index 511fd42f5..7b48e31bd 100644 --- a/moses2/defer/CubePruningPerMiniStack/Misc.h +++ b/moses2/defer/CubePruningPerMiniStack/Misc.h @@ -7,7 +7,6 @@ #pragma once #include <boost/pool/pool_alloc.hpp> #include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <vector> #include <queue> #include "../../legacy/Range.h" @@ -72,7 +71,7 @@ public: QueueItemOrderer> Queue; typedef std::pair<const CubeEdge*, int> SeenPositionItem; - typedef boost::unordered_set<SeenPositionItem, + typedef std::unordered_set<SeenPositionItem, boost::hash<SeenPositionItem>, std::equal_to<SeenPositionItem> > SeenPositions; diff --git a/moses2/legacy/Bitmaps.h b/moses2/legacy/Bitmaps.h index aa0ea8f82..f07318f93 100644 --- a/moses2/legacy/Bitmaps.h +++ b/moses2/legacy/Bitmaps.h @@ -1,6 +1,5 @@ #pragma once -#include <boost/unordered_set.hpp> #include <boost/unordered_map.hpp> #include <set> #include <stack> diff --git a/moses2/legacy/FactorCollection.h b/moses2/legacy/FactorCollection.h index 1b29dee69..fb6a646f4 100644 --- a/moses2/legacy/FactorCollection.h +++ b/moses2/legacy/FactorCollection.h @@ -31,7 +31,7 @@ #endif #include "util/murmur_hash.hh" -#include <boost/unordered_set.hpp> +#include <unordered_set> #include <functional> #include <string> @@ -82,7 +82,7 @@ class FactorCollection return left.in.GetString() == right.in.GetString(); } }; - typedef boost::unordered_set<FactorFriend, HashFactor, EqualsFactor> Set; + typedef std::unordered_set<FactorFriend, HashFactor, EqualsFactor> Set; Set m_set; Set m_setNonTerminal; |