Merge pull request #6382 from LMFDB/autopep8-patches

Fixes by autopep8 action

Author: roed314

lmfdb/number_fields/draw_spectrum.py

@@ -26,12 +26,12 @@ def __add__(self,other):
 
     def draw(self, radius):
         return svg.Circle(
-            cx = self.x,
-            cy = self.y,
-            r = radius,
-            fill = self.color,
-            stroke = 'black',
-            stroke_width = .75)
+            cx=self.x,
+            cy=self.y,
+            r=radius,
+            fill=self.color,
+            stroke='black',
+            stroke_width=.75)
 
 def draw_spec(frobs, local_alg_dict, colors=True, rings=False, num_primes=100, gaga=False) -> svg.SVG:
     """ Draw the spectrum of the ring of integers of a number field,
@@ -46,7 +46,7 @@ def draw_spec(frobs, local_alg_dict, colors=True, rings=False, num_primes=100, g
         col_max = max(i[0] for [p,l] in frobs for i in l if l != [0])
     else:
         col_max = 0
-    
+
     ### Options:
     # I've hardcoded these values instead of providing them
     # as optional arguments; feel free to change this
@@ -56,23 +56,22 @@ def draw_spec(frobs, local_alg_dict, colors=True, rings=False, num_primes=100, g
 
     # (absolute) width of svg
     width = 200 if gaga else (num_primes+3)*50
-    
+
     # distance between two primes along x-axis
-    x_spread = floor(width/(num_primes+1)) if gaga else 50 
-    
+    x_spread = floor(width/(num_primes+1)) if gaga else 50
+
     # distance between prime ideals in same fibre
     # = total distance from top to bottom
     y_spread = 30
 
-
     # y-coordinate of Spec Z
     bottom_line = round((3/4)*height)
 
     # fraction of height of centre line around which the primes in spec are centred
     centre_ratio = 1/2 if gaga else 1/4
     # y-coordinate of Spec O_K
     y_centre = round(centre_ratio*height)
-    
+
     line_thickness = .75
 
     # increase or decrease girth of inert primes based on size of residue field
@@ -84,10 +83,9 @@ def draw_spec(frobs, local_alg_dict, colors=True, rings=False, num_primes=100, g
     # Should probably be between 0 and 2, with 1 being "reasonable"
     curviness = 0.9
 
-
     elements = []
     # NB: svg y-coords start from top! eg (0,1) is 1 unit down from top left corner
-    
+
     # list of coordinates, where the n-th member is a
     # list of Points in the n-th fibre
     coords = []
@@ -104,72 +102,72 @@ def draw_spec(frobs, local_alg_dict, colors=True, rings=False, num_primes=100, g
     if not gaga:
         elements.append(
             svg.Line(
-                stroke = "black",
-                stroke_width = line_thickness,
-                x1 = coords[0][0].x, # get starting point of line
-                y1 = bottom_line,
-                x2 = coords[-1][0].x + x_spread, 
-                y2 = bottom_line))
+                stroke="black",
+                stroke_width=line_thickness,
+                x1=coords[0][0].x, # get starting point of line
+                y1=bottom_line,
+                x2=coords[-1][0].x + x_spread,
+                y2=bottom_line))
 
         # a dashed line afterwards to signify generic fibre
         for y in (bottom_line, y_centre):
             elements.append(
                 svg.Line(
-                    stroke = "black",
-                    stroke_width = line_thickness,
-                    stroke_dasharray = "5",
-                    x1 = coords[-1][0].x + x_spread,
-                    y1 = y,
-                    x2 = coords[-1][0].x + 2*x_spread,
-                    y2 = y
+                    stroke="black",
+                    stroke_width=line_thickness,
+                    stroke_dasharray="5",
+                    x1=coords[-1][0].x + x_spread,
+                    y1=y,
+                    x2=coords[-1][0].x + 2*x_spread,
+                    y2=y
                 )
             )
             elements.append(svg.Text(
-                x = width - x_spread,
-                y = y,
-                dx = 16,
-                dy = 4,
-                text = '(0)',
-                text_anchor = "middle"))
+                x=width - x_spread,
+                y=y,
+                dx=16,
+                dy=4,
+                text='(0)',
+                text_anchor="middle"))
 
     # draw curves between primes - do this first so points drawn over curve
     nextpts = coords if gaga else coords + [[Point(width-2*x_spread, y_centre)]]
     for n in range(len(nextpts)-1):
         for pt_this in coords[n]:
             for pt_next in nextpts[n + 1]:
                 # we control the angle of the curve by adding a control point
-                dx = curviness*round((pt_next.x - pt_this.x)/2) 
+                dx = curviness*round((pt_next.x - pt_this.x)/2)
                 elements.append(
                     svg.Path(
-                        stroke = "black",
-                        stroke_width = line_thickness,
-                        fill = "none",
-                        d = [
-                            svg.M( x = pt_this.x, y = pt_this.y),
+                        stroke="black",
+                        stroke_width=line_thickness,
+                        fill="none",
+                        d=[
+                            svg.M( x=pt_this.x, y=pt_this.y),
                             svg.CubicBezier(
-                                x1 = pt_next.x-dx,
-                                y1 = pt_this.y,
-                                x2 = pt_this.x+dx,
-                                y2 = pt_next.y,
-                                x = pt_next.x,
-                                y = pt_next.y )]))
+                                x1=pt_next.x-dx,
+                                y1=pt_this.y,
+                                x2=pt_this.x+dx,
+                                y2=pt_next.y,
+                                x=pt_next.x,
+                                y=pt_next.y )]))
 
     for n, pts in enumerate(coords):
-        if not gaga: 
+        if not gaga:
             # dots on Spec Z
             elements.append(Point(pts[0].x, bottom_line).draw(dot_radius))
             elements.append(
                 svg.Text(
-                    x = pts[0].x,
-                    y = bottom_line,
-                    dy = 20,
-                    text = f'({frobs[n][0]})',
-                    text_anchor = "middle"))
+                    x=pts[0].x,
+                    y=bottom_line,
+                    dy=20,
+                    text=f'({frobs[n][0]})',
+                    text_anchor="middle"))
 
         # fibre above prime
         for pt in pts:
-            radius = min(dot_radius +
-                         residue_factor*(pt.girth-1), y_spread/5, x_spread/5)
+            radius = min(dot_radius
+                         + residue_factor*(pt.girth-1), y_spread/5, x_spread/5)
             elements.append(pt.draw(radius))
 
     return svg.SVG(
@@ -190,7 +188,7 @@ def unram_coords(frob_cycle_list, x_coord, y_centre, spread, col_max):
     """
     Given list of frobenius cycle describing a fixed fibre with no ramification, evenly spread points. Returns list of `Point`s.
     """
-    # number of points 
+    # number of points
     N = sum(l[1] for l in frob_cycle_list)
     if N == 1:
         cyc_len = frob_cycle_list[0][0]
@@ -226,11 +224,11 @@ def ram_coords(local_alg_dict, p, x_coord, y_centre, spread, deg=1):
             y_offset = 0
         point = Point(x_coord, y_centre - y_offset, residue_deg, hsl_color(ram_index, max_ram_index))
         point_list.append(point)
-        
+
     return point_list
 
-    
-def hsl_color(n, n_max, sec = [0,45]):
+
+def hsl_color(n, n_max, sec=[0,45]):
     """
     Vary hue in hsl color between 0 and n_max within sector sec
     """
@@ -245,11 +243,9 @@ def hsl_color(n, n_max, sec = [0,45]):
     return f"hsl({h},{s}%,{l}%)"
 
 
-
-
 ### Testing
 def test_drawspec(n=1, gaga=False):
-    if n == 1: 
+    if n == 1:
         frobs = [[2, [[3, 2], [1, 1]]], [3, [[6, 1], [1, 1]]], [5, [[6, 1], [1, 1]]], [7, [0]], [11, [[3, 2], [1, 1]]], [13, [[2, 3], [1, 1]]], [17, [[6, 1], [1, 1]]], [19, [[6, 1], [1, 1]]], [23, [[3, 2], [1, 1]]], [29, [[1, 7]]], [31, [[6, 1], [1, 1]]], [37, [[3, 2], [1, 1]]], [41, [0]], [43, [[7, 1]]], [47, [[6, 1], [1, 1]]], [53, [[3, 2], [1, 1]]], [59, [[6, 1], [1, 1]]]]
 
         local_algs = {"7": [[7,1]], "41": [[7,1]]}
@@ -259,9 +255,9 @@ def test_drawspec(n=1, gaga=False):
 
     num_primes = 7 if gaga else 100
     canvas = draw_spec(frobs, local_algs, True,
-                       gaga=gaga,num_primes = num_primes)
+                       gaga=gaga,num_primes=num_primes)
     filename = f"/tmp/{'gaga' if gaga else 'test'}.svg"
-    with open(filename, mode='w') as f:		
+    with open(filename, mode='w') as f:
         f.write(canvas.as_str())
 
     print(f"Saved spectrum to {filename}")

lmfdb/number_fields/web_number_field.py

@@ -1020,16 +1020,15 @@ def spec_data(self):
                 else:
                     local_algebra_dict[str(p)].append(thisdat)
         return self.frobs(), local_algebra_dict
-        
+
     def draw_spectrum(self, num_primes=20):
         frobs, local_algebra_dict = self.spec_data()
         return draw_spec(frobs[:num_primes], local_algebra_dict).as_str()
 
     def draw_gaga(self, num_primes=7):
         frobs, local_algebra_dict = self.spec_data()
         return draw_gaga(frobs[:num_primes], local_algebra_dict).as_str()
-        
-    
+
     def make_code_snippets(self):
         # read in code.yaml from numberfields directory:
         _curdir = os.path.dirname(os.path.abspath(__file__))