Skip to content

Commit 02443ce

Browse files
committed
Merge branch 'docs'
2 parents 7222379 + e21596c commit 02443ce

File tree

116 files changed

+21398
-589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+21398
-589
lines changed

Makefile

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
# Put the path to your Python.h here
2-
includes = -I /usr/local/Cellar/python/3.7.3/Frameworks/Python.framework/Versions/3.7/include/python3.7m
2+
includes = -I /usr/local/Cellar/python/3.7.4/Frameworks/Python.framework/Versions/3.7/include/python3.7m
33

4-
# Numpy include
4+
# Numpy include
55
includes += -I /usr/local/lib/python3.7/site-packages/numpy/core/include
66

77
# Add the path to the directory containing libpython*.a here if the linking fails
8-
includes += -L /usr/local/Cellar/python/3.7.3/Frameworks/Python.framework/Versions/3.7/lib
8+
includes += -L /usr/local/Cellar/python/3.7.4/Frameworks/Python.framework/Versions/3.7/lib
99

10-
# Link your python version
10+
# Link your python version
1111
linkings = -lpython3.7
1212

1313
# Compiler definitions
1414
definitions = -std=c++11
1515

16+
# Eigen include
17+
eigen_include = -I /usr/local/include/eigen3
18+
1619
examples: minimal basic modern animation nonblock xkcd quiver bar surface subplot fill_inbetween fill update
1720

21+
eigen: eigen_basic eigen_modern eigen_loglog eigen_semilogx eigen_semilogy
22+
1823
minimal: examples/minimal.cpp matplotlibcpp.h
1924
cd examples && g++ -DWITHOUT_NUMPY minimal.cpp ${includes} ${linkings} -o minimal ${definitions}
2025
#cd examples && g++ minimal.cpp ${includes} ${linkings} -o minimal ${definitions}
@@ -51,9 +56,25 @@ fill_inbetween: examples/fill_inbetween.cpp matplotlibcpp.h
5156

5257
fill: examples/fill.cpp matplotlibcpp.h
5358
cd examples && g++ fill.cpp ${includes} ${linkings} -o fill ${definitions}
54-
59+
5560
update: examples/update.cpp matplotlibcpp.h
5661
cd examples && g++ update.cpp ${includes} ${linkings} -o update ${definitions}
5762

63+
eigen_basic: examples/eigen/basic.cpp matplotlibcpp.h
64+
cd examples/eigen && g++ basic.cpp ${includes} ${eigen_include} ${linkings} -o $@ ${definitions}
65+
66+
eigen_modern: examples/eigen/modern.cpp matplotlibcpp.h
67+
cd examples/eigen && g++ modern.cpp ${includes} ${eigen_include} ${linkings} -o $@ ${definitions}
68+
69+
eigen_loglog: examples/eigen/loglog.cpp matplotlibcpp.h
70+
cd examples/eigen && g++ loglog.cpp ${includes} ${eigen_include} ${linkings} -o $@ ${definitions}
71+
72+
eigen_semilogx: examples/eigen/semilogx.cpp matplotlibcpp.h
73+
cd examples/eigen && g++ semilogx.cpp ${includes} ${eigen_include} ${linkings} -o $@ ${definitions}
74+
75+
eigen_semilogy: examples/eigen/semilogy.cpp matplotlibcpp.h
76+
cd examples/eigen && g++ semilogy.cpp ${includes} ${eigen_include} ${linkings} -o $@ ${definitions}
77+
5878
clean:
5979
rm -f examples/{minimal,basic,modern,animation,nonblock,xkcd,quiver,bar,surface,subplot,fill_inbetween,fill,update}
80+
rm -f examples/eigen/{eigen_basic,eigen_modern,eigen_loglog}

docs/Makefile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Minimal makefile for Sphinx documentation
2+
#
3+
4+
# You can set these variables from the command line, and also
5+
# from the environment for the first two.
6+
SPHINXOPTS ?=
7+
SPHINXBUILD ?= sphinx-build
8+
SOURCEDIR = source
9+
BUILDDIR = build
10+
11+
# Put it first so that "make" without argument is like "make help".
12+
help:
13+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
14+
15+
.PHONY: help Makefile
16+
17+
# Catch-all target: route all unknown targets to Sphinx using the new
18+
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
19+
%: Makefile
20+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/build/doctrees/compiling.doctree

25.5 KB
Binary file not shown.

docs/build/doctrees/docs.doctree

210 KB
Binary file not shown.
91.6 KB
Binary file not shown.

docs/build/doctrees/index.doctree

15.2 KB
Binary file not shown.

docs/build/doctrees/license.doctree

7.68 KB
Binary file not shown.

docs/build/doctrees/todo.doctree

2.79 KB
Binary file not shown.

docs/build/html/.buildinfo

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Sphinx build info version 1
2+
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3+
config: dc893f442bc417e3df3035107b7d8bde
4+
tags: 645f666f9bcd5a90fca523b33c5a78b7
31.4 KB
Loading

0 commit comments

Comments
 (0)