reHC*, use 'real id's for user-specified assumptions/constraints.

yp · Jun 15, 2011 · eb0ed49 · eb0ed49
1 parent 67ce21e
commit eb0ed49
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/include/assumptions.hpp b/include/assumptions.hpp
@@ -30,12 +30,14 @@
 
 
 #include "pedcnf.hpp"
+#include "pedigree.hpp"
+#include "io-pedigree.hpp"
 
 #include <istream>
 
-
 void
 add_assumptions(std::istream& is,
+					 const plink_reader_t<>::multifamily_pedigree_t::pedigree_t& ped,
 					 pedcnf_t& cnf);
 
 #endif
diff --git a/include/rehc_app.hpp b/include/rehc_app.hpp
@@ -201,7 +201,7 @@ class rehcstar_t:
 	 if (has_assumptions) {
 		std::ifstream assumptions(assumption_file);
 		if (assumptions) {
-		  add_assumptions(assumptions, cnf);
+		  add_assumptions(assumptions, mped.families().front(), cnf);
 		  assumptions.close();
 		} else {
 		  L_FATAL("Impossible to open assumption file '" << assumption_file << "'. Aborting...");

diff --git a/src/lib/assumptions.cpp b/src/lib/assumptions.cpp
@@ -49,8 +49,12 @@ operator>>(std::istream& in, pedcnf_t::pedvar_t& var) {
 
 class assumption_manager_t
   :public log_able_t<assumption_manager_t> {
+public:
+  typedef plink_reader_t<>::multifamily_pedigree_t::pedigree_t pedigree_t;
+
 private:
   std::istream& in;
+  const pedigree_t& ped;
   pedcnf_t& cnf;
 
   class invalid_line_t {
@@ -62,8 +66,11 @@ class assumption_manager_t
   };
 
 public:
-  assumption_manager_t(std::istream& _in, pedcnf_t& _cnf)
-		:in(_in), cnf(_cnf)
+
+  assumption_manager_t(std::istream& _in,
+							  const pedigree_t& _ped,
+							  pedcnf_t& _cnf)
+		:in(_in), ped(_ped), cnf(_cnf)
   {
   };
 
@@ -87,6 +94,8 @@ class assumption_manager_t
 			 if (!(is >> value)) throw invalid_line_t("unrecognized boolean value");
 			 L_DEBUG("Read assumption '" << buff << "' ==> ("
 						<< v <<  " == " << (value?"True":"False") << ").");
+			 v.get<1>()= ped.get_by_id(v.get<1>()).progr_id();
+			 L_DEBUG("...and transformed into " << v <<  " == " << (value?"True":"False") << ".");
 			 if (v.get<0>() == ped_var_kind::SP) {
 				if (!cnf.has_sp(v.get<1>(), v.get<2>())) {
 				  L_WARN("Variable '" << v << "' does not exist in the SAT instance."
@@ -163,7 +172,8 @@ class assumption_manager_t
 
 void
 add_assumptions(std::istream& is,
+					 const plink_reader_t<>::multifamily_pedigree_t::pedigree_t& ped,
 					 pedcnf_t& cnf) {
-  assumption_manager_t mgr(is, cnf);
+  assumption_manager_t mgr(is, ped, cnf);
   mgr.add_assumptions();
 };