apsg 1.2.1__py2.py3-none-any.whl → 1.2.3__py2.py3-none-any.whl

apsg/__init__.py

@@ -98,6 +98,6 @@ __all__ = (
     "quicknet",
 )
 
-__version__ = "1.2.1"
+__version__ = "1.2.2"
 __author__ = "Ondrej Lexa"
 __email__ = "lexa.ondrej@gmail.com"

apsg/feature/_container.py

@@ -9,7 +9,7 @@ from apsg.config import apsg_conf
 from apsg.math._vector import Vector2, Vector3
 from apsg.helpers._math import acosd
 from apsg.feature._geodata import Lineation, Foliation, Pair, Fault, Cone
-from apsg.feature._tensor3 import OrientationTensor3, Ellipsoid
+from apsg.feature._tensor3 import OrientationTensor3, Ellipsoid, DeformationGradient3
 from apsg.feature._tensor2 import OrientationTensor2, Ellipse
 from apsg.feature._statistics import KentDistribution, vonMisesFisher
 
@@ -48,7 +48,7 @@ class FeatureSet:
         """Return label"""
         return self.name
 
-    def __array__(self, dtype=None):
+    def __array__(self, dtype=None, copy=None):
         return np.array([np.array(p) for p in self.data], dtype=dtype)
 
     def __eq__(self, other):
@@ -84,7 +84,7 @@ class FeatureSet:
         if isinstance(other, type(self)):
             return type(self)(self.data + other.data, name=self.name)
         else:
-            raise TypeError("Only {self.__name__} is allowed")
+            raise TypeError(f"Only {self.__name__} is allowed")
 
     def rotate(self, axis, phi):
         """Rotate ``FeatureSet`` object `phi` degress about `axis`."""
@@ -902,7 +902,7 @@ class PairSet(FeatureSet):
     def __repr__(self):
         return f"P({len(self)}) {self.name}"
 
-    def __array__(self, dtype=None):
+    def __array__(self, dtype=None, copy=None):
         return np.array([np.array(p) for p in self.data], dtype=dtype)
 
     @property
@@ -938,6 +938,45 @@ class PairSet(FeatureSet):
         """
         return Vector3Set([e.rax for e in self], name=self.name)
 
+    def angle(self, other=None):
+        """Return angles of all data in ``PairSet`` object
+
+        Without arguments it returns angles of all pairs in dataset.
+        If argument is ``PairSet`` of same length or single data object
+        element-wise angles are calculated.
+        """
+        res = []
+        if other is None:
+            res = [
+                abs(
+                    DeformationGradient3.from_two_pairs(
+                        e, f, symmetry=True
+                    ).axisangle()[1]
+                )
+                for e, f in combinations(self.data, 2)
+            ]
+        elif issubclass(type(other), PairSet):
+            res = [
+                abs(
+                    DeformationGradient3.from_two_pairs(
+                        e, f, symmetry=True
+                    ).axisangle()[1]
+                )
+                for e, f in zip(self, other)
+            ]
+        elif issubclass(type(other), Pair):
+            res = [
+                abs(
+                    DeformationGradient3.from_two_pairs(
+                        e, other, symmetry=True
+                    ).axisangle()[1]
+                )
+                for e in self
+            ]
+        else:
+            raise TypeError("Wrong argument type!")
+        return np.asarray(res)
+
     @property
     def ortensor(self):
         """Return Lisle (1989) orientation tensor ``OrientationTensor3`` of orientations
@@ -1111,6 +1150,45 @@ class FaultSet(PairSet):
         """Return dihedra planes of FaultSet as FoliationSet"""
         return FoliationSet([e.d for e in self], name=self.name + "-D")
 
+    def angle(self, other=None):
+        """Return angles of all data in ``FaultSet`` object
+
+        Without arguments it returns angles of all pairs in dataset.
+        If argument is ``FaultSet`` of same length or single data object
+        element-wise angles are calculated.
+        """
+        res = []
+        if other is None:
+            res = [
+                abs(
+                    DeformationGradient3.from_two_pairs(
+                        e, f, symmetry=False
+                    ).axisangle()[1]
+                )
+                for e, f in combinations(self.data, 2)
+            ]
+        elif issubclass(type(other), FaultSet):
+            res = [
+                abs(
+                    DeformationGradient3.from_two_pairs(
+                        e, f, symmetry=False
+                    ).axisangle()[1]
+                )
+                for e, f in zip(self, other)
+            ]
+        elif issubclass(type(other), Fault):
+            res = [
+                abs(
+                    DeformationGradient3.from_two_pairs(
+                        e, other, symmetry=False
+                    ).axisangle()[1]
+                )
+                for e in self
+            ]
+        else:
+            raise TypeError("Wrong argument type!")
+        return np.asarray(res)
+
     @classmethod
     def random(cls, n=25):
         """Create PairSet of random pairs"""
@@ -1578,8 +1656,10 @@ class ClusterSet(object):
     """
 
     def __init__(self, d, **kwargs):
-        assert isinstance(d, Vector2Set) or isinstance(
-            d, Vector3Set
+        assert (
+            isinstance(d, Vector2Set)
+            or isinstance(d, Vector3Set)
+            or isinstance(d, PairSet)
         ), "Only vec2set or vecset could be clustered"
         self.data = d.copy()
         self.maxclust = kwargs.get("maxclust", 2)

apsg/feature/_geodata.py

@@ -265,7 +265,7 @@ class Pair:
         """
         return not self == other
 
-    def __array__(self, dtype=None):
+    def __array__(self, dtype=None, copy=None):
         return np.hstack((self.fvec, self.lvec)).astype(dtype)
 
     def label(self):
@@ -485,7 +485,7 @@ class Fault(Pair):
         """
         return not self == other
 
-    def __array__(self, dtype=None):
+    def __array__(self, dtype=None, copy=None):
         return np.hstack((self.fvec, self.lvec, self.sense)).astype(dtype)
 
     def to_json(self):
@@ -649,7 +649,7 @@ class Cone:
     def __ne__(self, other):
         return not self == other
 
-    def __array__(self, dtype=None):
+    def __array__(self, dtype=None, copy=None):
         return np.hstack((self.axis, self.secant, self.revangle)).astype(dtype)
 
     def label(self):

apsg/math/_vector.py

@@ -26,7 +26,7 @@ class Vector:
     def __hash__(self):
         return hash((type(self).__name__,) + self._coords)
 
-    def __array__(self, dtype=None):
+    def __array__(self, dtype=None, copy=None):
         return np.array(self._coords, dtype=dtype)
 
     def to_json(self):
@@ -84,9 +84,6 @@ class Vector:
 
     __pos__ = __copy__
 
-    def __pow__(self, other):
-        return type(self)(np.power(self, other))
-
     def __abs__(self):
         return math.sqrt(sum(map(lambda x: x * x, self._coords)))
 
@@ -452,6 +449,12 @@ class Vector3(Vector):
         else:
             return float(r)
 
+    def __pow__(self, other):
+        if issubclass(type(other), Vector3):
+            return self.cross(other)
+        else:
+            return type(self)(np.power(self, other))
+
     @ensure_first_arg_same
     def cross(self, other):
         """

apsg/pandas/_pandas_api.py

@@ -103,7 +103,7 @@ class Vector3Array(ExtensionArray):
         """
         return Vec3Dtype()
 
-    def __array__(self, dtype=str):
+    def __array__(self, dtype=str, copy=None):
         return np.array([str(f) for f in self._obj], dtype=dtype)
 
     @classmethod

apsg/plotting/_stereonet.py

@@ -951,38 +951,39 @@ def quicknet(*args, **kwargs):
     filename = kwargs.get("filename", "stereonet.png")
     savefig_kwargs = kwargs.get("savefig_kwargs", {})
     fol_as_pole = kwargs.get("fol_as_pole", False)
+    label = kwargs.get("label", "_nolegend_")
     s = StereoNet(**kwargs)
     for arg in args:
         if isinstance(arg, Vector3):
             if isinstance(arg, Foliation):
                 if fol_as_pole:
-                    s.pole(arg)
+                    s.pole(arg, label=label)
                 else:
-                    s.great_circle(arg)
+                    s.great_circle(arg, label=label)
             elif isinstance(arg, Lineation):
-                s.line(arg)
+                s.line(arg, label=label)
             else:
-                s.vector(arg)
+                s.vector(arg, label=label)
         elif isinstance(arg, Fault):
-            s.fault(arg)
+            s.fault(arg, label=label)
         elif isinstance(arg, Pair):
-            s.pair(arg)
+            s.pair(arg, label=label)
         elif isinstance(arg, Cone):
-            s.cone(arg)
+            s.cone(arg, label=label)
         elif isinstance(arg, Vector3Set):
             if isinstance(arg, FoliationSet):
                 if fol_as_pole:
-                    s.pole(arg)
+                    s.pole(arg, label=label)
                 else:
-                    s.great_circle(arg)
+                    s.great_circle(arg, label=label)
             elif isinstance(arg, LineationSet):
-                s.line(arg)
+                s.line(arg, label=label)
             else:
-                s.vector(arg)
+                s.vector(arg, label=label)
         elif isinstance(arg, FaultSet):
-            s.fault(arg)
+            s.fault(arg, label=label)
         elif isinstance(arg, PairSet):
-            s.pair(arg)
+            s.pair(arg, label=label)
         else:
             print(f"{type(arg)} not supported.")
     if savefig:

{apsg-1.2.1.dist-info → apsg-1.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apsg
-Version: 1.2.1
+Version: 1.2.3
 Summary: APSG - The package for structural geologists
 Home-page: https://github.com/ondrolexa/apsg
 Author: Ondrej Lexa
@@ -140,6 +140,14 @@ APSG is free software: you can redistribute it and/or modify it under the terms
 
 # Changes
 
+### 1.2.3 (Nov 18 2024)
+ * ClusterSet accepts PairSet and FaultSet
+ * quicknet label option added
+ * vector pow bug fix
+
+### 1.2.2 (Oct 21 2024)
+ * Fault sense could be defined by str, one of 's', 'd', 'n' and 'r'
+
 ### 1.2.1 (Sep 23 2024)
  * Fault sense could be defined by str, one of 's', 'd', 'n' and 'r'
 

{apsg-1.2.1.dist-info → apsg-1.2.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-apsg/__init__.py,sha256=eM1G1KfWHxjUXGjUDXt4VOergl1vv69DCjV5s4tk_Xk,1966
+apsg/__init__.py,sha256=6n0THwRqQoQB3yTyIfOmPJe0LT28VWp1nHDN_PYuCww,1966
 apsg/config.py,sha256=X3_yXT96xXlVxFA94EfYFKJbrcGIHT0PvB9s8EKmYOg,4569
 apsg/shell.py,sha256=UFIOy01KckLsOlqfB0UomyWZ1ITL36-lBUFhlxWdZLE,718
 apsg/database/__init__.py,sha256=7Rvcf1KBBBNhoM28ZlvQ01CkScQTroFkoS4d1kD55Ws,315
@@ -7,8 +7,8 @@ apsg/database/_sdbread.py,sha256=Gzj0bpp0vnMvCfxIuX6Ktf01LoQWDCOcXST7HZp_XTY,108
 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=XGLq3GXpiWtzX6ROtuSc0kCPJEPTVRoIUtr8VpRZOWI,1664
-apsg/feature/_container.py,sha256=XFsoaDxsR-cSpbFfcY-g3aPbWT0u5j6AYDYZjPgDVLg,56601
-apsg/feature/_geodata.py,sha256=cGF8B-KdGtiwtFBQQycgWwMWtHuZY3xMYnHicnNv-ZI,22520
+apsg/feature/_container.py,sha256=2hQtc6a5Z6puwfHcia4AAXsFoD8OuXO-Iqfbq6zRmnw,59283
+apsg/feature/_geodata.py,sha256=NJ6jZJbq_-DX2ZLADEf5AMsPzz0T17RLizIq3uH_i7U,22553
 apsg/feature/_paleomag.py,sha256=WIICUOEJGGFHbCDF0gbW7lMt10jI0el0UVhkbMH7XAs,14911
 apsg/feature/_statistics.py,sha256=WwBU2D7SyIHMpWnO7WFqbIpSkz6KUCT9xkG8oVzgskQ,13916
 apsg/feature/_tensor2.py,sha256=-S-fI7_97UmJG78Q2gnXVUD_Qu7k0J9BXJ_AcoEKkOo,12397
@@ -19,9 +19,9 @@ apsg/helpers/_math.py,sha256=NLHw9UGiSlNggwZB-o0ORpG2sY00qIcbMbDJftRWFE8,896
 apsg/helpers/_notation.py,sha256=oSxvZdv06eJ5GotS2IwbAJ-8UTZ49z8slqdhUDQJ9e8,2486
 apsg/math/__init__.py,sha256=qJa4JP79nXn-6Xb7aaZUPWmz0qadmC4F0tGORTOZDVI,211
 apsg/math/_matrix.py,sha256=iXeBoTepWsPCNX4zPGQj9NM4TT6aNACVESDFSP9BQPE,10398
-apsg/math/_vector.py,sha256=IDaTiEpRtHCPqv2vjZP0dLTq5dYNOaeD3qOhq18_SuQ,16476
+apsg/math/_vector.py,sha256=mD8kYggfGys-XWtnE90X2ZcTGBtDN49wEAUXQYXj3dI,16587
 apsg/pandas/__init__.py,sha256=jmlsulHmH9IbErJgSWlJx1J33-v--O5zxSE4kdt6fUI,456
-apsg/pandas/_pandas_api.py,sha256=dHzrZyD2v3beY_sShQWombhxNw_SxqZhU5GMXpBxDtM,13864
+apsg/pandas/_pandas_api.py,sha256=_WpY5QJYAYZv9116xjWS0hOX2sgYcsGMPoSab7MWUFc,13875
 apsg/plotting/__init__.py,sha256=immav5OfKhYlOGZWUsFjuBp7k71vr2xLYygQkO6Oimc,627
 apsg/plotting/_fabricplot.py,sha256=QSqbRrL4EWbDsucfZLG0Oh1F0UP5ruK9tb3e9z9ff38,18863
 apsg/plotting/_paleomagplots.py,sha256=Gw-fqYJVjNxTNXLwAiUKnFUBoOTZv2MEd3XACLmQ6AM,2325
@@ -29,11 +29,11 @@ apsg/plotting/_plot_artists.py,sha256=6S0EKCqYU6rlBxcxcXALTk9PaUK6QL-BgUKmZH8tkM
 apsg/plotting/_projection.py,sha256=qnJgTQaFW0v2Pu9ySAEPADHhLgpXmfJ6QIrydry8rXQ,11473
 apsg/plotting/_roseplot.py,sha256=wqXo6b0k7lEvMrnByJYuoR_cuK1QIYZyZkObvigUx-g,12809
 apsg/plotting/_stereogrid.py,sha256=Buj0kp5P4cvTPowN6Jyt8wzvRMu3h5If1pwVWaal53M,11981
-apsg/plotting/_stereonet.py,sha256=f1nmBSKs_SjDW0npQJSX4gN2idqxtsHcfEwI64ITDak,36489
-apsg-1.2.1.dist-info/AUTHORS.md,sha256=OEu_2jVMx1fm5EOj4vBlI04uvX4P2sqjPYP12VjPIcI,130
-apsg-1.2.1.dist-info/LICENSE,sha256=NhDqn8b2aOSNn4U4tCfJTOQ6jeggFpLIBgJrAkzdiH0,1117
-apsg-1.2.1.dist-info/METADATA,sha256=rsi7FGSi8u-DnQaVRmQXuWDl8POHI1yPvrt5rS1FZc4,15355
-apsg-1.2.1.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
-apsg-1.2.1.dist-info/entry_points.txt,sha256=SowP7_uRI0NJuzznKBXyM9BJcSwBxbXo6Iz5LUo9mEQ,42
-apsg-1.2.1.dist-info/top_level.txt,sha256=xWxwi0nqqOyKdmpsszfR-bmqnNpgVbhnLRuIKGJnaUM,5
-apsg-1.2.1.dist-info/RECORD,,
+apsg/plotting/_stereonet.py,sha256=EMklIw7aWwzDUI2xTRHIBTya-yKiWuPUkPDB8Zz2KNA,36704
+apsg-1.2.3.dist-info/AUTHORS.md,sha256=OEu_2jVMx1fm5EOj4vBlI04uvX4P2sqjPYP12VjPIcI,130
+apsg-1.2.3.dist-info/LICENSE,sha256=NhDqn8b2aOSNn4U4tCfJTOQ6jeggFpLIBgJrAkzdiH0,1117
+apsg-1.2.3.dist-info/METADATA,sha256=O1_PeJhALpIYZNRI9j4M4BarkxOjl2z16YzbkPkSMs4,15570
+apsg-1.2.3.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
+apsg-1.2.3.dist-info/entry_points.txt,sha256=SowP7_uRI0NJuzznKBXyM9BJcSwBxbXo6Iz5LUo9mEQ,42
+apsg-1.2.3.dist-info/top_level.txt,sha256=xWxwi0nqqOyKdmpsszfR-bmqnNpgVbhnLRuIKGJnaUM,5
+apsg-1.2.3.dist-info/RECORD,,

{apsg-1.2.1.dist-info → apsg-1.2.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any