30187: count -> number_of_occurrences_of_letter

Author: seblabbe

src/sage/combinat/words/finite_word.py

@@ -225,6 +225,8 @@
 from sage.rings.all import Integer, Infinity, ZZ, QQ
 from sage.sets.set import Set
 
+from sage.misc.superseded import deprecated_function_alias
+
 class FiniteWord_class(Word_class):
     def __str__(self):
         r"""
@@ -567,13 +569,15 @@ def content(self, n=None):
             sage: w.content()
             [0, 1, 0, 1]
         """
+        from collections import Counter
+        c = Counter(self)
         if n is not None:
             alphabet = range(1,n+1)
         elif not self.parent().alphabet().cardinality() == +Infinity:
             alphabet = self.parent().alphabet()
         else:
-            alphabet = sorted(self.letters())
-        return [self.count(i) for i in alphabet]
+            alphabet = sorted(c.keys())
+        return [Integer(c[a]) for a in alphabet]
 
     def is_yamanouchi(self, n=None):
         r"""
@@ -4624,6 +4628,33 @@ def nb_subword_occurrences_in(self, other):
         # return only the number of occurrences of self
         return occ[-1]
 
+    def number_of_occurrences_of_letter(self, letter):
+        r"""
+        Return the number of occurrences of ``letter`` in ``self``.
+
+        INPUT:
+
+        - ``letter`` - a letter
+
+        OUTPUT:
+
+        - integer
+
+        EXAMPLES::
+
+            sage: Word('abbabaab').number_of_occurrences_of_letter('a')
+            4
+            sage: Word('abbabaab').number_of_occurrences_of_letter('ab')
+            0
+
+        .. SEEALSO::
+
+            :meth:`sage.combinat.words.finite_word.FiniteWord_class.nb_factor_occurrences_in`
+
+        """
+        return Integer(sum(1 for a in self if a == letter))
+    count = deprecated_function_alias(30187, number_of_occurrences_of_letter)
+
     def _return_words_list(self, fact):
         r"""
         Return the return words as a list in the order they appear in the word.
@@ -5415,17 +5446,6 @@ def iterated_left_palindromic_closure(self, f=None):
             f = WordMorphism(f)
             return f(self).reversal().iterated_right_palindromic_closure(f=f)
 
-    def count(self, letter):
-        r"""
-        Count the number of occurrences of ``letter`` in ``self``.
-
-        EXAMPLES::
-
-            sage: Word('abbabaab').count('a')
-            4
-        """
-        return Integer(sum(1 for a in self if a == letter))
-
     def balance(self):
         r"""
         Return the balance of ``self``.

src/sage/combinat/words/word_datatypes.pyx

@@ -273,7 +273,7 @@ cdef class WordDatatype_list(WordDatatype):
 
     __add__ = __mul__
 
-    def count(self, a):
+    def number_of_occurrences_of_letter(self, a):
         r"""
         Returns the number of occurrences of the letter ``a`` in the word
         ``self``.
@@ -289,13 +289,17 @@ cdef class WordDatatype_list(WordDatatype):
         EXAMPLES::
 
             sage: w = Word([0,1,1,0,1])
-            sage: w.count(0)
+            sage: w.number_of_occurrences_of_letter(0)
             2
-            sage: w.count(1)
+            sage: w.number_of_occurrences_of_letter(1)
             3
-            sage: w.count(2)
+            sage: w.number_of_occurrences_of_letter(2)
             0
 
+        .. SEEALSO::
+
+            :meth:`sage.combinat.words.finite_word.FiniteWord_class.nb_factor_occurrences_in`
+
         """
         return self._data.count(a)
 
@@ -607,7 +611,7 @@ cdef class WordDatatype_str(WordDatatype):
 
     __add__ = __mul__
 
-    def count(self, letter):
+    def number_of_occurrences_of_letter(self, letter):
         r"""
         Count the number of occurrences of ``letter``.
 
@@ -622,15 +626,27 @@ cdef class WordDatatype_str(WordDatatype):
         EXAMPLES::
 
             sage: w = Word("abbabaabababa")
-            sage: w.count('a')
+            sage: w.number_of_occurrences_of_letter('a')
             7
-            sage: w.count('b')
+            sage: w.number_of_occurrences_of_letter('b')
             6
-            sage: w.count('c')
+            sage: w.number_of_occurrences_of_letter('c')
             0
 
+        ::
+
+            sage: w.number_of_occurrences_of_letter('abb')
+            0
+
+        .. SEEALSO::
+
+            :meth:`sage.combinat.words.finite_word.FiniteWord_class.nb_factor_occurrences_in`
+
         """
-        return self._data.count(letter)
+        if len(letter) == 1:
+            return self._data.count(letter)
+        else:
+            return 0
 
     def split(self, sep=None, maxsplit=None):
         r"""

src/sage/combinat/words/word_generators.py

@@ -290,8 +290,12 @@ def standard_factorization(self):
                 break
             u = v
         w1, w2 = self[:index+1], self[index+1:]
-        return Factorization([LowerChristoffelWord(w1.count(1),w1.count(0)),
-                LowerChristoffelWord(w2.count(1),w2.count(0))])
+        w10 = w1.number_of_occurrences_of_letter(0)
+        w11 = w1.number_of_occurrences_of_letter(1)
+        w20 = w2.number_of_occurrences_of_letter(0)
+        w21 = w2.number_of_occurrences_of_letter(1)
+        return Factorization([LowerChristoffelWord(w11,w10),
+                              LowerChristoffelWord(w21,w20)])
 
     def __reduce__(self):
         r"""