Move zeta.py:glue() into plmaps.util

plmaps/scripts/zeta.py

@@ -1,7 +1,7 @@
 from thompson import *
 from plmaps   import *
 from plmaps.debug import debug; debug()
-from plmaps.util  import dump, pairwise
+from plmaps.util  import dump, pairwise, glue
 
 #1. Load the definition of delta
 x0 = PL2.from_aut(standard_generator(0))
@@ -23,16 +23,6 @@ def Sigma(s):
 
 assert (rot * rot).is_identity()
 
-def glue(*auts, cls=PL2):
-	D = list( auts[0].domain )
-	R = list( auts[0].range  )
-	for prev, next in pairwise(auts):
-		assert next.domain[0] == prev.domain[-1]
-		assert next.range [0] == prev.range [-1]
-		D += next.domain[1:]
-		R += next.range[1:]
-	return cls(D,R)
-
 epsilon = glue(x1^Sigma0, x1^Sigma1, cls=CPL2)
 zeta = epsilon * rot
 assert zeta.commutes(rot)

plmaps/util.py

@@ -74,4 +74,24 @@ def dump(aut, name):
 	if isinstance(aut, Automorphism):
 		print(name, aut.tikz_path(), sep="\n")
 	else:
-		print(name, aut, sep="\n")
+		print(name, aut, sep="\n")
+
+def glue(*auts, cls=None):
+	#TODO: put this function in another file. Circular imports are messy
+	from .plmap import PL2
+	from .cplmap import CPLMap
+	if cls is None:
+		cls = PL2
+	D = list( auts[0].domain )
+	R = list( auts[0].range  )
+	for prev, next in pairwise(auts):
+		if not issubclass(cls, CPLMap):
+			assert next.domain[0] == prev.domain[-1]
+			assert next.range [0] == prev.range [-1]
+		D += next.domain[1:]
+		R += next.range[1:]
+
+	if issubclass(cls, CPLMap):
+		cls._uncycle(D)
+		cls._uncycle(R)
+	return cls(D,R)