From e5b7f120f74442658a03c02b1a1898b5c2fa913a Mon Sep 17 00:00:00 2001 From: Michael Shirts Date: Thu, 24 Aug 2023 11:18:15 -0600 Subject: [PATCH] Fixed example bug and updated output. (#513) * Fixed example bug and updated output. fixed a bug in the harmonic_oscillators.py example that wasn't actually retrieving the data from the results object for reverse exponential averaging. Added logging to the two harmonic oscillator files. Update the output of the example scripts since they were quite old. * format fixes for black * fix doc building * we need to add html_theme since that gets injected later by RTD --------- Co-authored-by: Mike Henry <11765982+mikemhenry@users.noreply.github.com> --- devtools/conda-envs/test_env_jax.yaml | 3 +- docs/conf.py | 2 +- .../harmonic-oscillators/QQMBARobserve.pdf | Bin 39119 -> 38891 bytes examples/harmonic-oscillators/QQdf.pdf | Bin 120726 -> 120564 bytes .../QQstandardobserve.pdf | Bin 33364 -> 33462 bytes ...mulative_probability_comparison_curves.pdf | Bin 14395 -> 14392 bytes .../harmonic-oscillators-distributions.py | 5 + ...ic-oscillators-distributions.py_output.txt | 2422 ++++++++++------- .../harmonic-oscillators.py | 9 +- .../harmonic-oscillators.py_output.txt | 1420 ++++++---- 10 files changed, 2345 insertions(+), 1516 deletions(-) diff --git a/devtools/conda-envs/test_env_jax.yaml b/devtools/conda-envs/test_env_jax.yaml index c2dd795e..0ffe9f34 100644 --- a/devtools/conda-envs/test_env_jax.yaml +++ b/devtools/conda-envs/test_env_jax.yaml @@ -22,5 +22,6 @@ dependencies: - xlrd # Docs - numpydoc - - sphinx <7 + - sphinx + - sphinx-rtd-theme - sphinxcontrib-bibtex diff --git a/docs/conf.py b/docs/conf.py index 92a5919a..5fbe1a40 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -146,7 +146,7 @@ # a list of builtin themes. # html_theme = "default" on_rtd = os.environ.get("READTHEDOCS", None) == "True" - +html_theme = "sphinx_rtd_theme" if not on_rtd: # only import and set the theme if we're building docs locally import sphinx_rtd_theme diff --git a/examples/harmonic-oscillators/QQMBARobserve.pdf b/examples/harmonic-oscillators/QQMBARobserve.pdf index 442f0d679be7f86c881e3bb3d0f61c3ecabb9326..bd720ca1a78f4eb2e9f9a4dc4f8029cfdf5af4ab 100644 GIT binary patch delta 25900 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