Skip to content

Commit

Permalink
More PEP8 and auto-ignore (#90)
Browse files Browse the repository at this point in the history
  • Loading branch information
rth committed Mar 28, 2018
1 parent bf0df59 commit 2b648b0
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 30 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Expand Up @@ -7,6 +7,10 @@ doc/_build/
dist/*
*.c
*.so
.cache/
doc/examples/
doc/generated/
doc/modules/

examples/meuse_example_data/*
*.ipynb_checkpoints/*
12 changes: 6 additions & 6 deletions pykrige/__init__.py
Expand Up @@ -39,14 +39,14 @@
----------
.. [1] P.K. Kitanidis, Introduction to Geostatistics: Applications in
Hydrogeology, (Cambridge University Press, 1997) 272 p.
Copyright (c) 2015-2018, PyKrige Developers
"""

from . import kriging_tools as kt
from .ok import OrdinaryKriging
from .uk import UniversalKriging
from .ok3d import OrdinaryKriging3D
from .uk3d import UniversalKriging3D
from . import kriging_tools as kt # noqa
from .ok import OrdinaryKriging # noqa
from .uk import UniversalKriging # noqa
from .ok3d import OrdinaryKriging3D # noqa
from .uk3d import UniversalKriging3D # noqa

__all__ = ['ok', 'uk', 'ok3d', 'uk3d', 'kriging_tools']
1 change: 0 additions & 1 deletion pykrige/tests/__init__.py
@@ -1 +0,0 @@

22 changes: 11 additions & 11 deletions pykrige/uk.py
Expand Up @@ -3,6 +3,16 @@
from __future__ import print_function
from __future__ import unicode_literals

import numpy as np
import scipy.linalg
from scipy.spatial.distance import cdist
import matplotlib.pyplot as plt
from . import variogram_models
from . import core
from .core import _adjust_for_anisotropy, _initialize_variogram_model, \
_make_variogram_parameter_list, _find_statistics
import warnings

__doc__ = """
PyKrige
=======
Expand All @@ -19,20 +29,10 @@
----------
.. [1] P.K. Kitanidis, Introduction to Geostatistcs: Applications in
Hydrogeology, (Cambridge University Press, 1997) 272 p.
Copyright (c) 2015-2018, PyKrige Developers
"""

import numpy as np
import scipy.linalg
from scipy.spatial.distance import cdist
import matplotlib.pyplot as plt
from . import variogram_models
from . import core
from .core import _adjust_for_anisotropy, _initialize_variogram_model, \
_make_variogram_parameter_list, _find_statistics
import warnings


class UniversalKriging:
"""Provides greater control over 2D kriging by utilizing drift terms.
Expand Down
20 changes: 10 additions & 10 deletions pykrige/uk3d.py
Expand Up @@ -3,6 +3,16 @@
from __future__ import print_function
from __future__ import unicode_literals

import numpy as np
import scipy.linalg
from scipy.spatial.distance import cdist
import matplotlib.pyplot as plt
from . import variogram_models
from . import core
from .core import _adjust_for_anisotropy, _initialize_variogram_model, \
_make_variogram_parameter_list, _find_statistics
import warnings

__doc__ = """
PyKrige
=======
Expand All @@ -22,16 +32,6 @@
Copyright (c) 2015-2018, PyKrige Developers
"""

import numpy as np
import scipy.linalg
from scipy.spatial.distance import cdist
import matplotlib.pyplot as plt
from . import variogram_models
from . import core
from .core import _adjust_for_anisotropy, _initialize_variogram_model, \
_make_variogram_parameter_list, _find_statistics
import warnings


class UniversalKriging3D:
"""Three-dimensional universal kriging
Expand Down
4 changes: 2 additions & 2 deletions pykrige/variogram_models.py
Expand Up @@ -3,6 +3,8 @@
from __future__ import print_function
from __future__ import unicode_literals

import numpy as np

__doc__ = """
PyKrige
=======
Expand All @@ -24,8 +26,6 @@
Copyright (c) 2015-2018, PyKrige Developers
"""

import numpy as np


def linear_variogram_model(m, d):
"""Linear model, m is [slope, nugget]"""
Expand Down

0 comments on commit 2b648b0

Please sign in to comment.