summaryrefslogtreecommitdiff
path: root/test/test_gromov.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/test_gromov.py')
-rw-r--r--test/test_gromov.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/test/test_gromov.py b/test/test_gromov.py
index 75eeaab..a6c89f2 100644
--- a/test/test_gromov.py
+++ b/test/test_gromov.py
@@ -10,11 +10,24 @@ import ot
def test_gromov():
+<<<<<<< HEAD
+ n_samples = 50 # nb samples
+=======
n = 50 # nb samples
+>>>>>>> 986f46ddde3ce2f550cb56f66620df377326423d
mu_s = np.array([0, 0])
cov_s = np.array([[1, 0], [0, 1]])
+<<<<<<< HEAD
+ xs = ot.datasets.get_2D_samples_gauss(n_samples, mu_s, cov_s)
+
+ xt = [xs[n_samples - (i + 1)] for i in range(n_samples)]
+ xt = np.array(xt)
+
+ p = ot.unif(n_samples)
+ q = ot.unif(n_samples)
+=======
xs = ot.datasets.get_2D_samples_gauss(n, mu_s, cov_s)
xt = [xs[n - (i + 1)] for i in range(n)]
@@ -22,6 +35,7 @@ def test_gromov():
p = ot.unif(n)
q = ot.unif(n)
+>>>>>>> 986f46ddde3ce2f550cb56f66620df377326423d
C1 = ot.dist(xs, xs)
C2 = ot.dist(xt, xt)