a0e7ac7d-d8f3-4e97-aca8-5ab47a193e00
commented
13 years ago comment:39
Hi, Timo !
I tried applying the various patches on a sage-4.6 clone and the patch trac_8431-smallfixes-tj.patch fails. Here's what I get.
labo [~/Applications/sage/devel/sage-t8431/sage/combinat]
$ hg qseries
trac_8431_e_one_star.patch
trac_8431_review-sl.patch
trac_8431_might_be_final_tj.patch
trac_8431_colors_tikz-sl.patch
trac_8431_sigma_type_fix.patch
trac_8431-wordmorphism-sl.patch
trac_8431-smallfixes-tj.patch
labo [~/Applications/sage/devel/sage-t8431/sage/combinat]
$ hg qtop
trac_8431-smallfixes-tj.patch
labo [~/Applications/sage/devel/sage-t8431/sage/combinat]
$ hg qpop
now at: trac_8431-wordmorphism-sl.patch
labo [~/Applications/sage/devel/sage-t8431/sage/combinat]
$ hg qpush
applying trac_8431-smallfixes-tj.patch
patching file sage/combinat/e_one_star.py
Hunk #6 FAILED at 1337
1 out of 7 hunks FAILED -- saving rejects to file sage/combinat/e_one_star.py.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh trac_8431-smallfixes-tj.patchCould you please fix it? Or is it because the order is not correct? Here's the output for the rejected hunk:
labo [~/Applications/sage/devel/sage-t8431/sage/combinat]
$ cat e_one_star.py.rej
--- e_one_star.py
+++ e_one_star.py
@@ -1230,49 +1338,6 @@
X[letter].append((v, k))
return X
- def __call__(self, patch, iterations=1):
- r"""
- Apply a generalized substitution to a Patch; this returns a new
- object.
-
- The color of every new face in the image is given the same color as its preimage.
-
- INPUT:
-
- - ``patch`` - a patch
- - ``iterations`` - integer (optional, default: 1) number of iterations
-
- OUTPUT:
-
- a patch
-
- EXAMPLES::
-
- sage: from sage.combinat.e_one_star import E1Star, Face, Patch
- sage: P = Patch([Face((0,0,0),t) for t in [1,2,3]])
- sage: sigma = WordMorphism({1:[1,2], 2:[1,3], 3:[1]})
- sage: E = E1Star(sigma)
- sage: R = E(P)
- sage: len(R)
- 5
-
- ::
-
- sage: x = (0,0,0)
- sage: p = Patch([Face(x, 1, 'red'), Face(x, 2, 'yellow'), Face(x, 3, 'green')])
- sage: p = E(p, iterations=4)
- sage: p
- Patch of 31 faces
- """
- old_faces = patch
- for i in xrange(iterations):
- new_faces = []
- for f in old_faces:
- new_faces.extend(self._call_on_face(f, color=f.color()))
- old_faces = new_faces
-
- return Patch(new_faces)
-
def _call_on_face(self, face, color=None):
r"""
Returns an iterator of faces obtained by applying self on the face.
5173d111-1d42-477d-8dcf-3dafadf95618
seblabbe
jdemeyer
fchapoton
This patch introduces unit cube faces and substitutions over them, as defined in the article Pisot substitutions and Rauzy fractals by Arnoux and Ito.
Three new classes are defined:
Face-- models a unit cube facePatch-- models a finite collection of facesE1Star-- models the the E_1!^(sigma)* substitution (over faces) defined by a unimodular substitutionsigmaThe plotting features enable us draw approximations of Rauzy fractals, or to generate patches of discrete planes.
The dimension of the faces can be of any dimension (and the substitutions work accordingly), but the plotting features work only in dimension three (with three-letter alphabet substitutions).
CC: @sagetrac-sage-combinat @seblabbe @sagetrac-abmasse @sagetrac-tmonteil
Component: combinatorics
Keywords: word morphism unit face generalized substitution rauzy fractal
Author: Vincent Delecroix, Timo Jolivet, Franco Saliola, Štěpán Starosta
Reviewer: Sébastien Labbé, Alexandre Blondin Massé
Merged: sage-4.6.1.alpha2
Issue created by migration from https://trac.sagemath.org/ticket/8431