apsg 1.1.4__tar.gz → 1.1.5__tar.gz

{apsg-1.1.4 → apsg-1.1.5}/HISTORY.md

@@ -1,5 +1,9 @@
 # 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
 

{apsg-1.1.4 → apsg-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apsg
-Version: 1.1.4
+Version: 1.1.5
 Summary: APSG - The package for structural geologists
 Home-page: https://github.com/ondrolexa/apsg
 Author: Ondrej Lexa
@@ -139,6 +139,10 @@ 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
 

{apsg-1.1.4 → apsg-1.1.5}/docs/conf.py

@@ -46,7 +46,7 @@ extensions = [
     "sphinx_rtd_theme",
 ]
 
-autodoc_mock_imports = ['sqlalchemy']
+autodoc_mock_imports = ["sqlalchemy"]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ["_templates"]
@@ -61,8 +61,8 @@ source_suffix = ".rst"
 master_doc = "index"
 
 # General information about the project.
-project = u"APSG"
-copyright = u"2023, Ondrej Lexa"
+project = "APSG"
+copyright = "2023, Ondrej Lexa"
 
 # The version info for the project you're documenting, acts as replacement
 # for |version| and |release|, also used in various other places throughout
@@ -71,7 +71,7 @@ copyright = u"2023, Ondrej Lexa"
 # The short X.Y version.
 version = "1.1"
 # The full version, including alpha/beta/rc tags.
-release = "1.1.4"
+release = "1.1.5"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -161,7 +161,7 @@ html_theme_options = {
 # static files, so a file named "default.css" will overwrite the builtin
 # "default.css".
 
-#html_static_path = ["_static"]
+# html_static_path = ["_static"]
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page
 # bottom, using the given strftime format.
@@ -225,7 +225,7 @@ latex_elements = {
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
 latex_documents = [
-    ("index", "apsg.tex", u"APSG Documentation", u"Ondrej Lexa", "manual"),
+    ("index", "apsg.tex", "APSG Documentation", "Ondrej Lexa", "manual"),
 ]
 
 # The name of an image file (relative to this directory) to place at
@@ -253,7 +253,7 @@ latex_documents = [
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("index", "apsg", u"APSG Documentation", [u"Ondrej Lexa"], 1)]
+man_pages = [("index", "apsg", "APSG Documentation", ["Ondrej Lexa"], 1)]
 
 # If true, show URL addresses after external links.
 # man_show_urls = False
@@ -268,8 +268,8 @@ texinfo_documents = [
     (
         "index",
         "apsg",
-        u"APSG Documentation",
-        u"Ondrej Lexa",
+        "APSG Documentation",
+        "Ondrej Lexa",
         "apsg",
         " structural geology module for Python",
         "Earth sciences",
@@ -289,5 +289,5 @@ texinfo_documents = [
 # texinfo_no_detailmenu = False
 
 # Sort members by type
-#autodoc_member_order = "groupwise"
-autodoc_member_order = 'bysource'
+# autodoc_member_order = "groupwise"
+autodoc_member_order = "bysource"

{apsg-1.1.4 → apsg-1.1.5}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.4
+current_version = 1.1.5
 commit = False
 tag = False
 

{apsg-1.1.4 → apsg-1.1.5}/setup.py

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

{apsg-1.1.4 → apsg-1.1.5}/src/apsg/__init__.py

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

{apsg-1.1.4 → apsg-1.1.5}/src/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-1.1.4 → apsg-1.1.5}/src/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-1.1.4 → apsg-1.1.5}/src/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-1.1.4 → apsg-1.1.5}/src/apsg.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apsg
-Version: 1.1.4
+Version: 1.1.5
 Summary: APSG - The package for structural geologists
 Home-page: https://github.com/ondrolexa/apsg
 Author: Ondrej Lexa
@@ -139,6 +139,10 @@ 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