minor changes to work with EigenIterator, hotfixes, not stable

Georg Jäger · Georg Jäger · commit 5f06919385b4 · 2020-06-26T14:00:57.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.0.0)
+project(matplotlibcpp VERSION 0.1 LANGUAGES CXX)
+
+find_package(Python3 COMPONENTS Development NumPy REQUIRED)
+set(MATPLOTLIB_CPP_INCLUDE_DIRS ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS})
+set(MATPLOTLIB_CPP_DEPS Python3::Python Python3::NumPy)
+set(MATPLOTLIB_CPP_DEST_DIR "${CMAKE_INSTALL_PREFIX}")
+set(MATPLOTLIB_CPP_VERSION ${PROJECT_VERSION})
+set(MATPLOTLIB_CPP_CFLAGS)
+
+CONFIGURE_FILE("matplotlibcpp.pc.in" "matplotlibcpp.pc" @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/matplotlibcpp.pc DESTINATION share/pkgconfig)
+install(FILES matplotlibcpp.h DESTINATION include/matplotlibcpp)
+
diff --git a/matplotlibcpp.h b/matplotlibcpp.h
@@ -2321,18 +2321,23 @@ struct plot_impl<std::false_type>
         using std::begin;
         using std::end;
 
+        detail::_interpreter::get();
+
         auto xs = distance(begin(x), end(x));
         auto ys = distance(begin(y), end(y));
         assert(xs == ys && "x and y data must have the same number of elements!");
 
-        PyObject* xlist = PyList_New(xs);
-        PyObject* ylist = PyList_New(ys);
+        PyObject* xlist = PyList_New(static_cast<Py_ssize_t>(xs));
+        PyObject* ylist = PyList_New(static_cast<Py_ssize_t>(ys));
         PyObject* pystring = PyString_FromString(format.c_str());
 
         auto itx = begin(x), ity = begin(y);
         for(size_t i = 0; i < xs; ++i) {
-            PyList_SetItem(xlist, i, PyFloat_FromDouble(*itx++));
-            PyList_SetItem(ylist, i, PyFloat_FromDouble(*ity++));
+            PyList_SetItem(xlist, i, PyFloat_FromDouble(*itx));
+            PyList_SetItem(ylist, i, PyFloat_FromDouble(*ity));
+
+            ++itx;
+            ++ity;
         }
 
         PyObject* plot_args = PyTuple_New(3);
@@ -2355,12 +2360,14 @@ struct plot_impl<std::true_type>
     template<typename Iterable, typename Callable>
     bool operator()(const Iterable& ticks, const Callable& f, const std::string& format)
     {
-        if(begin(ticks) == end(ticks)) return true;
+        using std::cbegin;
+        using std::cend;
+        if(cbegin(ticks) == cend(ticks)) return true;
 
         // We could use additional meta-programming to deduce the correct element type of y,
         // but all values have to be convertible to double anyways
         std::vector<double> y;
-        for(auto x : ticks) y.push_back(f(x));
+        for(auto x = cbegin(ticks); x != cend(ticks); ++x) y.push_back(f(*x));
         return plot_impl<std::false_type>()(ticks,y,format);
     }
 };
@@ -2377,6 +2384,12 @@ bool plot(const A& a, const B& b, const std::string& format, Args... args)
     return detail::plot_impl<typename detail::is_callable<B>::type>()(a,b,format) && plot(args...);
 }
 
+template<typename A, typename B, typename... Args>
+bool plot_not_callable(const A& a, const B& b, const std::string& format, Args... args)
+{
+    return detail::plot_impl<std::false_type>()(a,b,format) && plot(args...);
+}
+
 /*
  * This group of plot() functions is needed to support initializer lists, i.e. calling
  *    plot( {1,2,3,4} )
diff --git a/matplotlibcpp.pc.in b/matplotlibcpp.pc.in
@@ -0,0 +1,11 @@
+prefix=@MATPLOTLIB_CPP_DEST_DIR@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: matplotlib-cpp
+Description: Library for plotting in C++ using Python and Matplotlib
+Version: @MATPLOTLIB_CPP_VERSION@
+
+Libs: -L${libdir} @MATPLOTLIB_CPP_DEPS@
+Cflags: -I${includedir} @MATPLOTLIB_CPP_CFLAGS@
