apsg 1.3.5__py3-none-any.whl → 1.3.6__py3-none-any.whl

apsg/__init__.py

@@ -158,6 +158,6 @@ __all__ = (
     "quicknet",
 )
 
-__version__ = "1.3.5"
+__version__ = "1.3.6"
 __author__ = "Ondrej Lexa"
 __email__ = "lexa.ondrej@gmail.com"

apsg/config.py

@@ -138,7 +138,6 @@ apsg_conf = dict(
     ),
     roseplot_default_kwargs=dict(
         bins=36,
-        axial=True,
         density=True,
         arrowness=0.95,
         rwidth=1,

apsg/database/_sdbread.py

@@ -10,7 +10,7 @@ from apsg.feature._geodata import Lineation, Foliation
 from apsg.feature._container import LineationSet, FoliationSet
 
 
-class SDB(object):
+class SDB:
     """
     sqlite3 based read-only interface to PySDB database
 

apsg/feature/_container.py

@@ -142,6 +142,14 @@ class Vector2Set(FeatureSet):
         """Return array of direction angles"""
         return np.asarray([e.direction for e in self]).T
 
+    def to_vec2(self):
+        """Return ``Vector2Set`` object with all data converted to ``Vector2``."""
+        return Vector2Set([Vector2(e) for e in self], name=self.name)
+
+    def to_dir2(self):
+        """Return ``Direction2Set`` object with all data converted to ``Direction``."""
+        return Direction2Set([Direction(e) for e in self], name=self.name)
+
     def proj(self, vec):
         """Return projections of all features in ``Vector2Set`` onto vector."""
         return type(self)([e.project() for e in self], name=self.name)
@@ -1752,7 +1760,7 @@ class ClusterSet(object):
         """
 
         self.method = kwargs.get("method", self.method)
-        if issubclass(self.__feature_class__, (Axial2, Axial3)):
+        if issubclass(self.data.__feature_class__, (Axial2, Axial3)):
             self.Z = linkage(self.pdist, method=self.method, metric=angle_metric_axial)
         else:
             self.Z = linkage(self.pdist, method=self.method, metric=angle_metric)

apsg/plotting/_roseplot.py

@@ -1,12 +1,13 @@
 import pickle
 
-import numpy as np
 import matplotlib.pyplot as plt
-from scipy.stats import vonmises, circmean
+import numpy as np
+from scipy.stats import circmean, vonmises
 
 from apsg.config import apsg_conf
-from apsg.plotting._plot_artists import RosePlotArtistFactory
 from apsg.feature import feature_from_json
+from apsg.math._vector import Axial2, Axial3
+from apsg.plotting._plot_artists import RosePlotArtistFactory
 
 __all__ = ["RosePlot"]
 
@@ -20,7 +21,6 @@ class RosePlot(object):
         title_kws (dict): dictionary of keyword arguments passed to matplotlib suptitle
             method.
         bins (int): Number of bins. Default 36
-        axial (bool): Directional data are axial. Defaut True
         density (bool): Use density instead of counts. Default False
         pdf (bool): Plot Von Mises density function instead histogram. Default False
         pdf_res (int): Resolution of pdf. Default 901
@@ -245,7 +245,7 @@ class RosePlot(object):
         width = 2 * np.pi / self._kwargs["bins"]
         legend = kwargs.pop("legend")
         for arg in args:
-            if self._kwargs["axial"]:
+            if issubclass(arg.__feature_class__, (Axial2, Axial3)):
                 ang = np.concatenate((arg.direction % 360, (arg.direction + 180) % 360))
                 weights = np.concatenate((abs(arg), abs(arg)))
             else:
@@ -279,7 +279,7 @@ class RosePlot(object):
             ang = arg.direction % 360
             # weights = abs(arg)
             radii = np.zeros_like(theta)
-            if self._kwargs["axial"]:
+            if issubclass(arg.__feature_class__, (Axial2, Axial3)):
                 for a in ang:
                     radii += (
                         vonmises.pdf(theta, self._kwargs["kappa"], loc=np.radians(a))
@@ -308,32 +308,21 @@ class RosePlot(object):
             bottom = bottom + radii
 
     def _muci(self, *args, **kwargs):
-        ang = np.radians(np.concatenate([arg.direction for arg in args]))
         conflevel = kwargs.pop("confidence_level")
         n_resamples = kwargs.pop("n_resamples")
-        # calculate mean and CI
-        if self._kwargs["axial"]:
-            mu = circmean(2 * ang) / 2
-            ang_shift = ang + np.pi / 2 - mu
-            bsmu = [
-                circmean(np.random.choice(2 * ang_shift, size=len(ang_shift)))
-                for i in range(n_resamples)
-            ]
-            low = np.percentile(bsmu, 100 - conflevel) / 2 + mu - np.pi / 2
-            high = np.percentile(bsmu, conflevel) / 2 + mu - np.pi / 2
-        else:
-            mu = circmean(ang)
-            ang_shift = ang + np.pi - mu
-            bsmu = [
-                circmean(np.random.choice(ang_shift, size=len(ang_shift)))
-                for i in range(n_resamples)
-            ]
-            low = np.percentile(bsmu, (100 - conflevel) / 2) + mu - np.pi
-            high = np.percentile(bsmu, 100 - (100 - conflevel) / 2) + mu - np.pi
-        radii = []
         for arg in args:
+            radii = []
             p = 0
-            if self._kwargs["axial"]:
+            ang = np.radians(arg.direction)
+            if issubclass(arg.__feature_class__, (Axial2, Axial3)):
+                mu = circmean(2 * ang) / 2
+                ang_shift = ang + np.pi / 2 - mu
+                bsmu = [
+                    circmean(np.random.choice(2 * ang_shift, size=len(ang_shift)))
+                    for i in range(n_resamples)
+                ]
+                low = np.percentile(bsmu, 100 - conflevel) / 2 + mu - np.pi / 2
+                high = np.percentile(bsmu, conflevel) / 2 + mu - np.pi / 2
                 for a in arg.direction:
                     p += vonmises.pdf(mu, self._kwargs["kappa"], loc=np.radians(a)) / 2
                     p += (
@@ -341,16 +330,28 @@ class RosePlot(object):
                         / 2
                     )
             else:
+                mu = circmean(ang)
+                ang_shift = ang + np.pi - mu
+                bsmu = [
+                    circmean(np.random.choice(ang_shift, size=len(ang_shift)))
+                    for i in range(n_resamples)
+                ]
+                low = np.percentile(bsmu, (100 - conflevel) / 2) + mu - np.pi
+                high = np.percentile(bsmu, 100 - (100 - conflevel) / 2) + mu - np.pi
                 for a in arg.direction:
                     p += vonmises.pdf(mu, self._kwargs["kappa"], loc=np.radians(a))
             radii.append(p / len(arg))
-        if self._kwargs["scaled"]:
-            radii = np.sqrt(radii)
-        mur = 1.1 * sum(radii)
-        ci_angles = np.linspace(low, high, int(5 * np.degrees(high - low)))
-        self.ax.plot([mu, mu + np.pi], [mur, mur], **kwargs)
-        self.ax.plot(ci_angles, mur * np.ones_like(ci_angles), **kwargs)
-        self.ax.plot(ci_angles + np.pi, mur * np.ones_like(ci_angles), **kwargs)
+            if self._kwargs["scaled"]:
+                radii = np.sqrt(radii)
+            mur = 1.1 * sum(radii)
+            ci_angles = np.linspace(low, high, int(5 * np.degrees(high - low)))
+            if issubclass(arg.__feature_class__, (Axial2, Axial3)):
+                self.ax.plot([mu, mu + np.pi], [mur, mur], **kwargs)
+                self.ax.plot(ci_angles, mur * np.ones_like(ci_angles), **kwargs)
+                self.ax.plot(ci_angles + np.pi, mur * np.ones_like(ci_angles), **kwargs)
+            else:
+                self.ax.plot([0, mu], [0, mur], **kwargs)
+                self.ax.plot(ci_angles, mur * np.ones_like(ci_angles), **kwargs)
 
 
 def roseartist_from_json(obj_json):

{apsg-1.3.5.dist-info → apsg-1.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apsg
-Version: 1.3.5
+Version: 1.3.6
 Summary: APSG - The package for structural geologists
 Author-email: Ondrej Lexa <lexa.ondrej@gmail.com>
 Maintainer-email: Ondrej Lexa <lexa.ondrej@gmail.com>
@@ -59,14 +59,8 @@ Requires-Dist: ipykernel; extra == "docs"
 Requires-Dist: nbsphinx; extra == "docs"
 Requires-Dist: autodocsumm; extra == "docs"
 Provides-Extra: dev
-Requires-Dist: pytest; extra == "dev"
+Requires-Dist: apsg[docs,extra,tests]; extra == "dev"
 Requires-Dist: black; extra == "dev"
-Requires-Dist: sphinx; extra == "dev"
-Requires-Dist: sphinx_rtd_theme; extra == "dev"
-Requires-Dist: readthedocs-sphinx-search; extra == "dev"
-Requires-Dist: ipykernel; extra == "dev"
-Requires-Dist: nbsphinx; extra == "dev"
-Requires-Dist: autodocsumm; extra == "dev"
 Dynamic: license-file
 
 <img src="https://ondrolexa.github.io/apsg/apsg_banner.svg" alt="APSG logo" width="300px"/>

{apsg-1.3.5.dist-info → apsg-1.3.6.dist-info}/RECORD

@@ -1,13 +1,13 @@
-apsg/__init__.py,sha256=4i4ax3NRSxmyaPTssR_c_6j17kFU7CAbEfW02aeXjwc,2849
-apsg/config.py,sha256=X3_yXT96xXlVxFA94EfYFKJbrcGIHT0PvB9s8EKmYOg,4569
+apsg/__init__.py,sha256=er5PTmzLPoYoorvyKGhTjeyE6lVsLZr0nB5ariut94o,2849
+apsg/config.py,sha256=vwJZVqWQ2bXe4TNW3hzse-dIam3QBwNeFx5VJUhNjU8,4549
 apsg/shell.py,sha256=1D0PeB7qXzlpiOf2QYGo6OJlEVN1KJPYld1GEREBiFg,707
 apsg/database/__init__.py,sha256=7Rvcf1KBBBNhoM28ZlvQ01CkScQTroFkoS4d1kD55Ws,315
 apsg/database/_alchemy.py,sha256=geV3Q6ZLdGvjzxry7GTHHIQq6t_ccsUxZvuv13CLYFQ,19467
-apsg/database/_sdbread.py,sha256=EP0hSp6_4-DZZptkMNDgKnQ3GD58mpr_SAgFohKu6xQ,11017
+apsg/database/_sdbread.py,sha256=lKvImHCFaxXr0wx5FnogVRp6bAPeaP01MDpUn_rH3Ek,11009
 apsg/decorator/__init__.py,sha256=fZ-dxpldQIk6-2JhVnCj-Tsl8bz2nvoGOyG7uXKvBfg,160
 apsg/decorator/_decorator.py,sha256=8TMSrcVvhU5UCbNMrnyrW3-65qo20_6N2ShtXd3bP-k,1194
 apsg/feature/__init__.py,sha256=XkyS-X8lUaXCVaXgoK0GETmTCCGqB1BmSwZRZG3blZQ,1733
-apsg/feature/_container.py,sha256=Rx7rEO1DQB-dUDXIbJJlig-Ly0ler25eYLRK5uKd3aY,60443
+apsg/feature/_container.py,sha256=7RLkTnEwDDhm6c4jErQOTIPg5KBM46SLpcFlrtyZHvg,60812
 apsg/feature/_geodata.py,sha256=tjgPSKXyEOXiAN3iPeHpm8kpj__jI4ahtTpDuWhQNBE,24008
 apsg/feature/_paleomag.py,sha256=WIICUOEJGGFHbCDF0gbW7lMt10jI0el0UVhkbMH7XAs,14911
 apsg/feature/_statistics.py,sha256=WwBU2D7SyIHMpWnO7WFqbIpSkz6KUCT9xkG8oVzgskQ,13916
@@ -27,12 +27,12 @@ apsg/plotting/_fabricplot.py,sha256=yjy3DEhIZfq448FYKnQb3EhqLm9-f-EZHJEamG98k9Q,
 apsg/plotting/_paleomagplots.py,sha256=Gw-fqYJVjNxTNXLwAiUKnFUBoOTZv2MEd3XACLmQ6AM,2325
 apsg/plotting/_plot_artists.py,sha256=6S0EKCqYU6rlBxcxcXALTk9PaUK6QL-BgUKmZH8tkMc,21059
 apsg/plotting/_projection.py,sha256=ix67PwOU2WGjryEcsHlVIMpcVC9yxy45ycOV9k5x_Q8,11805
-apsg/plotting/_roseplot.py,sha256=jbaUXSb3DIcXs0pWAQUTZfdlA2XcbquT0yHLYDjLirQ,12808
+apsg/plotting/_roseplot.py,sha256=Wq5NBCDZMUQWEioIC6hYAZzjDKZsiDIJtjk_vQzzCd8,13104
 apsg/plotting/_stereogrid.py,sha256=awh7MwN1WgszhOlr6UgR20wHQJ8u778-Tf_w1uflrV4,11869
 apsg/plotting/_stereonet.py,sha256=uHJXluFMkeaI4yzD9pGc4DIlgjZA01INySLKtUHLAlU,36624
-apsg-1.3.5.dist-info/licenses/LICENSE,sha256=lY0kfpVRrzcgVZq7pI6rLK5WYiUMWe0bdKpDelN6hk8,1120
-apsg-1.3.5.dist-info/METADATA,sha256=9Y4Y2Ixu8KOY_UgxJ_3l4m4sL726P8eRRjlmMbW7PoE,8298
-apsg-1.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-apsg-1.3.5.dist-info/entry_points.txt,sha256=SowP7_uRI0NJuzznKBXyM9BJcSwBxbXo6Iz5LUo9mEQ,42
-apsg-1.3.5.dist-info/top_level.txt,sha256=xWxwi0nqqOyKdmpsszfR-bmqnNpgVbhnLRuIKGJnaUM,5
-apsg-1.3.5.dist-info/RECORD,,
+apsg-1.3.6.dist-info/licenses/LICENSE,sha256=lY0kfpVRrzcgVZq7pI6rLK5WYiUMWe0bdKpDelN6hk8,1120
+apsg-1.3.6.dist-info/METADATA,sha256=tD60lfw5Bi1DY0NlsQG6FEnKxv87Bukfz5a-_-jVdks,8047
+apsg-1.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+apsg-1.3.6.dist-info/entry_points.txt,sha256=SowP7_uRI0NJuzznKBXyM9BJcSwBxbXo6Iz5LUo9mEQ,42
+apsg-1.3.6.dist-info/top_level.txt,sha256=xWxwi0nqqOyKdmpsszfR-bmqnNpgVbhnLRuIKGJnaUM,5
+apsg-1.3.6.dist-info/RECORD,,