redo Makefile, Eigen examples no longer in separate folder

Cryoris · Cryoris · commit 1b5b059ab2ff · 2019-08-25T12:33:22.000+02:00
diff --git a/Makefile b/Makefile
@@ -16,65 +16,42 @@ definitions = -std=c++11
 # Eigen include
 eigen_include = -I /usr/local/include/eigen3
 
-examples: minimal basic modern animation nonblock xkcd quiver bar surface subplot fill_inbetween fill update
+# Executable names for examples (w/o Eigen)
+example_execs = minimal basic animation nonblock xkcd quiver bar surface subplot fill_inbetween fill update
 
-eigen: eigen_basic eigen_modern eigen_loglog eigen_semilogx eigen_semilogy
+# Executable names for examples using Eigen
+eigen_execs = eigen loglog semilogx semilogy small
 
-minimal: examples/minimal.cpp matplotlibcpp.h
-	cd examples && g++ -DWITHOUT_NUMPY minimal.cpp ${includes} ${linkings} -o minimal ${definitions}
-	#cd examples && g++ minimal.cpp ${includes} ${linkings} -o minimal ${definitions}
+# Example targets (default if just 'make' is called)
+examples: $(example_execs)
 
-basic: examples/basic.cpp matplotlibcpp.h
-	cd examples && g++ basic.cpp ${includes} ${linkings} -o basic ${definitions}
+# Eigen example targets
+eigen: $(eigen_execs)
 
-modern: examples/modern.cpp matplotlibcpp.h
-	cd examples && g++ modern.cpp ${includes} ${linkings} -o modern ${definitions}
+# All examples
+all: examples eigen
 
-animation: examples/animation.cpp matplotlibcpp.h
-	cd examples && g++ animation.cpp ${includes} ${linkings} -o animation ${definitions}
+# Run all examples
+run: run_examples run_eigen
 
-nonblock: examples/nonblock.cpp matplotlibcpp.h
-	cd examples && g++ nonblock.cpp ${includes} ${linkings} -o nonblock ${definitions}
+# Compiler instructions for examples
+$(example_execs): %: examples/%.cpp matplotlibcpp.h
+	g++ $< $(includes) $(linkings) -o examples/$@ $(definitions)
 
-quiver: examples/quiver.cpp matplotlibcpp.h
-	cd examples && g++ quiver.cpp ${includes} ${linkings} -o quiver ${definitions}
+# Run examples
+run_examples:
+	for exec in $(example_execs); do ./examples/$$exec; done
 
-xkcd: examples/xkcd.cpp matplotlibcpp.h
-	cd examples && g++ xkcd.cpp ${includes} ${linkings} -o xkcd ${definitions}
+# Compiler instructions for Eigen examples
+$(eigen_execs): %: examples/%.cpp matplotlibcpp.h
+	g++ $< $(includes) $(eigen_include) $(linkings) -o examples/$@ $(definitions)
 
-bar: examples/bar.cpp matplotlibcpp.h
-	cd examples && g++ bar.cpp ${includes} ${linkings} -o bar ${definitions}
-
-surface: examples/surface.cpp matplotlibcpp.h
-	cd examples && g++ surface.cpp ${includes} ${linkings} -o surface ${definitions}
-
-subplot: examples/subplot.cpp matplotlibcpp.h
-	cd examples && g++ subplot.cpp ${includes} ${linkings} -o subplot ${definitions}
-
-fill_inbetween: examples/fill_inbetween.cpp matplotlibcpp.h
-	cd examples && g++ fill_inbetween.cpp ${includes} ${linkings} -o fill_inbetween ${definitions}
-
-fill: examples/fill.cpp matplotlibcpp.h
-	cd examples && g++ fill.cpp ${includes} ${linkings} -o fill ${definitions}
-
-update: examples/update.cpp matplotlibcpp.h
-	cd examples && g++ update.cpp ${includes} ${linkings} -o update ${definitions}
-
-eigen_basic: examples/eigen/basic.cpp matplotlibcpp.h
-	cd examples/eigen && g++ basic.cpp ${includes} ${eigen_include} ${linkings} -o $@ ${definitions}
-
-eigen_modern: examples/eigen/modern.cpp matplotlibcpp.h
-	cd examples/eigen && g++ modern.cpp ${includes} ${eigen_include} ${linkings} -o $@ ${definitions}
-
-eigen_loglog: examples/eigen/loglog.cpp matplotlibcpp.h
-	cd examples/eigen && g++ loglog.cpp ${includes} ${eigen_include} ${linkings} -o $@ ${definitions}
-
-eigen_semilogx: examples/eigen/semilogx.cpp matplotlibcpp.h
-	cd examples/eigen && g++ semilogx.cpp ${includes} ${eigen_include} ${linkings} -o $@ ${definitions}
-
-eigen_semilogy: examples/eigen/semilogy.cpp matplotlibcpp.h
-	cd examples/eigen && g++ semilogy.cpp ${includes} ${eigen_include} ${linkings} -o $@ ${definitions}
+# Run Eigen examples
+run_eigen:
+	for exec in $(eigen_execs); do ./examples/$$exec; done
 
+# Clean all
 clean:
-	rm -f examples/{minimal,basic,modern,animation,nonblock,xkcd,quiver,bar,surface,subplot,fill_inbetween,fill,update}
-	rm -f examples/eigen/{eigen_basic,eigen_modern,eigen_loglog}
+	# -f to silent warnings if file does not exist
+	for exec in $(example_execs); do rm -f examples/$$exec; done
+	for exec in $(eigen_execs); do rm -f examples/$$exec; done
diff --git a/examples/basic.cpp b/examples/basic.cpp
@@ -1,44 +1,30 @@
-#define _USE_MATH_DEFINES
+#define _USE_MATH_DEFINES // for sin/log
 #include "../matplotlibcpp.h"
 #include <cmath>
 #include <iostream>
 
 namespace plt = matplotlibcpp;
 
 int main() {
-  // Prepare data.
-  int n = 5000;
+  int n = 5000; // 5000 data points
   std::vector<double> x(n), y(n), z(n), w(n, 2);
   for (int i = 0; i < n; ++i) {
     x.at(i) = i * i;
     y.at(i) = sin(2 * M_PI * i / 360.0);
     z.at(i) = log(i);
   }
 
-  // Set the size of output image = 1200x780 pixels
-  plt::figure_size(1200, 780);
+  plt::figure(); // declare a new figure (optional if only one is used)
 
-  // Plot line from given x and y data. Color is selected automatically.
-  plt::plot(x, y);
+  plt::plot(x, y); // automatic coloring: tab:blue
+  plt::show(false);
+  plt::plot(x, w, "r--");                 // red dashed line
+  plt::plot(x, z, {{"label", "log(x)"}}); // legend label "log(x)"
 
-  // Plot a red dashed line from given x and y data.
-  plt::plot(x, w, "r--");
+  plt::xlim(0, 1000 * 1000);    // x-axis interval: [0, 1e6]
+  plt::title("Standard usage"); // set a title
+  plt::legend();                // enable the legend
 
-  // Plot a line whose name will show up as "log(x)" in the legend.
-  plt::plot(x, z, {{"label", "log(x)"}});
-
-  // Set x-axis to interval [0,1000000]
-  plt::xlim(0, 1000 * 1000);
-
-  // Add graph title
-  plt::title("Sample figure");
-
-  // Enable legend.
-  plt::legend();
-
-  // save figure
-  const char *filename = "./basic.png";
-  std::cout << "Saving result to " << filename << std::endl;
-  ;
-  plt::save(filename);
+  plt::savefig("standard.pdf"); // save the figure
+  plt::show();
 }
diff --git a/examples/eigen.cpp b/examples/eigen.cpp
@@ -1,5 +1,5 @@
 #define _USE_MATH_DEFINES
-#include "../../matplotlibcpp.h"
+#include "../matplotlibcpp.h"
 #include <Eigen/Dense>
 #include <cmath>
 #include <iostream>
@@ -38,8 +38,8 @@ int main() {
   plt::legend();
 
   // save figure
-  const char *filename = "./basic.png";
+  const char *filename = "./eigen_basic.png";
   std::cout << "Saving result to " << filename << std::endl;
 
-  plt::save(filename);
+  plt::savefig(filename);
 }
diff --git a/examples/eigen/modern.cpp b/examples/eigen/modern.cpp
diff --git a/examples/loglog.cpp b/examples/loglog.cpp
@@ -1,5 +1,5 @@
 #define _USE_MATH_DEFINES
-#include "../../matplotlibcpp.h"
+#include "../matplotlibcpp.h"
 #include <Eigen/Dense>
 #include <cmath>
 #include <iostream>
diff --git a/examples/minimal.cpp b/examples/minimal.cpp
@@ -1,8 +1,10 @@
 #include "../matplotlibcpp.h"
+#include <vector>
 
 namespace plt = matplotlibcpp;
 
 int main() {
-  plt::plot({1, 3, 2, 4});
-  plt::show();
+  std::vector<double> y = {1, 3, 2, 4};
+  plt::plot(y);
+  plt::savefig("minimal.pdf");
 }
diff --git a/examples/modern.cpp b/examples/modern.cpp
@@ -2,7 +2,6 @@
 #include "../matplotlibcpp.h"
 #include <cmath>
 
-using namespace std;
 namespace plt = matplotlibcpp;
 
 int main() {
@@ -11,12 +10,12 @@ int main() {
 
   // Prepare data for parametric plot.
   int n = 5000; // number of data points
-  vector<double> x(n), y(n), z(n);
+  Eigen::VectorXd x(n), y(n), z(n);
   for (int i = 0; i < n; ++i) {
     double t = 2 * M_PI * i / n;
-    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)));
+    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)));
   }
 
   // plot() takes an arbitrary number of (x,y,format)-triples.
diff --git a/examples/semilogx.cpp b/examples/semilogx.cpp
@@ -1,5 +1,5 @@
 #define _USE_MATH_DEFINES
-#include "../../matplotlibcpp.h"
+#include "../matplotlibcpp.h"
 #include <Eigen/Dense>
 #include <cmath>
 #include <iostream>
diff --git a/examples/semilogy.cpp b/examples/semilogy.cpp
@@ -1,5 +1,5 @@
 #define _USE_MATH_DEFINES
-#include "../../matplotlibcpp.h"
+#include "../matplotlibcpp.h"
 #include <Eigen/Dense>
 #include <cmath>
 #include <iostream>
diff --git a/examples/small.cpp b/examples/small.cpp
@@ -0,0 +1,27 @@
+#include "../matplotlibcpp.h"
+#include <Eigen/Dense>
+#include <iostream>
+
+namespace plt = matplotlibcpp;
+
+int main() {
+
+  Eigen::VectorXd x = Eigen::VectorXd::LinSpaced(200, 0, 6);
+  Eigen::VectorXd y, z;
+
+  // y = exp(sin(x)), z = exp(cos(z))
+  y = x.array().sin().exp().matrix();
+  z = x.array().cos().exp().matrix();
+
+  plt::figure();
+
+  plt::loglog(x, y, "tab:red");
+  plt::loglog(x, z, "tab:blue", {{"linestyle", "--"}});
+
+  plt::xlabel("Time in lecture");
+  plt::ylabel("Student confusion");
+
+  plt::grid();
+  plt::savefig("eigen.pdf");
+  // plt::show(); // show the figure instead of saving it
+}
