[python] Expose solutions to Python.

krivenko · Nov 25, 2016 · ef0cc9b · ef0cc9b
1 parent 4f64cc9
commit ef0cc9b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/c++/rectangle.hpp b/c++/rectangle.hpp
@@ -93,10 +93,10 @@ struct rectangle {
 
  std::complex<double> hilbert_transform(std::complex<double> z, bool multiply_by_e = false) const {
   if(multiply_by_e)
-   // -\int_{c-w/2}^{c+w/2} d\epsilon' \frac{\epsilon'}{\epsilon' - \epsilon - i0}
+   // -h \int_{c-w/2}^{c+w/2} d\epsilon' \frac{\epsilon'}{\epsilon' - \epsilon - i0}
    return -height*(width + z*std::log((center + width/2 - z)/(center - width/2 - z)));
   else
-   // -\int_{c-w/2}^{c+w/2} d\epsilon' \frac{1}{\epsilon' - \epsilon - i0}
+   // -h \int_{c-w/2}^{c+w/2} d\epsilon' \frac{1}{\epsilon' - \epsilon - i0}
    return -height*std::log((center + width/2 - z)/(center - width/2 - z));
  }
  vector<double> tail_coefficients(long order_min, long order_max, bool multiply_by_e = false) const {
@@ -135,6 +135,11 @@ struct rectangle {
   pod_t(rectangle const& r) : center(r.center), width(r.width), height(r.height) {}
  };
 
+ // Convert to tuple (center,width,height)
+ operator std::tuple<double,double,double>() const {
+  return std::make_tuple(center,width,height);
+ }
+
 };
 
 }

diff --git a/c++/som_core.hpp b/c++/som_core.hpp
@@ -135,6 +135,9 @@ class som_core {
  template<typename MeshType>
  friend void triqs_gf_view_assign_delegation(gf_view<MeshType> g, som_core const& cont);
 
+ /// Accumulated solutions
+ std::vector<configuration> const& get_solutions() const { return results; }
+
  /// Accumulated objective function histograms
  std::vector<histogram> const& get_histograms() const { return histograms; }
 

diff --git a/python/core_desc.py b/python/core_desc.py
@@ -15,6 +15,7 @@
 # Add here anything to add in the C++ code at the start, e.g. namespace using
 module.add_preamble("""
 #include <triqs/python_tools/converters/pair.hpp>
+#include <triqs/python_tools/converters/tuple.hpp>
 #include <triqs/python_tools/converters/vector.hpp>
 using namespace triqs::gfs;
 using namespace triqs::statistics;
@@ -60,6 +61,16 @@
                getter = cfunction("int get_run_status ()"),
                doc = """Status of the run on exit """)
 
+solutions_cp = """
+auto const& solutions = self_c.get_solutions();
+std::vector<std::vector<std::tuple<double,double,double>>> result;
+for(auto const& sol : solutions) result.emplace_back(sol.begin(), sol.end());
+"""
+c.add_property(name = "solutions",
+               getter = cfunction(signature = "std::vector<std::vector<std::tuple<double,double,double>>>()",
+                                  calling_pattern = solutions_cp),
+               doc = """Accumulated solutions as lists of rectangle parameter tuples (center,width,height)""")
+
 c.add_property(name = "histograms",
                getter = cfunction("std::vector<histogram> get_histograms ()"),
                doc = """Accumulated objective function histograms""")