add type hints

docs/api_reference/ttr.rst

@@ -6,4 +6,4 @@ Type Token Ratios
 .. automodule:: TRUNAJOD.ttr
  :members:
 
-.. bibliography:: ttr.bib
+.. bibliography:: ttr.bib

src/TRUNAJOD/ttr.py

@@ -8,6 +8,7 @@
 tend to 0. This measurement is not recommended if analyzing texts of different
 lengths, as when the number of tokens increases, the TTR tends flatten.
 """
+import math
 from collections import defaultdict
 from typing import Dict
 from typing import List
@@ -139,7 +140,6 @@ def yule_k(doc: Doc) -> float:
  rs[value] += 1
 
  return 1e-4 * sum(r ** 2 * vr - N for r, vr in rs.items()) / N ** 2
-<<<<<<< HEAD
 
 
 def d_estimate(
@@ -201,5 +201,3 @@ def d_estimate(
  y = ttrs ** 2
  d = np.linalg.lstsq(A, y, rcond=None)[0]
  return d[0]
-=======
->>>>>>> bd81ddf (remove g index from this branch)

tests/ttr_test.py

@@ -1,8 +1,5 @@
 """TRUNAJOD ttr tests."""
-<<<<<<< HEAD
 import string
-=======
->>>>>>> bd81ddf (remove g index from this branch)
 from collections import namedtuple
 
 import numpy as np
@@ -58,7 +55,6 @@ def test_yule_k(test_doc):
  4: 1,
  }
  expected_k = 1e-4 * sum(r ** 2 * vr - n for r, vr in rs.items()) / n ** 2
-<<<<<<< HEAD
  assert ttr.yule_k(test_doc) == expected_k
 
 
@@ -94,6 +90,3 @@ def test_d_estimate():
 
  np.random.seed(0)
  assert ttr.d_estimate(doc) == 119.4468681409897
-=======
- assert ttr.yule_k(doc) == expected_k
->>>>>>> bd81ddf (remove g index from this branch)