DGCV 0.2.4__tar.gz → 0.2.6__tar.gz

{dgcv-0.2.4/src/DGCV.egg-info → dgcv-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: DGCV
-Version: 0.2.4
+Version: 0.2.6
 Summary: Differential Geometry with Complex Variables
 Author: David Sykes
 Author-email: David Sykes <david@realandimaginary.com>
@@ -11,6 +11,7 @@ License-File: LICENSE.txt
 Requires-Dist: sympy>=1.9
 Requires-Dist: pandas>=1.0
 Requires-Dist: ipython>=7.0
+Dynamic: requires-python
 
 # DGCV: Differential Geometry with Complex Variables
 

{dgcv-0.2.4 → dgcv-0.2.6}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 requires-python = ">=3.6"
 name = "DGCV"
-version = "0.2.4"
+version = "0.2.6"
 description = "Differential Geometry with Complex Variables"
 authors = [{ name = "David Sykes", email = "david@realandimaginary.com" }]
 license = { text = "MIT" }
@@ -14,11 +14,15 @@ readme = "README.md"
 
 [tool.ruff]
 line-length = 88
-select = ["F", "E", "W", "I"]
-extend-exclude = ["_build", "buck-out", "build", "dist", "tutorials"]
+extend-exclude = ["_build", "buck-out", "build", "dist", "tutorials", "*.ipynb"]
 
 [tool.ruff.lint]
-ignore = ["E501", "Q", "W291"]
+select = ["F", "E", "W", "I"]  # Move linter rules to this section
+ignore = ["E501", "Q", "W291"] # Add global ignores here if needed
+
+# Move per-file-ignores to the lint section
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["E402"]
 
 [tool.black]
 line-length = 88

{dgcv-0.2.4 → dgcv-0.2.6}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = DGCV
-version = 0.2.4
+version = 0.2.6
 description = A package for Differential Geometry with Complex Variables
 author = David Sykes
 author_email = david@realandimaginary.com

{dgcv-0.2.4 → dgcv-0.2.6}/setup.py

@@ -15,7 +15,7 @@ To get started, check out the Jupyter Notebook tutorials:
 
 setup(
     name="DGCV",
-    version="0.2.4",
+    version="0.2.6",
     description="Differential Geometry with Complex Variables",
     long_description=long_description,  # This shows up on PyPI
     long_description_content_type="text/markdown",

{dgcv-0.2.4 → dgcv-0.2.6}/src/DGCV/CRGeometry.py

@@ -26,21 +26,7 @@ License:
 ############## dependencies
 from functools import reduce
 
-from sympy import (
-    I,
-    Matrix,
-    Rational,
-    Symbol,
-    Transpose,
-    conjugate,
-    expand,
-    eye,
-    im,
-    numer,
-    poly_from_expr,
-    simplify,
-    solve,
-)
+import sympy as sp
 
 from ._safeguards import retrieve_passkey
 from .config import _cached_caller_globals
@@ -63,7 +49,7 @@ from .vectorFieldsAndDifferentialForms import assembleFromHolVFC
 ############## CR geometry
 
 
-def tangencyObstruction(arg1, arg2, arg3, *args):
+def tangencyObstruction(arg1, arg2, arg3, simplify=False, *args):
     """
     Computes the tangency obstruction for a holomorphic vector field with respect to a CR hypersurface.
 
@@ -103,7 +89,12 @@ def tangencyObstruction(arg1, arg2, arg3, *args):
     evaluationLoc = allToReal(realPartOfVF(arg1)(holToReal(arg3 - arg2))).subs(
         holToReal(symToReal(arg3)), symToReal(arg2)
     )
-    return simplify(symToReal(evaluationLoc))
+    def simplify_rules(expr):
+        if simplify:
+            return sp.simplify(expr)
+        else:
+            return expr
+    return simplify_rules(symToReal(evaluationLoc))
 
 
 def weightedHomogeneousVF(
@@ -175,6 +166,7 @@ def findWeightedCRSymmetries(
     returnVectorFieldBasis=False,
     applyNumer=False,
     simplifyingFactor=None,
+    simplify=False
 ):
     """
     ***This function's algorithm will be revised in future updates***
@@ -204,9 +196,8 @@ def findWeightedCRSymmetries(
     Raises:
         NA
     """
-
     def extractRIVar(arg1):
-        return sum([list(holToReal(j).atoms(Symbol)) for j in arg1], [])
+        return sum([list(holToReal(j).atoms(sp.Symbol)) for j in arg1], [])
 
     VFLoc = addVF(
         weightedHomogeneousVF(
@@ -218,9 +209,7 @@ def findWeightedCRSymmetries(
             degreeCap=degreeCap,
             assumeReal=True,
         ),
-        scaleVF(
-            I,
-            weightedHomogeneousVF(
+        scaleVF(sp.I,weightedHomogeneousVF(
                 arg2,
                 arg4,
                 arg3,
@@ -231,8 +220,8 @@ def findWeightedCRSymmetries(
             ),
         ),
     )
-    tOLoc = tangencyObstruction(VFLoc, arg1, arg5, arg2)
-    varLoc = tOLoc.atoms(Symbol)
+    tOLoc = tangencyObstruction(VFLoc, arg1, arg5, arg2, simplify=simplify)
+    varLoc = tOLoc.atoms(sp.Symbol)
     varLoc1 = {j for j in varLoc}
     varComp = set(extractRIVar(arg2))
     varLoc.difference_update(varComp)
@@ -242,26 +231,27 @@ def findWeightedCRSymmetries(
     if applyNumer:
         if varLoc1 == set():
             varLoc1 = set(arg2)
-        coefListLoc = poly_from_expr(expand(numer(tOLoc)), *varLoc1)[0].coeffs()
-        solLoc = solve(coefListLoc, varLoc)
+        coefListLoc = sp.poly_from_expr(sp.expand(sp.numer(tOLoc)), *varLoc1)[0].coeffs()
+        solLoc = sp.solve(coefListLoc, varLoc)
     elif simplifyingFactor is None:
         if varLoc1 == set():
             varLoc1 = set(arg2)
-        coefListLoc = poly_from_expr(expand(tOLoc), *varLoc1)[0].coeffs()
-        solLoc = solve(coefListLoc, varLoc)
+        coefListLoc = sp.poly_from_expr(sp.expand(tOLoc), *varLoc1)[0].coeffs()
+        solLoc = sp.solve(coefListLoc, varLoc)
     else:
         if varLoc1 == set():
             varLoc1 = set(arg2)
-        coefListLoc = poly_from_expr(
-            expand(simplify(symToReal(simplifyingFactor) * tOLoc)), *varLoc1
+
+        coefListLoc = sp.poly_from_expr(
+            sp.expand(simplify(symToReal(simplifyingFactor) * tOLoc)), *varLoc1
         )[0].coeffs()
-        solLoc = solve(coefListLoc, varLoc)
+        solLoc = sp.solve(coefListLoc, varLoc)
     if solLoc == []:
         clearVar(*listVar(temporary_only=True), report=False)
         return "no solution"
     elif type(solLoc) is dict:
         VFCLoc = [j.subs(solLoc) for j in holVF_coeffs(VFLoc, arg2)]
-        subVar = sum(VFCLoc).atoms(Symbol)
+        subVar = sum(VFCLoc).atoms(sp.Symbol)
         subVar.difference_update(set(arg2))
         variableProcedure(arg6, len(subVar), assumeReal=True)
         VFCLoc = [
@@ -285,7 +275,7 @@ def findWeightedCRSymmetries(
             return VFCLoc
     else:
         VFCLoc = holVF_coeffs(VFLoc, arg2)
-        subVar = sum(VFCLoc).atoms(Symbol)
+        subVar = sum(VFCLoc).atoms(sp.Symbol)
         subVar.difference_update(set(arg2))
         variableProcedure(arg6, len(subVar), assumeReal=True)
         VFCLoc = [
@@ -296,7 +286,7 @@ def findWeightedCRSymmetries(
         return VFCLoc, solLoc
 
 
-def model2Nondegenerate(arg1, arg2, arg3, arg4, return_matrices=False):
+def model2Nondegenerate(arg1, arg2, arg3, arg4, return_matrices=False, simplify=True):
     """
     Builds the defining equation for a 2-nondegnerate model hypersurface using the general formula from the arXiv preprint arXiv:2404.06525.
 
@@ -312,50 +302,55 @@ def model2Nondegenerate(arg1, arg2, arg3, arg4, return_matrices=False):
     Raises:
         NA
     """
-    BARSLoc = conjugate(arg2)
-    zVecLoc = Matrix(arg3)
-    bzVecLoc = Matrix([conjugate(j) for j in arg3])
+    def simplify_rules(expr):
+        if simplify:
+            return sp.simplify(expr)
+        else:
+            return expr
+    BARSLoc = sp.conjugate(arg2)
+    zVecLoc = sp.Matrix(arg3)
+    bzVecLoc = sp.Matrix([sp.conjugate(j) for j in arg3])
     sizeLoc = arg1.shape[0]
-    hFun = (Rational(1, 2)) * (
-        (arg1 * (eye(sizeLoc) - (BARSLoc * Transpose(arg1) * arg2 * arg1)) ** (-1))
-        + ((eye(sizeLoc) - (arg1 * BARSLoc * Transpose(arg1) * arg2)) ** (-1) * arg1)
+    hFun = (sp.Rational(1, 2)) * (
+        (arg1 * (sp.eye(sizeLoc) - (BARSLoc * sp.Transpose(arg1) * arg2 * arg1)) ** (-1))
+        + ((sp.eye(sizeLoc) - (arg1 * BARSLoc * sp.Transpose(arg1) * arg2)) ** (-1) * arg1)
     )
     sFun = (
         arg1
-        * ((eye(sizeLoc) - (BARSLoc * Transpose(arg1) * arg2 * arg1)) ** (-1))
+        * ((sp.eye(sizeLoc) - (BARSLoc * sp.Transpose(arg1) * arg2 * arg1)) ** (-1))
         * BARSLoc
-        * Transpose(arg1)
+        * sp.Transpose(arg1)
     )
     bsFun = (
-        Transpose(arg1)
-        * ((eye(sizeLoc) - (arg2 * arg1 * BARSLoc * Transpose(arg1))) ** (-1))
+        sp.Transpose(arg1)
+        * ((sp.eye(sizeLoc) - (arg2 * arg1 * BARSLoc * sp.Transpose(arg1))) ** (-1))
         * arg2
         * arg1
     )
     if return_matrices:
         return (
-            simplify(
+            simplify_rules(
                 (
-                    Transpose(zVecLoc) * hFun * bzVecLoc
-                    + (Rational(1, 2))
+                    sp.Transpose(zVecLoc) * hFun * bzVecLoc
+                    + (sp.Rational(1, 2))
                     * (
-                        Transpose(zVecLoc) * sFun * zVecLoc
-                        + Transpose(bzVecLoc) * bsFun * bzVecLoc
+                        sp.Transpose(zVecLoc) * sFun * zVecLoc
+                        + sp.Transpose(bzVecLoc) * bsFun * bzVecLoc
                     )
                 )[0]
             )
-            - im(arg4),
+            - sp.im(arg4),
             hFun,
             sFun,
         )
     else:
-        return simplify(
+        return simplify_rules(
             (
-                Transpose(zVecLoc) * hFun * bzVecLoc
-                + (Rational(1, 2))
+                sp.Transpose(zVecLoc) * hFun * bzVecLoc
+                + (sp.Rational(1, 2))
                 * (
-                    Transpose(zVecLoc) * sFun * zVecLoc
-                    + Transpose(bzVecLoc) * bsFun * bzVecLoc
+                    sp.Transpose(zVecLoc) * sFun * zVecLoc
+                    + sp.Transpose(bzVecLoc) * bsFun * bzVecLoc
                 )
             )[0]
-        ) - im(arg4)
+        ) - sp.im(arg4)