Skip to content
Snippets Groups Projects
Commit b1c35b14 authored by BIOPZ-Johner Niklaus's avatar BIOPZ-Johner Niklaus
Browse files

Changed export for SuperposeSVD to make it work in python.

Changed std::vec<geom::Vec3> into geom::Vec3List.
parent 481db30f
No related branches found
No related tags found
No related merge requests found
...@@ -35,9 +35,9 @@ using namespace ost::mol::alg; ...@@ -35,9 +35,9 @@ using namespace ost::mol::alg;
void export_svdSuperPose() void export_svdSuperPose()
{ {
SuperpositionResult (*sup1)(const mol::EntityView&,const mol::EntityView&,bool) = SuperposeSVD; SuperpositionResult (*sup1)(const mol::EntityView&,const mol::EntityView&,bool) = SuperposeSVD;
SuperpositionResult (*sup2)(const std::vector<geom::Vec3>&,const std::vector<geom::Vec3>& ) = SuperposeSVD; SuperpositionResult (*sup2)(const geom::Vec3List&,const geom::Vec3List& ) = SuperposeSVD;
SuperpositionResult (*sup3)(const mol::EntityView&,const mol::EntityView&, int, Real, bool) = IterativeSuperposeSVD; SuperpositionResult (*sup3)(const mol::EntityView&,const mol::EntityView&, int, Real, bool) = IterativeSuperposeSVD;
SuperpositionResult (*sup4)(const std::vector<geom::Vec3>&,const std::vector<geom::Vec3>&, int, Real) = IterativeSuperposeSVD; SuperpositionResult (*sup4)(const geom::Vec3List&,const geom::Vec3List&, int, Real) = IterativeSuperposeSVD;
class_<SuperpositionResult>("SuperpositionResult", init<>()) class_<SuperpositionResult>("SuperpositionResult", init<>())
.def_readwrite("ncycles", &SuperpositionResult::ncycles) .def_readwrite("ncycles", &SuperpositionResult::ncycles)
.def_readwrite("rmsd", &SuperpositionResult::rmsd) .def_readwrite("rmsd", &SuperpositionResult::rmsd)
......
...@@ -469,8 +469,8 @@ SuperpositionResult SuperposeSVD(const mol::EntityView& ev1, ...@@ -469,8 +469,8 @@ SuperpositionResult SuperposeSVD(const mol::EntityView& ev1,
return result; return result;
} }
SuperpositionResult SuperposeSVD(const std::vector<geom::Vec3>& pl1, SuperpositionResult SuperposeSVD(const geom::Vec3List& pl1,
const std::vector<geom::Vec3>& pl2) const geom::Vec3List& pl2)
{ {
MeanSquareMinimizer msm = MeanSquareMinimizer::FromPointLists(pl1, pl2); MeanSquareMinimizer msm = MeanSquareMinimizer::FromPointLists(pl1, pl2);
SuperpositionResult result = msm.MinimizeOnce(); SuperpositionResult result = msm.MinimizeOnce();
...@@ -505,8 +505,8 @@ SuperpositionResult IterativeSuperposeSVD(const mol::EntityView& ev, ...@@ -505,8 +505,8 @@ SuperpositionResult IterativeSuperposeSVD(const mol::EntityView& ev,
return result; return result;
} }
SuperpositionResult IterativeSuperposeSVD(const std::vector<geom::Vec3>& pl1, SuperpositionResult IterativeSuperposeSVD(const geom::Vec3List& pl1,
const std::vector<geom::Vec3>& pl2, const geom::Vec3List& pl2,
int max_cycles, int max_cycles,
Real distance_threshold){ Real distance_threshold){
......
...@@ -92,8 +92,8 @@ SuperpositionResult DLLEXPORT_OST_MOL_ALG SuperposeSVD(const mol::EntityView& ev ...@@ -92,8 +92,8 @@ SuperpositionResult DLLEXPORT_OST_MOL_ALG SuperposeSVD(const mol::EntityView& ev
bool apply_transform); bool apply_transform);
/// \brief superposes two pointlists /// \brief superposes two pointlists
SuperpositionResult DLLEXPORT_OST_MOL_ALG SuperposeSVD(const std::vector<geom::Vec3>& pl1, SuperpositionResult DLLEXPORT_OST_MOL_ALG SuperposeSVD(const geom::Vec3List& pl1,
const std::vector<geom::Vec3>& pl2); const geom::Vec3List& pl2);
/// \brief iterative superposition /// \brief iterative superposition
SuperpositionResult DLLEXPORT_OST_MOL_ALG IterativeSuperposeSVD(const mol::EntityView& ev1, SuperpositionResult DLLEXPORT_OST_MOL_ALG IterativeSuperposeSVD(const mol::EntityView& ev1,
...@@ -103,8 +103,8 @@ SuperpositionResult DLLEXPORT_OST_MOL_ALG IterativeSuperposeSVD(const mol::Entit ...@@ -103,8 +103,8 @@ SuperpositionResult DLLEXPORT_OST_MOL_ALG IterativeSuperposeSVD(const mol::Entit
bool apply_transform); bool apply_transform);
/// \brief iterative superposition of two point lists /// \brief iterative superposition of two point lists
SuperpositionResult DLLEXPORT_OST_MOL_ALG IterativeSuperposeSVD(const std::vector<geom::Vec3>& pl1, SuperpositionResult DLLEXPORT_OST_MOL_ALG IterativeSuperposeSVD(const geom::Vec3List& pl1,
const std::vector<geom::Vec3>& pl2, const geom::Vec3List& pl2,
int max_cycles, int max_cycles,
Real distance_threshold); Real distance_threshold);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment