Skip to content

Commit bcff67c

Browse files
committed
Resolve conflicts
1 parent efa9f4f commit bcff67c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

doc/index.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ number of factors:
7474
- :ref:`Sampling Designs <sampling_designs>`
7575

7676
#. :ref:`Morris Method <morris_method>` (``morris_sampling``)
77+
7778
#. :ref:`Saltelli Sampling <saltelli_sampling>` (``saltelli_sampling``)
7879

7980
- :ref:`Taguchi Designs <taguchi_designs>`
@@ -83,7 +84,9 @@ number of factors:
8384
- :ref:`Optimal Designs <optimal_designs>`
8485

8586
#. Advanced optimal design algorithms (``optimal_design``)
87+
8688
#. Optimality criteria (``A``, ``C``, ``D``, ``E``, ``G``, ``I``, ``S``, ``T``, ``V``)
89+
8790
#. Search algorithms (``Sequential (Dykstra)``, ``Simple Exchange (Wynn-Mitchell)``, ``Fedorov``, ``Modified Fedorov``, ``DETMAX``)
8891

8992
- :ref:`Sparse Grid Designs <sparse_grids>`

tests/test_lhs.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ def test_lhs2(self):
8282
def test_lhs3(self):
8383
expected = [[0.9, 0.1], [0.1, 0.7], [0.5, 0.9], [0.7, 0.5], [0.3, 0.3]]
8484
actual = lhs(2, samples=5, criterion="center", seed=42)
85-
print(actual)
8685
np.testing.assert_allclose(actual, expected)
8786

8887
def test_lhs4(self):
@@ -93,7 +92,6 @@ def test_lhs4(self):
9392
[0.00770446, 0.88925804, 0.57339844],
9493
]
9594
actual = lhs(3, samples=4, criterion="maximin", seed=42)
96-
print(actual)
9795
np.testing.assert_allclose(actual, expected, atol=1e-6)
9896

9997
def test_lhs5(self):

0 commit comments

Comments
 (0)