diff options
| author | Nicolas Courty <Nico@MacBook-Pro-de-Nicolas.local> | 2017-09-01 11:43:51 +0200 |
|---|---|---|
| committer | Nicolas Courty <Nico@MacBook-Pro-de-Nicolas.local> | 2017-09-01 11:43:51 +0200 |
| commit | 46fc12a298c49b715ac953cff391b18b54dab0f0 (patch) | |
| tree | fa40cb50af51004578b675840af6766bfd8cfe31 /test/test_gromov.py | |
| parent | 64a5d3c4e49688c13d236baf9ed23420070024d6 (diff) | |
solving conflicts :/
Diffstat (limited to 'test/test_gromov.py')
| -rw-r--r-- | test/test_gromov.py | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/test/test_gromov.py b/test/test_gromov.py index a6c89f2..c26d898 100644 --- a/test/test_gromov.py +++ b/test/test_gromov.py @@ -10,16 +10,11 @@ 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)]
@@ -27,15 +22,6 @@ def test_gromov(): 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)]
- xt = np.array(xt)
-
- p = ot.unif(n)
- q = ot.unif(n)
->>>>>>> 986f46ddde3ce2f550cb56f66620df377326423d C1 = ot.dist(xs, xs)
C2 = ot.dist(xt, xt)
|