WhatsThis update

[mussa.git] / py / mussa.cpp

diff --git a/py/mussa.cpp b/py/mussa.cpp
index f38063e2c3ed7a9f5e49f38e109b25ae60b19cb1..5f42599fb78111ea323fda0813c1dc3f43598c0f 100644 (file)
--- a/py/mussa.cpp
+++ b/py/mussa.cpp
@@ -2,19 +2,37 @@
 namespace py = boost::python;
 
 #include "alg/mussa.hpp"
+#include "alg/sequence.hpp"
+#include "stl_container_adapter.hpp"
 
 void export_mussa()
 {
   void (Mussa::*load_mupa_string)(std::string) = &Mussa::load_mupa_file;
+  void (Mussa::*append_sequence_ref)(const Sequence&) = &Mussa::append_sequence;
+  void (Mussa::*append_sequence_ptr)(const boost::shared_ptr<Sequence>) = &Mussa::append_sequence;
 
-  py::class_<Mussa>("Mussa")
+  py::class_<Mussa::vector_sequence_type>("Sequences")
+    .def("__len__", &Mussa::vector_sequence_type::size, "return length of sequences")
+    .def("__contains__", &std_item<Mussa::vector_sequence_type>::in)
+    .def("__iter__", py::iterator<Mussa::vector_sequence_type>())
+    .def("clear", &Mussa::vector_sequence_type::clear, "remove all the sequences")
+    .def("append", &std_item<Mussa::vector_sequence_type>::add,
+        py::with_custodian_and_ward<1,2>()) // to let container keep value
+    .def("__getitem__", &std_item<Mussa::vector_sequence_type>::get,
+        py::return_value_policy<py::copy_non_const_reference>())
+    .def("__setitem__", &std_item<Mussa::vector_sequence_type>::set,
+        py::with_custodian_and_ward<1,2>()) // to let container keep value
+    .def("__delitem__", &std_item<Mussa::vector_sequence_type>::del)
+  ;
+ 
+  py::class_<Mussa>("_Mussa", py::no_init)
     .def("save", &Mussa::save)
     .def("load", &Mussa::load, "Load previous run analysis")
     .def("load_mupa", load_mupa_string, "Load mussa parameter file")
     .def("clear", &Mussa::clear, "Clear the current analysis")
-    .add_property("name", &Mussa::get_name, &Mussa::set_name)
-    .def("size", &Mussa::size, "Number of sequences to be used "
-                               "in this analysis")
+    .add_property("name", &Mussa::get_name, &Mussa::set_name, "Set the name of the analysis")
+    .def("size", &Mussa::size, "Number of sequences attached to "
+                               "this analysis")
     .add_property("window", &Mussa::get_window, &Mussa::set_window,
                   "the number of base pairs in the sliding window")
     .add_property("threshold", &Mussa::get_threshold, &Mussa::set_threshold,
@@ -24,11 +42,13 @@ void export_mussa()
                                    &Mussa::set_analysis_mode)
     .add_property("analysisModeName", &Mussa::get_analysis_mode_name)
     .def("analyze", &Mussa::analyze, "Run the analysis")
-    .def("paths", &Mussa::paths, py::return_internal_reference<>())
-    //.def("sequences", &Mussa::sequences)
-    //.def("addSequence", &Mussa::append_sequence)  
+    .def("paths", &Mussa::paths, py::return_internal_reference<>(), "return list of paths")
+    .def("sequences", &Mussa::sequences, py::return_internal_reference<>(), "return list of sequences")
+    .def("add_sequence", append_sequence_ref, "attach a sequence to the analysis")  
   ;
-
+  py::def("Mussa", &Mussa::init, "Construct a new Mussa object");
+  py::register_ptr_to_python< boost::shared_ptr<Mussa> >();
+  
   py::enum_<Mussa::analysis_modes>("analysis_modes")
     .value("TransitiveNway", Mussa::TransitiveNway )
     .value("RadialNway", Mussa::RadialNway )