update modern and minimal usages, fix them in matplotlibcpp.h

Cryoris · Cryoris · commit 9c58c6cfb7c1 · 2019-08-26T09:05:42.000+02:00
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ definitions = -std=c++11
 eigen_include = -I /usr/local/include/eigen3
 
 # Executable names for examples (w/o Eigen)
-example_execs = minimal basic animation nonblock xkcd quiver bar surface subplot fill_inbetween fill update
+example_execs = minimal modern basic animation nonblock xkcd quiver bar surface subplot fill_inbetween fill update
 
 # Executable names for examples using Eigen
 eigen_execs = eigen loglog semilogx semilogy small
diff --git a/examples/minimal.cpp b/examples/minimal.cpp
@@ -4,7 +4,9 @@
 namespace plt = matplotlibcpp;
 
 int main() {
-  std::vector<double> y = {1, 3, 2, 4};
+  // plot(y) - the x-coordinates are implicitly set to [0,1,...,n)
+  // plt::plot({1, 2, 3, 4});
+  std::vector<double> y = {1, 2, 3, 4};
   plt::plot(y);
   plt::savefig("minimal.pdf");
 }
diff --git a/examples/modern.cpp b/examples/modern.cpp
@@ -1,21 +1,19 @@
 #define _USE_MATH_DEFINES
 #include "../matplotlibcpp.h"
 #include <cmath>
+#include <vector>
 
 namespace plt = matplotlibcpp;
 
 int main() {
-  // plot(y) - the x-coordinates are implicitly set to [0,1,...,n)
-  // plt::plot({1,2,3,4});
-
   // Prepare data for parametric plot.
   int n = 5000; // number of data points
-  Eigen::VectorXd x(n), y(n), z(n);
+  std::vector<double> x(n), y(n), z(n);
   for (int i = 0; i < n; ++i) {
     double t = 2 * M_PI * i / n;
-    x(i) = 16 * sin(t) * sin(t) * sin(t);
-    y(i) = 13 * cos(t) - 5 * cos(2 * t) - 2 * cos(3 * t) - cos(4 * t);
-    z(i) = 12.5 + abs(sin(x(i)));
+    x.at(i) = 16 * sin(t) * sin(t) * sin(t);
+    y.at(i) = 13 * cos(t) - 5 * cos(2 * t) - 2 * cos(3 * t) - cos(4 * t);
+    z.at(i) = 12.5 + abs(sin(x.at(i)));
   }
 
   // plot() takes an arbitrary number of (x,y,format)-triples.
diff --git a/matplotlibcpp.h b/matplotlibcpp.h
@@ -1,10 +1,15 @@
 //
-// Changes:
-// * Make work for Eigen Vectors and Matrices
+// Wishlist:
+// * (WIP) Make work for Eigen Vectors and Matrices
+// * add submodule for our own functions such as spy
+// * export functions in different files for better structure
+// * make plot(y) work with x of unsigned type, or get to the bottom of that
+//   problem at least
+//
+// Changed:
 // * Implement a better way for named_plot, maybe just as additional
 //   method with extra keyword
 // * add location keyword for legend
-// * add submodule for our own functions such as spy
 //
 
 #pragma once
@@ -446,8 +451,7 @@ namespace detail {
 // @param s The formatting string for colour, marker and linestyle
 // @param keywords Additional keywords, such as label
 // @return true if plot was successful, false otherwise
-template <typename VectorX = std::vector<double>,
-          typename VectorY = std::vector<double>>
+template <typename VectorX, typename VectorY>
 bool plot_base(PyObject *const pyfunc, const VectorX &x, const VectorY &y,
                const std::string &s = "",
                const std::map<std::string, std::string> &keywords = {}) {
@@ -497,11 +501,10 @@ bool plot(const VectorX &x, const VectorY &y,
 template <typename VectorY = std::vector<double>>
 bool plot(const VectorY &y, const std::string &format = "",
           const std::map<std::string, std::string> &keywords = {}) {
-  // TODO can this be <size_t> or do we need <typename Vector::value_type>?
-  // before the conversion of this function from vector<Numeric> to Vector
-  // the created vector x was of the same type as y
-  std::vector<std::size_t> x(y.size());
-  for (std::size_t i = 0; i < x.size(); ++i)
+  // Note: cannot be an unsigned type for some reason, yields an overflow
+  // problem..
+  std::vector<int> x(y.size());
+  for (int i = 0; i < x.size(); ++i)
     x.at(i) = i;
 
   return plot(x, y, format);
@@ -510,8 +513,8 @@ bool plot(const VectorY &y, const std::string &format = "",
 template <typename VectorY = std::vector<double>>
 bool plot(const VectorY &y,
           const std::map<std::string, std::string> &keywords) {
-  std::vector<std::size_t> x(y.size());
-  for (std::size_t i = 0; i < x.size(); ++i)
+  std::vector<int> x(y.size());
+  for (int i = 0; i < x.size(); ++i)
     x.at(i) = i;
 
   return plot(x, y, "", keywords);
@@ -1666,7 +1669,6 @@ ginput(const int numClicks = 1,
   return out;
 }
 
-// Actually, is there any reason not to call this automatically for every plot?
 inline void tight_layout() {
   PyObject *res = PyObject_CallObject(
       detail::_interpreter::get().s_python_function_tight_layout,
@@ -1678,15 +1680,16 @@ inline void tight_layout() {
   Py_DECREF(res);
 }
 
-#if 0
 // recursion stop for the below
 template <typename... Args> bool plot() { return true; }
 
+// enable plotting of multiple triples (x, y, format)
 template <typename A, typename B, typename... Args>
 bool plot(const A &a, const B &b, const std::string &format, Args... args) {
   return plot(a, b, format) && plot(args...);
 }
 
+#if 0
 /*
  * This group of plot() functions is needed to support initializer lists, i.e.
  * calling plot( {1,2,3,4} )
