diff options
| author | Kenneth Heafield <github@kheafield.com> | 2012-10-22 12:07:20 +0100 |
|---|---|---|
| committer | Kenneth Heafield <github@kheafield.com> | 2012-10-22 12:07:20 +0100 |
| commit | 5f98fe5c4f2a2090eeb9d30c030305a70a8347d1 (patch) | |
| tree | 9b6002f850e6dea1e3400c6b19bb31a9cdf3067f /rst_parser/rst.h | |
| parent | cf9994131993b40be62e90e213b1e11e6b550143 (diff) | |
| parent | 21825a09d97c2e0afd20512f306fb25fed55e529 (diff) | |
Merge remote branch 'upstream/master'
Conflicts:
Jamroot
bjam
decoder/Jamfile
decoder/cdec.cc
dpmert/Jamfile
jam-files/sanity.jam
klm/lm/Jamfile
klm/util/Jamfile
mira/Jamfile
Diffstat (limited to 'rst_parser/rst.h')
| -rw-r--r-- | rst_parser/rst.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/rst_parser/rst.h b/rst_parser/rst.h deleted file mode 100644 index 8bf389f7..00000000 --- a/rst_parser/rst.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _RST_H_ -#define _RST_H_ - -#include <vector> -#include "sampler.h" -#include "arc_factored.h" -#include "alias_sampler.h" - -struct TreeSampler { - explicit TreeSampler(const ArcFactoredForest& af); - void SampleRandomSpanningTree(EdgeSubset* tree, MT19937* rng); - const ArcFactoredForest& forest; -#define USE_ALIAS_SAMPLER 1 -#if USE_ALIAS_SAMPLER - std::vector<AliasSampler> usucc; -#else - std::vector<SampleSet<double> > usucc; -#endif -}; - -#endif |