Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile.am
	configure.ac

1 files changed, 28 insertions, 0 deletions

diff --git a/rst_parser/arc_ff.h b/rst_parser/arc_ff.h
new file mode 100644
index 00000000..52f311d2
--- /dev/null
+++ b/rst_parser/arc_ff.h
@@ -0,0 +1,28 @@
+#ifndef _ARC_FF_H_
+#define _ARC_FF_H_
+
+#include <string>
+#include "sparse_vector.h"
+#include "weights.h"
+#include "arc_factored.h"
+
+struct TaggedSentence;
+struct ArcFFImpl;
+class ArcFeatureFunctions {
+ public:
+  ArcFeatureFunctions();
+  ~ArcFeatureFunctions();
+
+  // called once, per input, before any calls to EdgeFeatures
+  // used to initialize sentence-specific data structures
+  void PrepareForInput(const TaggedSentence& sentence);
+
+  void EdgeFeatures(const TaggedSentence& sentence,
+                    short h,
+                    short m,
+                    SparseVector<weight_t>* features) const;
+ private:
+  ArcFFImpl* pimpl;
+};
+
+#endif