Merge main

Author: GDeLaurentis

CHANGELOG.md

@@ -10,10 +10,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Support for arbitrary Gram determinants, e.g. for a box gram: `Δ_12|3|4|5`
+
 ### Changed
 
 ### Fixed
 
+- Sphinx fails if autodoc fails, instead of quitely raising a warning.
+
 ### Deprecated
 
 

lips/hardcoded_limits/particles_set.py

@@ -314,11 +314,11 @@ def _set_Sijk(self, temp_string, temp_value, fix_mom=True, mode=1):
 
     def _set_Dijk(self, temp_string, temp_value, fix_mom=True, mode=1):  # Set Dijk, change angle bracket (odd mode) or square bracket (even mode)
 
-        match_list = pDijk.findall(temp_string)[0]
-        if match_list[0] == '':
-            NonOverlappingLists = [list(map(int, corner)) for corner in match_list[1:]]
+        match = pDijk.findall(temp_string)[0]
+        if "|" in match:
+            NonOverlappingLists = [list(map(int, corner)) for corner in match.split("|")]
         else:
-            NonOverlappingLists = self.ijk_to_3NonOverlappingLists(list(map(int, match_list[0])))
+            NonOverlappingLists = self.ijk_to_3NonOverlappingLists(list(map(int, match)))
 
         to_be_changed = NonOverlappingLists[0].pop((mode - 1) // 2)
 

lips/hardcoded_limits/particles_set_pair.py

@@ -334,13 +334,13 @@ def _set_pair_A2_or_S2_and_Dijk(self, t_s1, t_v1, t_s2, t_v2):   # Current faile
             ab = list(map(int, list(pS2.findall(t_s1)[0])))
 
         ab = list(map(int, ab))
-        match_list = pDijk.findall(t_s2)[0]
-        if match_list[0] == '':
+        match = pDijk.findall(t_s2)[0]
+        if "|" in match:
             adjacent = False
-            NonOverlappingLists = [list(map(int, corner)) for corner in match_list[1:]]
+            NonOverlappingLists = [list(map(int, corner)) for corner in match.split("|")]
         else:
             adjacent = True
-            NonOverlappingLists = self.ijk_to_3NonOverlappingLists(list(map(int, match_list[0])))
+            NonOverlappingLists = self.ijk_to_3NonOverlappingLists(list(map(int, match)))
 
         both_in_List = -1                                       # if both ab in a single List:
         for i, List in enumerate(NonOverlappingLists):
@@ -707,13 +707,13 @@ def reverse_order(t_s):
 
         def reorder_invariants(t_s1, t_s2):
             l3B, l3Bs, l3Bm, l3Be, a_or_s, l3Bc = unpack(t_s1)
-            match_list = pDijk.findall(t_s2)[0]
-            if match_list[0] == '':
+            match = pDijk.findall(t_s2)[0]
+            if "|" in match:
                 adjacent = False
-                NonOverlappingLists = [list(map(int, corner)) for corner in match_list[1:]]
+                NonOverlappingLists = [list(map(int, corner)) for corner in match.split("|")]
             else:
                 adjacent = True
-                NonOverlappingLists = self.ijk_to_3NonOverlappingLists(list(map(int, match_list[0])))
+                NonOverlappingLists = self.ijk_to_3NonOverlappingLists(list(map(int, match)))
             if l3Bs == l3Be:
                 for NonOverlappingList in NonOverlappingLists:
                     if l3Bs in NonOverlappingList and [entry for entry in NonOverlappingList if entry != l3Bs][0] in l3Bm:
@@ -765,11 +765,11 @@ def there_are_two_free_particles(*args):
             return "Not implemented."
 
         l3B, l3Bs, l3Bm, l3Be, a_or_s, l3Bc = unpack(t_s1)
-        match_list = pDijk.findall(t_s2)[0]
-        if match_list[0] == '':
-            NonOverlappingLists = [list(map(int, corner)) for corner in match_list[1:]]
+        match = pDijk.findall(t_s2)[0]
+        if "|" in match:
+            NonOverlappingLists = [list(map(int, corner)) for corner in match.split("|")]
         else:
-            NonOverlappingLists = self.ijk_to_3NonOverlappingLists(list(map(int, match_list[0])))
+            NonOverlappingLists = self.ijk_to_3NonOverlappingLists(list(map(int, match)))
 
         self._set(t_s1, t_v1, fix_mom=False)
         if t_s1[0] == "⟨":
@@ -836,11 +836,11 @@ def _set_pair_Sijk_and_Dijk(self, t_s1, t_v1, t_s2, t_v2):  # Current failed: 8/
         from .DoubleCollinearLimit_D_and_S_e import expression_for_e
 
         Sijk = list(map(int, pSijk.findall(t_s1)[0]))
-        match_list = pDijk.findall(t_s2)[0]
-        if match_list[0] == '':
-            NonOverlappingLists = [list(map(int, corner)) for corner in match_list[1:]]
+        match = pDijk.findall(t_s2)[0]
+        if "|" in match:
+            NonOverlappingLists = [list(map(int, corner)) for corner in match.split("|")]
         else:
-            NonOverlappingLists = self.ijk_to_3NonOverlappingLists(list(map(int, match_list[0])))
+            NonOverlappingLists = self.ijk_to_3NonOverlappingLists(list(map(int, match)))
 
         FirstNonOverlappingList = -1
         SecondNonOverlappingList = -1

lips/particle.py

@@ -9,7 +9,6 @@
 
 import numpy
 import sympy
-import mpmath
 import random
 import lips
 
@@ -42,6 +41,7 @@ def __init__(self, kinematics=None, real_momentum=False, field=Field('mpc', 0, 3
         (2, 2) : rank 2 spinor;
         ( (2, 1), (1, 2) ) : (right spinor index down, left spinor index down).
         """
+        # Should check the field is consistent with the kinematics info, or even compute it from there.
         self.field = field
         if kinematics is None and field.name in ("mpc", "gaussian rational", "finite field", "padic"):
             self.randomise(real_momentum=real_momentum)
@@ -320,7 +320,7 @@ def randomise_mpc(self, real_momentum=False):
             if not (abs(p[0]) == 0 and abs(p[1]) == 0 and p[2].real <= 0 and p[2].imag == 0):     # make sure it is not in the
                 break                                                                             # negative z direction or null
         p2 = p[0] * p[0] + p[1] * p[1] + p[2] * p[2]
-        p_zero = mpmath.sqrt(p2)
+        p_zero = self.field.sqrt(p2)
         self.four_mom = numpy.array([p_zero] + p)
 
     def randomise_rational(self):
@@ -379,7 +379,7 @@ def _set_r_sp_d(self, P0_plus_P3, P1_plus_iP2):  # r_sp_d is \lambda_\alpha
         if lips.spinor_convention == 'symmetric' and abs(P0_plus_P3) <= self.field.tollerance:
             raise ValueError("Encountered zero denominator in spinor.")
         elif lips.spinor_convention == 'symmetric':
-            lambda_one = mpmath.sqrt(P0_plus_P3)
+            lambda_one = self.field.sqrt(P0_plus_P3)
             lambda_two = P1_plus_iP2 / lambda_one
         elif lips.spinor_convention == 'asymmetric':
             lambda_one = P0_plus_P3
@@ -397,7 +397,7 @@ def _set_l_sp_d(self, P0_plus_P3, P1_minus_iP2):  # l_sp_d is \bar{\lambda}_{\do
         if lips.spinor_convention == 'symmetric' and abs(P0_plus_P3) <= self.field.tollerance:
             raise ValueError("Encountered zero denominator in spinor.")
         elif lips.spinor_convention == 'symmetric':
-            lambda_one = mpmath.sqrt(P0_plus_P3)
+            lambda_one = self.field.sqrt(P0_plus_P3)
             lambda_two = P1_minus_iP2 / lambda_one
         elif lips.spinor_convention == 'asymmetric':
             lambda_one = self.field(1)

lips/particles_compute.py

@@ -12,9 +12,10 @@
 import numpy
 import re
 import mpmath
+import warnings
 
 from .tools import pSijk, pMi, pMVar, pd5, pDijk, pOijk, pPijk, pA2, pAu, pAd, pS2, pSu, pSd, \
-    pNB, pNB_open_begin, pNB_open_end, ptr5, ptr, det2x2
+    pNB, pNB_open_begin, pNB_open_end, ptr5, ptr, det
 
 mpmath.mp.dps = 300
 
@@ -94,14 +95,19 @@ def compute(self, temp_string):
             return Pi
 
         if pDijk.findall(temp_string) != []:                        # Δ_ijk or Δ_ij|kl|lm
-            match_list = pDijk.findall(temp_string)[0]
-            if match_list[0] == '':
-                NonOverlappingLists = [list(map(int, corner)) for corner in match_list[1:]]
-            else:
-                NonOverlappingLists = self.ijk_to_3NonOverlappingLists(list(map(int, match_list[0])))
+            match = pDijk.findall(temp_string)[0]
+            if "|" in match:
+                indices_in_corners = [list(map(int, corner)) for corner in match.split("|")]
+                r2_sps = [sum([self[_i].r2_sp for _i in indices]) for indices in indices_in_corners]
+                r2_sps_b = [sum([self[_i].r2_sp_b for _i in indices]) for indices in indices_in_corners]
+                n = len(indices_in_corners)
+                matrix = numpy.array([[numpy.trace(numpy.dot(r2_sps[i], r2_sps_b[j])) / 2 for j in range(n)] for i in range(n)])
+                return (-1) ** n * det(matrix[:-1, :-1])
+            warnings.warn("The shorthand Δ_ijk is deprecated and will be removed.", DeprecationWarning, stacklevel=2)
+            NonOverlappingLists = self.ijk_to_3NonOverlappingLists(list(map(int, match)))
             r2_sp_1 = sum([self[_i].r2_sp for _i in NonOverlappingLists[0]])
             r2_sp_b_2 = sum([self[_i].r2_sp_b for _i in NonOverlappingLists[1]])
-            return (numpy.trace(numpy.dot(r2_sp_1, r2_sp_b_2)) / 2) ** 2 - det2x2(r2_sp_1) * det2x2(r2_sp_b_2)
+            return (numpy.trace(numpy.dot(r2_sp_1, r2_sp_b_2)) / 2) ** 2 - det(r2_sp_1) * det(r2_sp_b_2)
 
         if pd5.findall(temp_string) != []:
             return (2 * self.compute("s_12") * self.compute("s_23") * self.compute("s_34") * self.compute("s_45") +
@@ -128,7 +134,7 @@ def compute(self, temp_string):
             r"""Mandelstam variables: s_{i \dots k} = (P_i + \dots + P_k)^2. Computed via determinant of rank 2 spinor."""
             ijk = list(map(int, pSijk.findall(temp_string)[0]))
             tot_r2_sp = sum([self[_i].r2_sp for _i in ijk])
-            return det2x2(tot_r2_sp)
+            return det(tot_r2_sp)
 
         if pA2.findall(temp_string) != []:                        # ⟨A|B⟩ -- contraction is up -> down : lambda[A]^alpha.lambda[B]_alpha
             A, B = map(int, pA2.findall(temp_string)[0])

lips/particles_eval.py

@@ -35,7 +35,7 @@
 pOijk = re.compile(r'(?:Ω_)(\d+)')
 pPijk = re.compile(r'(?:Π_)(\d+)')
 pDijk_adjacent = re.compile(r'(?:Δ_(\d+)(?![\d\|]))')
-pDijk_non_adjacent = re.compile(r'(?:Δ_(\d+)\|(\d+)\|(\d+))')
+pDijk_non_adjacent = re.compile(r'(?:Δ_(\d+(?:\|\d+)*))')
 # p3B = re.compile(r'(?:\u27e8|\[)(\d+)(?:\|\({0,1})([\d+[\+|-]*]*)(?:\){0,1}\|)(\d+)(?:\u27e9|\])')
 # pNB = re.compile(r'((?:⟨|\[)\d+\|(?:(?:\([\d+\+|-]{1,}\))|(?:[\d+\+|-]{1,}))*\|\d+(?:⟩|\]))')  # this messes up on strings like: '|2⟩⟨1|4+5|3|+|3|4+5|2⟩⟨1|'
 pNB = re.compile(r'((?:⟨|\[)\d+\|(?:(?:(?!\|[\+|-]\|)\([\d+\+|-]{1,}\))|(?:(?!\|[\+|-]\|)[\d+\+|-]))*\|\d+(?:⟩|\]))')
@@ -106,7 +106,7 @@ def _parse(string):
         string = ptr5.sub(r"oPs.compute('tr5\1')", string)
         string = ptr.sub(r"oPs.compute('\1')", string)
         string = pDijk_adjacent.sub(r"oPs.compute('Δ_\1')", string)
-        string = pDijk_non_adjacent.sub(r"oPs.compute('Δ_\1|\2|\3')", string)
+        string = pDijk_non_adjacent.sub(r"oPs.compute('Δ_\1')", string)
         string = pNB.sub(r"oPs.compute('\1')", string)
         string = pNB_open_begin.sub(r"oPs.compute('\1')", string)
         string = pNB_open_end.sub(r"oPs.compute('\1')", string)

lips/tools.py

@@ -7,6 +7,7 @@
 import numpy
 import random
 import re
+import warnings
 
 mpmath.mp.dps = 300
 
@@ -32,7 +33,7 @@
 pd5 = re.compile(r'^δ5$')
 ptr5 = re.compile(r'^tr5_(\d+)$|^tr5\(([\d\|\+\-]+)\)$')
 ptr = re.compile(r'^tr\((?P<middle>(?:(?:\([\d+\+|-]{1,}\))|(?:[\d+\+|-]{1,}))*)\)$')   # the 'middle' pattern should be like in pNB
-pDijk = re.compile(r'(?:^Δ_(\d+)$)|(?:^Δ_(\d+)\|(\d+)\|(\d+)$)')
+pDijk = re.compile(r'^Δ_(\d+(?:\|\d+)*)$')
 pOijk = re.compile(r'^(?:Ω_)(\d+)$')
 pPijk = re.compile(r'^(?:Π_)(\d+)$')
 pAu = re.compile(r'^(?:⟨|<)(\d+)(?:\|)$')
@@ -92,8 +93,21 @@ def subs_dict(text, substitutions):
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #
 
 
-def det2x2(array):
-    return array[0, 0] * array[1, 1] - array[0, 1] * array[1, 0]
+def det(matrix):
+    if matrix.shape == (1, 1):
+        return matrix[0, 0]
+
+    det_sum = 0
+    for col in range(matrix.shape[1]):
+        sub_matrix = matrix[1:, [i for i in range(matrix.shape[1]) if i != col]]
+        det_sum += (-1) ** col * matrix[0, col] * det(sub_matrix)
+
+    return det_sum
+
+
+def det2x2(matrix):
+    warnings.warn("det2x2 is deprecated, use det.", DeprecationWarning, stacklevel=2)
+    return det(matrix)
 
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #

sphinx/Makefile

@@ -2,7 +2,7 @@
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    =
+SPHINXOPTS    = -W
 SPHINXBUILD   = sphinx-build
 SOURCEDIR     = source
 BUILDDIR      = build

tests/test_particles_compute.py

@@ -101,11 +101,11 @@ def test_particles_compute_three_mass_gram():
     """Test computation of 3-mass Gram w.r.t. summed particles object."""
     oParticles = Particles(9)
     temp_string = "Δ_135|249|678"
-    match_list = pDijk.findall(temp_string)[0]
-    if match_list[0] == '':
-        NonOverlappingLists = [list(map(int, corner)) for corner in match_list[1:]]
+    match = pDijk.findall(temp_string)[0]
+    if "|" in match:
+        NonOverlappingLists = [list(map(int, corner)) for corner in match.split("|")]
     else:
-        NonOverlappingLists = oParticles.ijk_to_3NonOverlappingLists(list(map(int, match_list[0])))
+        NonOverlappingLists = oParticles.ijk_to_3NonOverlappingLists(list(map(int, match)))
     temp_oParticles = oParticles.cluster(NonOverlappingLists)
     assert temp_oParticles.ldot(1, 2)**2 - temp_oParticles.ldot(1, 1) * temp_oParticles.ldot(2, 2) == oParticles(temp_string)
 
@@ -120,3 +120,14 @@ def test_particles_compute_tr5_1234():
                                          oParticles[3].four_mom[k] *
                                          oParticles[4].four_mom[l]))
     assert abs(tr5 - oParticles("tr5_1234")) < 10 ** -290
+
+
+def test_particles_compute_four_mass_box_gram():
+    oPs = Particles(8, field=Field("finite field", 2 ** 31 - 19, 1), seed=0)
+    oPs._singular_variety(("⟨34⟩+[34]", "⟨34⟩-⟨56⟩", "⟨56⟩+[56]"), (1, 1, 1))
+    oPs.mt2 = oPs("s_34")
+    oPs.mt = oPs("<34>")
+    oPs = oPs.cluster([[1, ], [2, ], [3, 4], [5, 6], [7, 8]])
+    assert oPs.mt ** 2 == oPs.mt2
+    assert oPs("Δ_12|3|4|5") == oPs("(1/4*(s12*(tr(3|3)²-tr(3|4)²)+tr(3|4)*tr(1+2|4)*tr(1+2|3)-1/2*tr(3|3)*(tr(1+2|4)²+tr(1+2|3)²)))")
+    assert oPs("Δ_12|3|4|5²") == oPs("(1/4*(s12*(tr(3|3)²-tr(3|4)²)+tr(3|4)*tr(1+2|4)*tr(1+2|3)-1/2*tr(3|3)*(tr(1+2|4)²+tr(1+2|3)²)))²")