fixed conflicts

1 files changed, 7 insertions, 5 deletions

diff --git a/mteval/ns_docscorer.h b/mteval/ns_docscorer.h
index 170ac627..b3c28fc9 100644
--- a/mteval/ns_docscorer.h
+++ b/mteval/ns_docscorer.h
@@ -5,26 +5,28 @@
 #include <string>
 #include <boost/shared_ptr.hpp>
 
-struct EvaluationMetric;
+class EvaluationMetric;
 struct SegmentEvaluator;
 class DocumentScorer {
  public:
   ~DocumentScorer();
-  DocumentScorer() {  }
+  DocumentScorer();
   DocumentScorer(const EvaluationMetric* metric,
                  const std::vector<std::string>& ref_files,
                  const std::string& src_file = "",
                  bool verbose=false) {
     Init(metric,ref_files,src_file,verbose);
   }
+  DocumentScorer(const EvaluationMetric* metric,
+                 const std::string& src_ref_composite_file);
+  int size() const { return scorers_.size(); }
+  const SegmentEvaluator* operator[](size_t i) const { return scorers_[i].get(); }
+ private:
   void Init(const EvaluationMetric* metric,
             const std::vector<std::string>& ref_files,
             const std::string& src_file = "",
             bool verbose=false);
 
-  int size() const { return scorers_.size(); }
-  const SegmentEvaluator* operator[](size_t i) const { return scorers_[i].get(); }
- private:
   std::vector<boost::shared_ptr<SegmentEvaluator> > scorers_;
 };