changing import style

docs/_static/notebooks/citation.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -29,15 +29,15 @@
    "outputs": [],
    "source": [
     "import pymc3 as pm\n",
-    "import exoplanet\n",
+    "import exoplanet as xo\n",
     "\n",
     "with pm.Model() as model:\n",
-    "    u = exoplanet.distributions.QuadLimbDark(\"u\")\n",
-    "    orbit = exoplanet.orbits.KeplerianOrbit(period=10.0)\n",
-    "    light_curve = exoplanet.StarryLightCurve(u)\n",
+    "    u = xo.distributions.QuadLimbDark(\"u\")\n",
+    "    orbit = xo.orbits.KeplerianOrbit(period=10.0)\n",
+    "    light_curve = xo.StarryLightCurve(u)\n",
     "    transit = light_curve.get_light_curve(0.1, orbit, [0.0, 0.1])\n",
     "    \n",
-    "    txt, bib = exoplanet.citations.get_citations_for_model()"
+    "    txt, bib = xo.citations.get_citations_for_model()"
    ]
   },
   {
@@ -81,7 +81,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {

docs/user/api.rst

@@ -21,7 +21,7 @@ Orbits
 Light curve models
 ------------------
 
-.. autoclass:: exoplanet.light_curve.StarryLightCurve
+.. autoclass:: exoplanet.StarryLightCurve
    :inherited-members:
 
 
@@ -44,9 +44,10 @@ Scalable Gaussian processes
 Estimators
 ----------
 
-.. autofunction:: exoplanet.estimators.estimate_minimum_mass
-.. autofunction:: exoplanet.estimators.lomb_scargle_estimator
-.. autofunction:: exoplanet.estimators.autocorr_estimator
+.. autofunction:: exoplanet.estimate_semi_amplitude
+.. autofunction:: exoplanet.estimate_minimum_mass
+.. autofunction:: exoplanet.lomb_scargle_estimator
+.. autofunction:: exoplanet.autocorr_estimator
 
 
 Distributions
@@ -62,9 +63,9 @@ Distributions
 Utilities
 ---------
 
-.. autofunction:: exoplanet.utils.eval_in_model
-
-.. autoclass:: exoplanet.sampling.TuningSchedule
+.. autofunction:: exoplanet.eval_in_model
+.. autofunction:: exoplanet.get_samples_from_trace
+.. autoclass:: exoplanet.PyMC3Sampler
    :inherited-members:
 
 

exoplanet/__init__.py

@@ -8,9 +8,11 @@
     __EXOPLANET_SETUP__ = False
 
 if not __EXOPLANET_SETUP__:
-    __all__ = ["distributions", "gp", "orbits", "sampling", "utils",
-               "estimators",
-               "StarryLightCurve"]
+    __all__ = ["distributions", "gp", "orbits"]
 
-    from . import distributions, gp, orbits, sampling, utils, estimators
-    from .light_curve import StarryLightCurve
+    from .utils import *  # NOQA
+    from .sampling import *  # NOQA
+    from .estimators import *  # NOQA
+    from .light_curves import *  # NOQA
+
+    from . import distributions, gp, orbits

exoplanet/light_curve_test.py → exoplanet/light_curves_test.py

@@ -11,7 +11,7 @@
 import starry
 
 from .orbits import KeplerianOrbit
-from .light_curve import StarryLightCurve
+from .light_curves import StarryLightCurve
 
 
 def test_light_curve():

exoplanet/sampling.py

@@ -2,7 +2,7 @@
 
 from __future__ import division, print_function
 
-__all__ = ["TuningSchedule"]
+__all__ = ["PyMC3Sampler"]
 
 import logging
 
@@ -12,8 +12,8 @@
 from pymc3.step_methods.hmc import quadpotential as quad
 
 
-class TuningSchedule(object):
-    """A custom tuning scheduler for PyMC3 with support for dense mass matrices
+class PyMC3Sampler(object):
+    """A sampling wrapper for PyMC3 with support for dense mass matrices
 
     This schedule is based on the method used by as described in Section 34.2
     of the `Stan Manual <http://mc-stan.org/users/documentation/>`_.