Merge branch 'master' of nlp.pwr.wroc.pl:wccl

libwccl/ops/functions/bool/predicates/pointagreement.h

@@ -19,10 +19,12 @@ public:
 	PointAgreement(
 		const PosFunctionPtr& pos1_expr,
 		const PosFunctionPtr& pos2_expr,
-		const TSetFunctionPtr& attribs_expr)
+		const TSetFunctionPtr& attribs_expr,
+		const Corpus2::Tagset& tagset)
 		: pos1_expr_(pos1_expr),
 		  pos2_expr_(pos2_expr),
-		  attribs_expr_(attribs_expr)
+		  attribs_expr_(attribs_expr),
+		  tagset_(tagset)
 	{
 		BOOST_ASSERT(pos1_expr_);
 		BOOST_ASSERT(pos2_expr_);
@@ -45,6 +47,7 @@ protected:
 	const PosFunctionPtr pos1_expr_;
 	const PosFunctionPtr pos2_expr_;
 	const TSetFunctionPtr attribs_expr_;
+	const Corpus2::Tagset& tagset_;
 
 	/**
 	 * Gets two positions from arguments. If either of them

libwccl/ops/functions/bool/predicates/strongagreement.h

@@ -18,10 +18,12 @@ public:
 	StrongAgreement(
 		const PosFunctionPtr& left_pos_expr,
 		const PosFunctionPtr& right_pos_expr,
-		const TSetFunctionPtr& attribs_expr)
+		const TSetFunctionPtr& attribs_expr,
+		const Corpus2::Tagset& tagset)
 		: left_pos_expr_(left_pos_expr),
 		  right_pos_expr_(right_pos_expr),
-		  attribs_expr_(attribs_expr)
+		  attribs_expr_(attribs_expr),
+		  tagset_(tagset)
 	{
 		BOOST_ASSERT(left_pos_expr_);
 		BOOST_ASSERT(right_pos_expr_);
@@ -45,6 +47,7 @@ protected:
 	const PosFunctionPtr left_pos_expr_;
 	const PosFunctionPtr right_pos_expr_;
 	const TSetFunctionPtr attribs_expr_;
+	const Corpus2::Tagset& tagset_;
 
 	/**
 	 * Gets start and end positions for range from arguments.

libwccl/ops/functions/bool/predicates/weakagreement.h

@@ -18,10 +18,12 @@ public:
 	WeakAgreement(
 		const PosFunctionPtr& left_pos_expr,
 		const PosFunctionPtr& right_pos_expr,
-		const TSetFunctionPtr& attribs_expr)
+		const TSetFunctionPtr& attribs_expr,
+		const Corpus2::Tagset& tagset)
 		: left_pos_expr_(left_pos_expr),
 		  right_pos_expr_(right_pos_expr),
-		  attribs_expr_(attribs_expr)
+		  attribs_expr_(attribs_expr),
+		  tagset_(tagset)
 	{
 		BOOST_ASSERT(left_pos_expr_);
 		BOOST_ASSERT(right_pos_expr_);
@@ -45,6 +47,7 @@ protected:
 	const PosFunctionPtr left_pos_expr_;
 	const PosFunctionPtr right_pos_expr_;
 	const TSetFunctionPtr attribs_expr_;
+	const Corpus2::Tagset& tagset_;
 
 	/**
 	 * Gets start and end positions for range from arguments.

libwccl/ops/functions/tset/agrfilter.h

@@ -22,11 +22,13 @@ public:
 			const PosFunctionPtr& left_pos_expr,
 			const PosFunctionPtr& right_pos_expr,
 			const TSetFunctionPtr& attribs_expr,
-			const TSetFunctionPtr& mask_expr)
+			const TSetFunctionPtr& mask_expr,
+			const Corpus2::Tagset& tagset)
 		: left_pos_expr_(left_pos_expr),
 		  right_pos_expr_(right_pos_expr),
 		  attribs_expr_(attribs_expr),
-		  mask_expr_(mask_expr)
+		  mask_expr_(mask_expr),
+		  tagset_(tagset)
 	{
 		BOOST_ASSERT(left_pos_expr_);
 		BOOST_ASSERT(right_pos_expr_);
@@ -54,7 +56,7 @@ protected:
 	const TSetFunctionPtr attribs_expr_;
 	const TSetFunctionPtr mask_expr_;
 
-
+	const Corpus2::Tagset& tagset_;
 
 	/**
 	 * Gets range specified via Position expressions. Trims the range