apsg 1.1.3__py2.py3-none-any.whl → 1.1.5__py2.py3-none-any.whl

apsg/__init__.py

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

apsg/feature/_container.py

@@ -142,18 +142,18 @@ class Vector2Set(FeatureSet):
         return np.asarray([e.direction for e in self]).T
 
     def proj(self, vec):
-        """Return projections of all features in ``FeatureSet`` onto vector."""
+        """Return projections of all features in ``Vector2Set`` onto vector."""
         return type(self)([e.project() for e in self], name=self.name)
 
     def dot(self, vec):
-        """Return array of dot products of all features in ``FeatureSet`` with vector."""
+        """Return array of dot products of all features in ``Vector2Set`` with vector."""
         return np.array([e.dot(vec) for e in self])
 
     def cross(self, other=None):
-        """Return cross products of all features in ``FeatureSet``
+        """Return cross products of all features in ``Vector2Set``
 
         Without arguments it returns cross product of all pairs in dataset.
-        If argument is ``FeatureSet`` of same length or single data object
+        If argument is ``Vector2Set`` of same length or single data object
         element-wise cross-products are calculated.
         """
         res = []
@@ -170,10 +170,10 @@ class Vector2Set(FeatureSet):
     __pow__ = cross
 
     def angle(self, other=None):
-        """Return angles of all data in ``FeatureSet`` object
+        """Return angles of all data in ``Vector2Set`` object
 
         Without arguments it returns angles of all pairs in dataset.
-        If argument is ``FeatureSet`` of same length or single data object
+        If argument is ``Vector2Set`` of same length or single data object
         element-wise angles are calculated.
         """
         res = []
@@ -188,13 +188,13 @@ class Vector2Set(FeatureSet):
         return np.asarray(res)
 
     def normalized(self):
-        """Return ``FeatureSet`` object with normalized (unit length) elements."""
+        """Return ``Vector2Set`` object with normalized (unit length) elements."""
         return type(self)([e.normalized() for e in self], name=self.name)
 
     uv = normalized
 
     def transform(self, F, **kwargs):
-        """Return affine transformation of all features ``FeatureSet`` by matrix 'F'.
+        """Return affine transformation of all features ``Vector2Set`` by matrix 'F'.
 
         Args:
           F: Transformation matrix. Array-like value e.g. ``DeformationGradient3``
@@ -206,12 +206,12 @@ class Vector2Set(FeatureSet):
         return type(self)([e.transform(F, **kwargs) for e in self], name=self.name)
 
     def R(self, mean=False):
-        """Return resultant of data in ``FeatureSet`` object.
+        """Return resultant of data in ``Vector2Set`` object.
 
-        Resultant is of same type as features in ``FeatureSet``. Note
-        that ``Foliation`` and ``Lineation`` are axial in nature so
-        resultant can give other result than expected. Anyway for axial
-        data orientation tensor analysis will give you right answer.
+        Resultant is of same type as features in ``Vector2Set``. Note
+        that ``Axial2`` is axial in nature so resultant can give
+        other result than expected. Anyway for axial data orientation
+        tensor analysis will give you right answer.
 
         Args:
             mean: if True returns mean resultant. Default False
@@ -254,7 +254,7 @@ class Vector2Set(FeatureSet):
         return acosd(abs(self.R(mean=True)))
 
     def rdegree(self):
-        """Degree of preffered orientation of vectors in ``FeatureSet``.
+        """Degree of preffered orientation of vectors in ``Vector2Set``.
 
         D = 100 * (2 * abs(R) - n) / n
         """
@@ -279,7 +279,7 @@ class Vector2Set(FeatureSet):
         return self._cache["svd"]
 
     def halfspace(self):
-        """Change orientation of vectors in ``FeatureSet``, so all have angle<=90 with
+        """Change orientation of vectors in ``Vector2Set``, so all have angle<=90 with
         resultant.
 
         """
@@ -298,13 +298,13 @@ class Vector2Set(FeatureSet):
 
     @classmethod
     def from_direction(cls, angles, name="Default"):
-        """Create ``FeatureSet`` object from arrays of direction angles
+        """Create ``Vector2Set`` object from arrays of direction angles
 
         Args:
           angles: list or angles
 
         Keyword Args:
-          name: name of ``FeatureSet`` object. Default is 'Default'
+          name: name of ``Vector2Set`` object. Default is 'Default'
 
         Example:
           >>> f = vec2set.from_angles([120,130,140,125, 132. 131])
@@ -314,14 +314,14 @@ class Vector2Set(FeatureSet):
 
     @classmethod
     def from_xy(cls, x, y, name="Default"):
-        """Create ``FeatureSet`` object from arrays of x and y components
+        """Create ``Vector2Set`` object from arrays of x and y components
 
         Args:
           x: list or array of x components
           y: list or array of y components
 
         Keyword Args:
-          name: name of ``FeatureSet`` object. Default is 'Default'
+          name: name of ``Vector2Set`` object. Default is 'Default'
 
         Example:
           >>> v = vec2set.from_xy([-0.4330127, -0.4330127, -0.66793414],
@@ -332,7 +332,7 @@ class Vector2Set(FeatureSet):
 
     @classmethod
     def random(cls, n=100, name="Default"):
-        """Method to create ``FeatureSet`` of features with uniformly distributed
+        """Method to create ``Vector2Set`` of features with uniformly distributed
         random orientation.
 
         Keyword Args:
@@ -349,7 +349,7 @@ class Vector2Set(FeatureSet):
 
     @classmethod
     def random_vonmises(cls, n=100, position=0, kappa=5, name="Default"):
-        """Return ``FeatureSet`` of random vectors sampled from von Mises distribution
+        """Return ``Vector2Set`` of random vectors sampled from von Mises distribution
         around center position with concentration kappa.
 
         Args:

apsg/feature/_paleomag.py

@@ -156,10 +156,10 @@ class Core(object):
         infoln = "{:<8}  a={:5.1f}   b={:5.1f}   s={:5.1f}   d={:5.1f}   v={}m3  {}"
         ln0 = infoln.format(
             ff,
-            self.gref.lin.dd[0],
-            self.gref.lin.dd[1],
-            self.bedding.dd[0],
-            self.bedding.dd[1],
+            self.gref.lin.geo[0],
+            self.gref.lin.geo[1],
+            self.bedding.geo[0],
+            self.bedding.geo[1],
             eformat(self.volume, 2),
             dt,
         )
@@ -274,7 +274,7 @@ class Core(object):
         data["a95"] = body[ix]["Prec"].to_list()
         data["vectors"] = []
         for n, r in body[ix].iterrows():
-            data["vectors"].append(r[2] * Vector3(r["Dsp"], r["Isp"]))
+            data["vectors"].append(r.iloc[2] * Vector3(r["Dsp"], r["Isp"]))
         return cls(**data)
 
     def write_rs3(self, filename=None):
@@ -295,14 +295,14 @@ class Core(object):
         latitude = self.latitude if self.latitude is not None else ""
         longitude = self.longitude if self.longitude is not None else ""
         height = self.height if self.height is not None else ""
-        sdec, sinc = (round(self.gref.fol.dd[0]), round(self.gref.fol.dd[1]))
+        sdec, sinc = (round(self.gref.fol.geo[0]), round(self.gref.fol.geo[1]))
         bdec, binc = (
-            (round(self.bedding.dd[0]), round(self.bedding.dd[1]))
+            (round(self.bedding.geo[0]), round(self.bedding.geo[1]))
             if self.bedding is not None
             else ("", "")
         )
         fdec, finc = (
-            (round(self.foldaxis.dd[0]), round(self.foldaxis.dd[1]))
+            (round(self.foldaxis.geo[0]), round(self.foldaxis.geo[1]))
             if self.foldaxis is not None
             else ("", "")
         )
@@ -324,7 +324,7 @@ class Core(object):
                 self.a95,
                 self.comments,
             ):
-                ln = f"{id:2} {step:<10} {MAG:>13g} {V.dd[0]:>5.1f} {V.dd[1]:> 5.1f} {geo.dd[0]:>5.1f} {geo.dd[1]:> 5.1f} {tilt.dd[0]:>5.1f} {tilt.dd[1]:> 5.1f}             {a95:>5.1f}                                   {comment:10}"
+                ln = f"{id:2} {step:<10} {MAG:>13g} {V.geo[0]:>5.1f} {V.geo[1]:> 5.1f} {geo.geo[0]:>5.1f} {geo.geo[1]:> 5.1f} {tilt.geo[0]:>5.1f} {tilt.geo[1]:> 5.1f}             {a95:>5.1f}                                   {comment:10}"
                 print(ln, file=res3file, end="\r\n")
 
     @property
@@ -342,14 +342,14 @@ class Core(object):
         ):
             ln = "{:<4} {: 9.2E} {: 9.2E} {: 9.2E} {: 9.2E} {:5.1f} {:5.1f} {:5.1f} {:5.1f} {:4.1f} {}".format(
                 step,
-                V[0],
-                V[1],
-                V[2],
+                V.x,
+                V.y,
+                V.z,
                 MAG,
-                geo.dd[0],
-                geo.dd[1],
-                tilt.dd[0],
-                tilt.dd[1],
+                geo.geo[0],
+                geo.geo[1],
+                tilt.geo[0],
+                tilt.geo[1],
                 a95,
                 comment,
             )
@@ -399,7 +399,7 @@ class Core(object):
     def tilt(self):
         """Returns ``Vector3Set`` of vectors in tilt‐corrected coordinates system"""
         return self.geo.rotate(
-            Lineation(self.bedding.dd[0] - 90, 0), -self.bedding.dd[1]
+            Lineation(self.bedding.geo[0] - 90, 0), -self.bedding.geo[1]
         )
 
     def pca(self, kind="geo", origin=False):

apsg/feature/_tensor2.py

@@ -454,7 +454,7 @@ class Ellipse(Tensor2):
         """
         Return the orientation of the maximum eigenvector.
         """
-        return self.eigenvectors()[np.argmax(self.eigenvalues())].direction % 180
+        return self.V1.direction % 180
 
     @property
     def e12(self) -> float:
@@ -493,10 +493,10 @@ class OrientationTensor2(Ellipse):
     @classmethod
     def from_features(cls, g) -> "OrientationTensor2":
         """
-        Return ``Ortensor`` of data in ``Group``
+        Return ``Ortensor`` of data in Vector2Set features
 
         Args:
-            g: ``Group`` of ``Vector2``, ``Lin`` or ``Foliation``
+            g (Vector2Set): Set of features
 
         Example:
           >>> v = vec2set.random_vonmises(position=120)

apsg/feature/_tensor3.py

@@ -339,8 +339,23 @@ class Stress3(Tensor3):
     """
     The class to represent 3D stress tensor.
 
-    Note: Tensile normal stresses have positive values,
-    and compressive normal stresses have negative values.
+    The real eigenvalues of the stress tensor are what we call
+    the principal stresses. There are 3 of these in 3D, available
+    as properties E1, E2, and E3 in descending order of magnitude
+    (max, intermediate, and minimum principal stresses) with orientations
+    available as properties V1, V2 and V3. The minimum principal stress
+    is simply the eigenvalue that has the lowest magnitude. Therefore,
+    the maximum principal stress is the most tensile (least compressive)
+    and the minimum principal stress is the least tensile (most compressive).
+    Tensile normal stresses have positive values, and compressive normal
+    stresses have negative values. If the maximum principal stress is <=0 and the minimum principal stress
+    is negative then the stresses are completely compressive.
+
+    Note: Stress tensor has a special properties sigma1, sigma2 and sigma3
+    to follow common geological terminology. sigma1 is most compressive
+    (least tensile) while sigma3 is most tensile (least compressive).
+    Their orientation could be accessed with properties sigma1dir,
+    sigma2dir and sigma3dir.
 
     Args:
       a (3x3 array_like): Input data, that can be converted to
@@ -646,8 +661,10 @@ class Ellipsoid(Tensor3):
     """
 
     def __repr__(self) -> str:
-        return f"{Matrix3.__repr__(self)}\n\
-                 (S1:{self.S1:.3g}, S2:{self.S2:.3g}, S3:{self.S3:.3g})"
+        return (
+            f"{Matrix3.__repr__(self)}\n"
+            f"(S1:{self.S1:.3g}, S2:{self.S2:.3g}, S3:{self.S3:.3g})"
+        )
 
     @classmethod
     def from_defgrad(cls, F, form="left", **kwargs) -> "Ellipsoid":
@@ -972,10 +989,10 @@ class OrientationTensor3(Ellipsoid):
     @classmethod
     def from_features(cls, g) -> "OrientationTensor3":
         """
-        Return ``Ortensor`` of data in ``Group``
+        Return ``Ortensor`` of data in Vector3Set of features
 
         Args:
-            g: ``Group`` of ``Vector3``, ``Lin`` or ``Foliation``
+            g (Vector3Set): Set of features
 
         Example:
           >>> g = linset.random_fisher(position=lin(120,50))

apsg/helpers/_math.py

@@ -22,12 +22,12 @@ def tand(x):
 
 def asind(x):
     """Calculate arc sine in degrees"""
-    return math.degrees(math.asin(x))
+    return math.degrees(math.asin(max(min(x, 1), -1)))
 
 
 def acosd(x):
     """Calculate arc cosine in degrees"""
-    return math.degrees(math.acos(x))
+    return math.degrees(math.acos(max(min(x, 1), -1)))
 
 
 def atand(x):

apsg/math/_vector.py

@@ -173,7 +173,7 @@ class Vector2(Vector):
             coords = (1, 0)
         if len(args) == 1:
             if np.asarray(args[0]).shape == Vector2.__shape__:
-                coords = np.asarray(args[0])
+                coords = tuple(c.item() for c in np.asarray(args[0]))
             elif isinstance(args[0], str):
                 if args[0].lower() == "x":
                     coords = (1, 0)
@@ -375,7 +375,7 @@ class Vector3(Vector):
             coords = (1, 0, 0)
         elif len(args) == 1:
             if np.asarray(args[0]).shape == Vector3.__shape__:
-                coords = np.asarray(args[0])
+                coords = tuple(c.item() for c in np.asarray(args[0]))
             elif isinstance(args[0], str):
                 if args[0].lower() == "x":
                     coords = (1, 0, 0)

{apsg-1.1.3.dist-info → apsg-1.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apsg
-Version: 1.1.3
+Version: 1.1.5
 Summary: APSG - The package for structural geologists
 Home-page: https://github.com/ondrolexa/apsg
 Author: Ondrej Lexa
@@ -139,6 +139,13 @@ APSG is free software: you can redistribute it and/or modify it under the terms
 
 # Changes
 
+### 1.1.5 (May 15 2024)
+ * paleomag Core .dd bug fixed
+ * fix round-off domain math error for acosd and asind
+
+### 1.1.4 (Dec 13 2023)
+ * Ellipsoid repr bugfix
+
 ### 1.1.3 (Oct 23 2023)
 Bugfix release
  * slip and dilatation tendency methods added to stress

{apsg-1.1.3.dist-info → apsg-1.1.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-apsg/__init__.py,sha256=eXd2zpl-ZNkQZwK6BWc4c_KduCOI7OSP10Q5_eufwBQ,1966
+apsg/__init__.py,sha256=6Iaw3uD3tBDYuGkMgEO7DQgCKgti9Jm5JMDACeay844,1966
 apsg/config.py,sha256=X3_yXT96xXlVxFA94EfYFKJbrcGIHT0PvB9s8EKmYOg,4569
 apsg/shell.py,sha256=UFIOy01KckLsOlqfB0UomyWZ1ITL36-lBUFhlxWdZLE,718
 apsg/database/__init__.py,sha256=7Rvcf1KBBBNhoM28ZlvQ01CkScQTroFkoS4d1kD55Ws,315
@@ -7,19 +7,19 @@ 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=H2U_ZkVz6gRJUrQO81-f10z9HnuIDgYuVeYqbvb7gjU,56081
+apsg/feature/_container.py,sha256=KxVO9nwvzlCI3GJOKCpk0P2_uV1WP7c7JOm_26EvbKY,56059
 apsg/feature/_geodata.py,sha256=rI2i9ecBLw5icsJ_NEjxRQEuBrfsFbMn7E22TmvNosk,21462
-apsg/feature/_paleomag.py,sha256=7PrFIpZzbYas02QPKQLgxCbmw_LGvu19bSRpru3-uko,14887
+apsg/feature/_paleomag.py,sha256=WIICUOEJGGFHbCDF0gbW7lMt10jI0el0UVhkbMH7XAs,14911
 apsg/feature/_statistics.py,sha256=WwBU2D7SyIHMpWnO7WFqbIpSkz6KUCT9xkG8oVzgskQ,13916
-apsg/feature/_tensor2.py,sha256=P1piFhHwlKuq3OQNS6ZqgvIDsSyoy75yLIQjaVyz0ZA,12452
-apsg/feature/_tensor3.py,sha256=KRoBnqdL4d6Hb0_PSi9A5_LlpekP52fi1HL5_hwO3Ak,26956
+apsg/feature/_tensor2.py,sha256=-S-fI7_97UmJG78Q2gnXVUD_Qu7k0J9BXJ_AcoEKkOo,12397
+apsg/feature/_tensor3.py,sha256=Js4wRgMUClEQQpRnJZ5NiYRnBC1W3k0UC4ohRcNH16Y,27973
 apsg/helpers/__init__.py,sha256=6SF_Srq6fS-uomvpwdW0JSQs-tmWnzUoTk4a1K_J1aE,532
 apsg/helpers/_helper.py,sha256=1Xf1yiNYIEoUJqXH4C0390osGWk6AERr_LrCSTnsRVw,146
-apsg/helpers/_math.py,sha256=OqY8W2YBfmMuTiuixzqJFqL5HWUUserZZ9KYL2dQwwk,862
+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=qxdtCBUwZ0RP2sPvJOCU6ApdmMjyArNrCtT9E-6uJRQ,16426
+apsg/math/_vector.py,sha256=IDaTiEpRtHCPqv2vjZP0dLTq5dYNOaeD3qOhq18_SuQ,16476
 apsg/pandas/__init__.py,sha256=jmlsulHmH9IbErJgSWlJx1J33-v--O5zxSE4kdt6fUI,456
 apsg/pandas/_pandas_api.py,sha256=dHzrZyD2v3beY_sShQWombhxNw_SxqZhU5GMXpBxDtM,13864
 apsg/plotting/__init__.py,sha256=immav5OfKhYlOGZWUsFjuBp7k71vr2xLYygQkO6Oimc,627
@@ -30,10 +30,10 @@ apsg/plotting/_projection.py,sha256=qnJgTQaFW0v2Pu9ySAEPADHhLgpXmfJ6QIrydry8rXQ,
 apsg/plotting/_roseplot.py,sha256=wqXo6b0k7lEvMrnByJYuoR_cuK1QIYZyZkObvigUx-g,12809
 apsg/plotting/_stereogrid.py,sha256=Buj0kp5P4cvTPowN6Jyt8wzvRMu3h5If1pwVWaal53M,11981
 apsg/plotting/_stereonet.py,sha256=LgAuKDSTRl1eCuCbhFJcKEdYr-ScfJmeqO-msbwOIC4,36506
-apsg-1.1.3.dist-info/AUTHORS.md,sha256=OEu_2jVMx1fm5EOj4vBlI04uvX4P2sqjPYP12VjPIcI,130
-apsg-1.1.3.dist-info/LICENSE,sha256=NhDqn8b2aOSNn4U4tCfJTOQ6jeggFpLIBgJrAkzdiH0,1117
-apsg-1.1.3.dist-info/METADATA,sha256=Mz903sPlG2_NC88SEMOjVrofeeTLzgi8v0NHUAJ_XBI,14999
-apsg-1.1.3.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-apsg-1.1.3.dist-info/entry_points.txt,sha256=SowP7_uRI0NJuzznKBXyM9BJcSwBxbXo6Iz5LUo9mEQ,42
-apsg-1.1.3.dist-info/top_level.txt,sha256=xWxwi0nqqOyKdmpsszfR-bmqnNpgVbhnLRuIKGJnaUM,5
-apsg-1.1.3.dist-info/RECORD,,
+apsg-1.1.5.dist-info/AUTHORS.md,sha256=OEu_2jVMx1fm5EOj4vBlI04uvX4P2sqjPYP12VjPIcI,130
+apsg-1.1.5.dist-info/LICENSE,sha256=NhDqn8b2aOSNn4U4tCfJTOQ6jeggFpLIBgJrAkzdiH0,1117
+apsg-1.1.5.dist-info/METADATA,sha256=fONgSyncfVwVzTXpaax-PbZakRKvnBV1SfSiL5TAElA,15160
+apsg-1.1.5.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+apsg-1.1.5.dist-info/entry_points.txt,sha256=SowP7_uRI0NJuzznKBXyM9BJcSwBxbXo6Iz5LUo9mEQ,42
+apsg-1.1.5.dist-info/top_level.txt,sha256=xWxwi0nqqOyKdmpsszfR-bmqnNpgVbhnLRuIKGJnaUM,5
+apsg-1.1.5.dist-info/RECORD,,

{apsg-1.1.3.dist-info → apsg-1.1.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any