apsg 1.2.2__tar.gz → 1.2.3__tar.gz

{apsg-1.2.2 → apsg-1.2.3}/HISTORY.md

@@ -1,5 +1,13 @@
 # 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.2 → apsg-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apsg
-Version: 1.2.2
+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.2 → apsg-1.2.3}/docs/conf.py

@@ -71,7 +71,7 @@ copyright = "2024, Ondrej Lexa"
 # The short X.Y version.
 version = "1.2"
 # The full version, including alpha/beta/rc tags.
-release = "1.2.2"
+release = "1.2.3"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

{apsg-1.2.2 → apsg-1.2.3}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.2
+current_version = 1.2.3
 commit = False
 tag = False
 

{apsg-1.2.2 → apsg-1.2.3}/setup.py

@@ -17,7 +17,7 @@ with open(path.join(CURRENT_PATH, "HISTORY.md")) as file:
 
 setup(
     name="apsg",
-    version="1.2.2",
+    version="1.2.3",
     description="APSG - The package for structural geologists",
     long_description=readme + "\n\n" + history,
     long_description_content_type="text/markdown",

{apsg-1.2.2 → apsg-1.2.3}/src/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
 
@@ -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-1.2.2 → apsg-1.2.3}/src/apsg/math/_vector.py

@@ -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-1.2.2 → apsg-1.2.3}/src/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.2 → apsg-1.2.3}/src/apsg.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apsg
-Version: 1.2.2
+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'