On Sun, Sep 27, 2009 at 04:45:05PM -0700, Anne Schilling wrote:
> I get the following error message when applying your patch
> (using sage-4.1.1).

Do you still get it? Things apply smoothly for me.

Btw: there is a new guard for the next 4.1.3, so please
sage -combinat qselect if you don't use sage -combinat update.

Cheers,
                                Nicolas



> applying automatic_monoid-nt.patch
> applying ndpf_monoid-fh.patch
> patching file sage/combinat/non_decreasing_parking_function.py
> Hunk #1 succeeded at 12 with fuzz 1 (offset 0 lines).
> Hunk #3 succeeded at 145 with fuzz 1 (offset 4 lines).
> Hunk #9 succeeded at 378 with fuzz 2 (offset 6 lines).
> Hunk #10 FAILED at 398
> 1 out of 12 hunks FAILED -- saving rejects to file 
> sage/combinat/non_decreasing_parking_function.py.rej
> patch failed, unable to continue (try -v)
> patch failed, rejects left in working dir
> Errors during apply, please fix and refresh ndpf_monoid-fh.patch
> Abort
> 
> 
> --- non_decreasing_parking_function.py
> +++ non_decreasing_parking_function.py
> @@ -373,15 +399,31 @@ class NonDecreasingParkingFunction(Combi
>           ...
>           AssertionError
>       """
> -    def __init__(self, lst):
> +    def __init__(self, lst, parent=None):
>           """
>           TESTS::
> 
>               sage: NonDecreasingParkingFunction([1, 1, 2, 2, 5, 6])
>               [1, 1, 2, 2, 5, 6]
> +            sage: NonDecreasingParkingFunction([1,1,2]).parent()
> +            Non decreasing parking functions
>           """
>           assert(is_a(lst))
>           CombinatorialObject.__init__(self, lst)
> +        if parent is not None:
> +            self._parent = parent
> +        else:
> +            self._parent = NonDecreasingParkingFunctions_all()
> +
> +    def parent(self):
> +        """
> +        TESTS::
> +
> +            sage: NonDecreasingParkingFunction([1, 1, 2, 2, 5, 6]).parent()
> +            Non decreasing parking functions
> +        """
> +        return self._parent
> +    pass
> 
>       def __getitem__(self, key):
>           """
> 
>                               Nicolas
--
Nicolas M. ThiƩry "Isil" <nthi...@users.sf.net>
http://Nicolas.Thiery.name/

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"sage-combinat-devel" group.
To post to this group, send email to sage-combinat-devel@googlegroups.com
To unsubscribe from this group, send email to 
sage-combinat-devel+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/sage-combinat-devel?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to