number_of_occurrences_of_letter -> number_of_letter_occurrences

Author: seblabbe

src/sage/combinat/words/finite_word.py

@@ -4760,7 +4760,7 @@ def number_of_subword_occurrences(self, other):
         # return only the number of occurrences of other
         return occ[-1]
 
-    def number_of_occurrences_of_letter(self, letter):
+    def number_of_letter_occurrences(self, letter):
         r"""
         Return the number of occurrences of ``letter`` in ``self``.
 
@@ -4774,9 +4774,30 @@ def number_of_occurrences_of_letter(self, letter):
 
         EXAMPLES::
 
-            sage: Word('abbabaab').number_of_occurrences_of_letter('a')
+            sage: w = Word('abbabaab')
+            sage: w.number_of_letter_occurrences('a')
+            4
+            sage: w.number_of_letter_occurrences('ab')
+            0
+
+        This methods is equivalent to ``list(w).count(letter)`` and
+        ``tuple(w).count(letter)``, thus ``count`` is an alias for the method
+        ``number_of_letter_occurrences``::
+
+            sage: list(w).count('a')
             4
-            sage: Word('abbabaab').number_of_occurrences_of_letter('ab')
+            sage: w.count('a')
+            4
+
+        But notice that if ``s`` and ``w`` are strings,
+        ``Word(s).count(w)`` counts the number occurrences of ``w`` as a
+        letter in ``Word(s)`` which is not the same as ``s.count(w)`` which
+        counts the number of occurrences of the string ``w`` inside ``s``::
+
+            sage: s = 'abbabaab'
+            sage: s.count('ab')
+            3
+            sage: Word(s).count('ab')
             0
 
         .. SEEALSO::
@@ -4785,7 +4806,7 @@ def number_of_occurrences_of_letter(self, letter):
 
         """
         return Integer(sum(1 for a in self if a == letter))
-    count = number_of_occurrences_of_letter # todo: deprecate count ?
+    count = number_of_letter_occurrences
 
     def _return_words_list(self, fact):
         r"""

src/sage/combinat/words/word_datatypes.pyx

@@ -273,7 +273,7 @@ cdef class WordDatatype_list(WordDatatype):
 
     __add__ = __mul__
 
-    def number_of_occurrences_of_letter(self, a):
+    def number_of_letter_occurrences(self, a):
         r"""
         Returns the number of occurrences of the letter ``a`` in the word
         ``self``.
@@ -289,11 +289,11 @@ cdef class WordDatatype_list(WordDatatype):
         EXAMPLES::
 
             sage: w = Word([0,1,1,0,1])
-            sage: w.number_of_occurrences_of_letter(0)
+            sage: w.number_of_letter_occurrences(0)
             2
-            sage: w.number_of_occurrences_of_letter(1)
+            sage: w.number_of_letter_occurrences(1)
             3
-            sage: w.number_of_occurrences_of_letter(2)
+            sage: w.number_of_letter_occurrences(2)
             0
 
         .. SEEALSO::
@@ -611,7 +611,7 @@ cdef class WordDatatype_str(WordDatatype):
 
     __add__ = __mul__
 
-    def number_of_occurrences_of_letter(self, letter):
+    def number_of_letter_occurrences(self, letter):
         r"""
         Count the number of occurrences of ``letter``.
 
@@ -626,16 +626,16 @@ cdef class WordDatatype_str(WordDatatype):
         EXAMPLES::
 
             sage: w = Word("abbabaabababa")
-            sage: w.number_of_occurrences_of_letter('a')
+            sage: w.number_of_letter_occurrences('a')
             7
-            sage: w.number_of_occurrences_of_letter('b')
+            sage: w.number_of_letter_occurrences('b')
             6
-            sage: w.number_of_occurrences_of_letter('c')
+            sage: w.number_of_letter_occurrences('c')
             0
 
         ::
 
-            sage: w.number_of_occurrences_of_letter('abb')
+            sage: w.number_of_letter_occurrences('abb')
             0
 
         .. SEEALSO::

src/sage/combinat/words/word_generators.py

@@ -290,10 +290,10 @@ def standard_factorization(self):
                 break
             u = v
         w1, w2 = self[:index+1], self[index+1:]
-        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)
+        w10 = w1.number_of_letter_occurrences(0)
+        w11 = w1.number_of_letter_occurrences(1)
+        w20 = w2.number_of_letter_occurrences(0)
+        w21 = w2.number_of_letter_occurrences(1)
         return Factorization([LowerChristoffelWord(w11,w10),
                               LowerChristoffelWord(w21,w20)])