diff --git a/.gitignore b/.gitignore index 379520c..2f89a97 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +result + bin/ build/ .gradle/ diff --git a/docs/example.py b/docs/example.py deleted file mode 100644 index 9a8a44a..0000000 --- a/docs/example.py +++ /dev/null @@ -1,32 +0,0 @@ -import matplotlib.pyplot as plt -import numpy as np -from math import comb - - -def B(n, k, t): - return comb(n, k) * t**k * (1 - t)**(n - k) - - -P = np.array([[0, 0], [0, 2], [1, 2], [1, 0], [1, -2], [2, -1], [2, 0]]) - -n = 3 - -S1 = np.array([sum(P[k] * B(n, k, t) for k in range(n + 1)) for t in np.linspace(0, 1, 100)]) -S2 = np.array([sum(P[k + n] * B(n, k, t) for k in range(n + 1)) for t in np.linspace(0, 1, 100)]) - -S1p = np.array([n * sum((P[k + 1] - P[k]) * B(n - 1, k, t) for k in range(n)) for t in np.linspace(0, 1, 100)]) -S2p = np.array([n * sum((P[k + 1 + n] - P[k + n]) * B(n - 1, k, t) for k in range(n)) for t in np.linspace(0, 1, 100)]) - -plt.subplot(121) -plt.plot(S1[:,0], S1[:,1]) -plt.plot(S2[:,0], S2[:,1]) -plt.plot(P[:,0], P[:,1], 'ro') -plt.axis('equal') - -plt.subplot(122) -plt.plot(S1p[:,0], S1p[:,1]) -plt.plot(S2p[:,0], S2p[:,1]) -plt.axis('equal') -plt.show() - - diff --git a/docs/circle.webm b/docs/figs/circle.webm similarity index 100% rename from docs/circle.webm rename to docs/figs/circle.webm diff --git a/docs/demo_noshow.webm b/docs/figs/demo_noshow.webm similarity index 100% rename from docs/demo_noshow.webm rename to docs/figs/demo_noshow.webm diff --git a/docs/demo_show.webm b/docs/figs/demo_show.webm similarity index 100% rename from docs/demo_show.webm rename to docs/figs/demo_show.webm diff --git a/docs/full_noshow.webm b/docs/figs/full_noshow.webm similarity index 100% rename from docs/full_noshow.webm rename to docs/figs/full_noshow.webm diff --git a/docs/full_show.webm b/docs/figs/full_show.webm similarity index 100% rename from docs/full_show.webm rename to docs/figs/full_show.webm diff --git a/docs/island.webm b/docs/figs/island.webm similarity index 100% rename from docs/island.webm rename to docs/figs/island.webm diff --git a/docs/tuto.webm b/docs/figs/tuto.webm similarity index 100% rename from docs/tuto.webm rename to docs/figs/tuto.webm diff --git a/docs/waterfall.webm b/docs/figs/waterfall.webm similarity index 100% rename from docs/waterfall.webm rename to docs/figs/waterfall.webm diff --git a/docs/rapport.md b/docs/rapport.md index e08b77d..8b02063 100644 --- a/docs/rapport.md +++ b/docs/rapport.md @@ -12,12 +12,12 @@ body {
-Laurent Fainsin — -Damien Guillotin + Laurent Fainsin — + Damien Guillotin
-Lien vers le répertoire + Lien vers le répertoire
## Description @@ -89,34 +89,34 @@ video {- + | - + |
- + | - + |
- + | - + |
- + | - + |