Merge branch 'master' into master

SMTorg · Nov 29, 2023 · f377b0f · f377b0f
2 parents 3f7c2a0 + f1aafcf
commit f377b0f
Show file tree

Hide file tree

Showing 28 changed files with 901 additions and 421 deletions.
diff --git a/doc/_src_docs/sampling_methods.rst b/doc/_src_docs/sampling_methods.rst
diff --git a/doc/_src_docs/sampling_methods.rstx b/doc/_src_docs/sampling_methods.rstx
@@ -12,14 +12,15 @@ These are listed below.
    sampling_methods/random
    sampling_methods/lhs
    sampling_methods/full_factorial
+   sampling_methods/pydoe
 
 Usage
 -----
 
-.. embed-test-print-plot :: smt.sampling_methods.tests.test_sampling_method_examples , Test , test_random , 80
+.. embed-test-print-plot :: smt.sampling_methods.tests.test_sampling_method_examples , Test , run_random , 80
 
-Problem class API
------------------
+Sampling method class API
+-------------------------
 
 .. autoclass:: smt.sampling_methods.sampling_method.SamplingMethod
 

diff --git a/doc/_src_docs/sampling_methods/full_factorial.rstx b/doc/_src_docs/sampling_methods/full_factorial.rstx
@@ -4,7 +4,7 @@ Full-factorial sampling
 Usage
 -----
 
-.. embed-test-print-plot :: smt.sampling_methods.tests.test_sampling_method_examples , Test , test_full_factorial , 80
+.. embed-test-print-plot :: smt.sampling_methods.tests.test_sampling_method_examples , Test , run_full_factorial , 80
 
 Options
 -------

diff --git a/doc/_src_docs/sampling_methods/full_factorial_Test_run_full_factorial.png b/doc/_src_docs/sampling_methods/full_factorial_Test_run_full_factorial.png
diff --git a/doc/_src_docs/sampling_methods/lhs.rstx b/doc/_src_docs/sampling_methods/lhs.rstx
@@ -14,14 +14,14 @@ The LHS method uses the pyDOE package (Design of Experiments for Python) [1]_. F
 
 The four first criteria are the same than in pyDOE (for more details, see [1]_). The last criterion, ESE, is implemented by the authors of SMT (more details about such method could be found in [2]_).
 
-.. [1] https://pythonhosted.org/pyDOE/index.html
+.. [1] https://pydoe3.readthedocs.io/en/stable
 
 .. [2] Jin, R. and Chen, W. and Sudjianto, A. (2005), "An efficient algorithm for constructing optimal design of computer experiments." Journal of Statistical Planning and Inference, 134:268-287.
 
 Usage
 -----
 
-.. embed-test-print-plot :: smt.sampling_methods.tests.test_sampling_method_examples , Test , test_lhs , 80
+.. embed-test-print-plot :: smt.sampling_methods.tests.test_sampling_method_examples , Test , run_lhs , 80
 
 Options
 -------

diff --git a/doc/_src_docs/sampling_methods/lhs_Test_run_lhs.png b/doc/_src_docs/sampling_methods/lhs_Test_run_lhs.png
diff --git a/doc/_src_docs/sampling_methods/pydoe.rst b/doc/_src_docs/sampling_methods/pydoe.rst
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ Full-factorial sampling @@
     Usage
     -----
-    .. embed-test-print-plot :: smt.sampling_methods.tests.test_sampling_method_examples , Test , test_full_factorial , 80
+    .. embed-test-print-plot :: smt.sampling_methods.tests.test_sampling_method_examples , Test , run_full_factorial , 80
     Options
     -------
@@ Expand Down @@