move constraint construction to scoring module

modelling/pymod/CMakeLists.txt

@@ -6,7 +6,6 @@ set(MODELLING_CPP
   export_loop_closure.cc
   export_model.cc
   export_monte_carlo.cc
-  export_constraint_constructor.cc
   export_rigid_blocks.cc
   export_mtm.cc
   wrap_modelling.cc

modelling/pymod/wrap_modelling.cc

@@ -7,7 +7,6 @@ void export_extension_scheme();
 void export_loop_candidate();
 void export_loop_closure();
 void export_monte_carlo();
-void export_constraint_constructor();
 void export_rigid_blocks();
 void export_mtm();
 
@@ -20,7 +19,6 @@ BOOST_PYTHON_MODULE(_modelling)
   export_loop_candidate();
   export_loop_closure();
   export_monte_carlo();
-  export_constraint_constructor();
   export_rigid_blocks();
   export_mtm();
 }

modelling/src/CMakeLists.txt

@@ -12,7 +12,6 @@ set(MODELLING_SOURCES
   monte_carlo_cooler.cc
   monte_carlo_sampler.cc
   monte_carlo_scorer.cc
-  constraint_constructor.cc
   rigid_blocks.cc
   mtm.cc
 )
@@ -31,7 +30,6 @@ set(MODELLING_HEADERS
   monte_carlo_cooler.hh
   monte_carlo_sampler.hh
   monte_carlo_scorer.hh
-  constraint_constructor.hh
   rigid_blocks.hh
   mtm.hh
 )

scoring/pymod/CMakeLists.txt

@@ -2,6 +2,7 @@ set(SCORING_CPP
 export_backbone_score.cc
 export_object_loader.cc
 export_pairwise_functions.cc
+export_constraint_constructor.cc
 wrap_scoring.cc
 )
 

modelling/pymod/export_constraint_constructor.cc → scoring/pymod/export_constraint_constructor.cc

 #include <boost/python.hpp>
 #include <promod3/core/export_helper.hh>
-#include <promod3/modelling/constraint_constructor.hh>
+#include <promod3/scoring/constraint_constructor.hh>
 
 using namespace boost::python;
 using namespace promod3;
-using namespace promod3::modelling;
+using namespace promod3::scoring;
 
 namespace{
 
@@ -34,7 +34,7 @@ void WrapAttachEvolutionaryConstraintsSingle(promod3::scoring::BackboneScoreEnv&
                                              uint tail_length){
 
   std::vector<uint>  chain_indices(1, chain_idx);
-  promod3::modelling::AttachEvolutionaryConstraints(env, aln, chain_indices, ft, 
+  promod3::scoring::AttachEvolutionaryConstraints(env, aln, chain_indices, ft, 
                                                   fraction_constraints,
                                                   constant_function_length, 
                                                   tail_length);
@@ -50,7 +50,7 @@ void WrapAttachEvolutionaryConstraintsList(promod3::scoring::BackboneScoreEnv& e
 
   std::vector<uint> v_chain_indices;
   core::ConvertListToVector(chain_indices, v_chain_indices); 
-  promod3::modelling::AttachEvolutionaryConstraints(env, aln, v_chain_indices, ft, 
+  promod3::scoring::AttachEvolutionaryConstraints(env, aln, v_chain_indices, ft, 
                                                   fraction_constraints,
                                                   constant_function_length, 
                                                   tail_length);

scoring/pymod/wrap_scoring.cc

@@ -3,7 +3,7 @@
 void export_BackboneScore();
 void export_ObjectLoader();
 void export_PairwiseFunction();
-
+void export_constraint_constructor();
 
 using namespace boost::python;
 
@@ -12,4 +12,5 @@ BOOST_PYTHON_MODULE(_scoring)
   export_BackboneScore(); 
   export_ObjectLoader();
   export_PairwiseFunction();
+  export_constraint_constructor();
 }

scoring/src/CMakeLists.txt

@@ -16,6 +16,7 @@ ss_agreement_score.hh
 torsion_score.hh
 pairwise_scoring_function.hh
 pairwise_score.hh
+constraint_constructor.hh
 )
 
 set(SCORING_SOURCES
@@ -35,6 +36,7 @@ hbond_score.cc
 ss_agreement_score.cc
 torsion_score.cc
 pairwise_score.cc
+constraint_constructor.cc
 )
 
 module(NAME scoring

modelling/src/constraint_constructor.cc → scoring/src/constraint_constructor.cc

-#include <promod3/modelling/constraint_constructor.hh>
+#include <promod3/scoring/constraint_constructor.hh>
 #include <promod3/core/runtime_profiling.hh>
 #include <promod3/core/cluster.hh>
 #include <promod3/core/geom_base.hh>
@@ -177,7 +177,7 @@ bool GenerateDisCo(const std::vector<std::vector<bool> >& valid_residues,
 
 }
 
-namespace promod3 { namespace modelling{
+namespace promod3 { namespace scoring{
 
 DiscoContainer::DiscoContainer(const ost::seq::SequenceHandle& seqres, 
                                promod3::scoring::PairwiseFunctionType ft): 

modelling/src/constraint_constructor.hh → scoring/src/constraint_constructor.hh

-#ifndef PM3_MODELLING_CONSTRAINT_CONSTRUCTOR_HH
-#define PM3_MODELLING_CONSTRAINT_CONSTRUCTOR_HH
+#ifndef PM3_SCORING_CONSTRAINT_CONSTRUCTOR_HH
+#define PM3_SCORING_CONSTRAINT_CONSTRUCTOR_HH
 
 #include <promod3/scoring/backbone_score_base.hh>
 #include <ost/seq/alignment_handle.hh>
@@ -7,9 +7,7 @@
 #include <vector>
 
 
-
-
-namespace promod3 { namespace modelling {
+namespace promod3 { namespace scoring {
 
 class DiscoContainer;
 typedef boost::shared_ptr<DiscoContainer> DiscoContainerPtr;