Skip to content
Snippets Groups Projects
Commit 33c13a0f authored by Studer Gabriel's avatar Studer Gabriel
Browse files

rename mtm to el_enumerador

parent 38668d02
Branches
Tags
No related merge requests found
...@@ -7,7 +7,7 @@ set(MODELLING_CPP ...@@ -7,7 +7,7 @@ set(MODELLING_CPP
export_model.cc export_model.cc
export_monte_carlo.cc export_monte_carlo.cc
export_rigid_blocks.cc export_rigid_blocks.cc
export_mtm.cc export_el_enumerador.cc
wrap_modelling.cc wrap_modelling.cc
) )
......
#include <boost/python.hpp> #include <boost/python.hpp>
#include <promod3/core/export_helper.hh> #include <promod3/core/export_helper.hh>
#include <promod3/modelling/mtm.hh> #include <promod3/modelling/el_enumerador.hh>
using namespace ost; using namespace ost;
using namespace boost::python; using namespace boost::python;
...@@ -8,7 +8,7 @@ using namespace promod3::modelling; ...@@ -8,7 +8,7 @@ using namespace promod3::modelling;
namespace{ namespace{
void WrapMTM(ModellingHandle& mhandle, void WrapEnumerador(ModellingHandle& mhandle,
const boost::python::list& loop_candidates, const boost::python::list& loop_candidates,
const boost::python::list& start_resnums, const boost::python::list& start_resnums,
const boost::python::list& chain_indices, const boost::python::list& chain_indices,
...@@ -24,7 +24,7 @@ void WrapMTM(ModellingHandle& mhandle, ...@@ -24,7 +24,7 @@ void WrapMTM(ModellingHandle& mhandle,
promod3::core::ConvertListToVector(chain_indices, v_chain_indices); promod3::core::ConvertListToVector(chain_indices, v_chain_indices);
promod3::core::ConvertDictToMap(weights, m_weights); promod3::core::ConvertDictToMap(weights, m_weights);
promod3::modelling::MTM(mhandle, v_loop_candidates, v_start_resnums, promod3::modelling::ElEnumerador(mhandle, v_loop_candidates, v_start_resnums,
v_chain_indices, m_weights); v_chain_indices, m_weights);
} }
...@@ -34,8 +34,8 @@ void WrapMTM(ModellingHandle& mhandle, ...@@ -34,8 +34,8 @@ void WrapMTM(ModellingHandle& mhandle,
void export_mtm(){ void export_el_enumerador(){
def("MTM", &WrapMTM, (arg("mhandle"),arg("loop_candidates"),arg("start_resnums"),arg("chain_indices"),arg("weights"))); def("ElEnumerador", &WrapEnumerador, (arg("mhandle"),arg("loop_candidates"),arg("start_resnums"),arg("chain_indices"),arg("weights")));
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ void export_loop_candidate(); ...@@ -8,7 +8,7 @@ void export_loop_candidate();
void export_loop_closure(); void export_loop_closure();
void export_monte_carlo(); void export_monte_carlo();
void export_rigid_blocks(); void export_rigid_blocks();
void export_mtm(); void export_el_enumerador();
BOOST_PYTHON_MODULE(_modelling) BOOST_PYTHON_MODULE(_modelling)
{ {
...@@ -20,5 +20,5 @@ BOOST_PYTHON_MODULE(_modelling) ...@@ -20,5 +20,5 @@ BOOST_PYTHON_MODULE(_modelling)
export_loop_closure(); export_loop_closure();
export_monte_carlo(); export_monte_carlo();
export_rigid_blocks(); export_rigid_blocks();
export_mtm(); export_el_enumerador();
} }
...@@ -13,7 +13,7 @@ set(MODELLING_SOURCES ...@@ -13,7 +13,7 @@ set(MODELLING_SOURCES
monte_carlo_sampler.cc monte_carlo_sampler.cc
monte_carlo_scorer.cc monte_carlo_scorer.cc
rigid_blocks.cc rigid_blocks.cc
mtm.cc el_enumerador.cc
) )
set(MODELLING_HEADERS set(MODELLING_HEADERS
...@@ -31,7 +31,7 @@ set(MODELLING_HEADERS ...@@ -31,7 +31,7 @@ set(MODELLING_HEADERS
monte_carlo_sampler.hh monte_carlo_sampler.hh
monte_carlo_scorer.hh monte_carlo_scorer.hh
rigid_blocks.hh rigid_blocks.hh
mtm.hh el_enumerador.hh
) )
module(NAME modelling module(NAME modelling
......
#include <promod3/modelling/mtm.hh> #include <promod3/modelling/el_enumerador.hh>
#include <promod3/core/enumerator.hh> #include <promod3/core/enumerator.hh>
#include <promod3/core/graph.hh> #include <promod3/core/graph.hh>
#include <promod3/core/tree.hh> #include <promod3/core/tree.hh>
...@@ -706,7 +706,7 @@ void Fill(promod3::modelling::ModellingHandle& mhandle, ...@@ -706,7 +706,7 @@ void Fill(promod3::modelling::ModellingHandle& mhandle,
namespace promod3{ namespace modelling{ namespace promod3{ namespace modelling{
void MTM(ModellingHandle& mhandle, void ElEnumerador(ModellingHandle& mhandle,
const std::vector<LoopCandidates>& loop_candidates, const std::vector<LoopCandidates>& loop_candidates,
const std::vector<uint>& start_resnums, const std::vector<uint>& start_resnums,
const std::vector<uint>& chain_indices, const std::vector<uint>& chain_indices,
......
#ifndef PM3_MODELLING_MTM_HH #ifndef PM3_MODELLING_ELENUMERADOR_HH
#define PM3_MODELLING_MTM_HH #define PM3_MODELLING_ELENUMERADOR_HH
#include <promod3/modelling/loop_candidate.hh> #include <promod3/modelling/loop_candidate.hh>
#include <promod3/modelling/model.hh> #include <promod3/modelling/model.hh>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
namespace promod3 { namespace modelling { namespace promod3 { namespace modelling {
void MTM(ModellingHandle& mhandle, void ElEnumerador(ModellingHandle& mhandle,
const std::vector<LoopCandidates>& loop_candidates, const std::vector<LoopCandidates>& loop_candidates,
const std::vector<uint>& start_resnums, const std::vector<uint>& start_resnums,
const std::vector<uint>& chain_indices, const std::vector<uint>& chain_indices,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment