take back get_quadrant but teach it to handle poins on axises

astynax · astynax · commit ccdc7d777ff1 · 2019-07-25T13:26:39.000+03:00
diff --git a/README.md b/README.md
@@ -14,3 +14,5 @@ A SICP'ish Points implemented in Python using hexlet-pairs.
     100
     >>> points.get_y(p)
     200
+    >>> points.get_quadrant(p)
+    1
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hexlet-points"
-version = "0.2.0"
+version = "0.3.0"
 description = "A SICP'ish Points implemented in Python using hexlet-pairs"
 authors = ["Hexlet Team <info@hexlet.io>"]
 license = "ISC"
diff --git a/src/hexlet/points/__init__.py b/src/hexlet/points/__init__.py
@@ -2,11 +2,13 @@
 
 """SICP'ish Points implemented in Python using hexlet.pairs."""
 
+from typing import Optional
+
 from hexlet import pairs
 
 __all__ = (   # noqa: WPS317
     'make',
-    'get_x', 'get_y',
+    'get_x', 'get_y', 'get_quadrant',
     'to_string',
 )
 
@@ -29,3 +31,16 @@ def get_y(point: pairs.Pair) -> int:
 def to_string(point: pairs.Pair) -> str:
     """Return a string representation of the point."""
     return repr((get_x(point), get_y(point)))
+
+
+def get_quadrant(point: pairs.Pair) -> Optional[int]:
+    """Return a quadrant number for the point."""
+    x, y = get_x(point), get_y(point)
+    if not x or not y:
+        return None
+    return {
+        (True, True): 1,
+        (False, True): 2,
+        (False, False): 3,
+        (True, False): 4,
+    }[(x > 0, y > 0)]
diff --git a/test/test_points.py b/test/test_points.py
@@ -18,3 +18,19 @@ def test_to_string():
     assert points.to_string(p) == '(100, 200)', (
         'Should return a proper representation.'
     )
+
+
+def test_get_quadrant():  # noqa: WPS210
+    """Test to_string conversion."""
+    p1 = points.make(1, 1)
+    p2 = points.make(-1, 1)
+    p3 = points.make(-1, -1)
+    p4 = points.make(1, -1)
+    px = points.make(0, 1)
+    py = points.make(1, 0)
+    assert points.get_quadrant(p1) == 1, 'Should detect a quadrant #1.'
+    assert points.get_quadrant(p2) == 2, 'Should detect a quadrant #2.'
+    assert points.get_quadrant(p3) == 3, 'Should detect a quadrant #3.'
+    assert points.get_quadrant(p4) == 4, 'Should detect a quadrant #4.'
+    assert points.get_quadrant(px) is None, 'Should handle points on x axis.'
+    assert points.get_quadrant(py) is None, 'Should handle points on y axis.'

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,5 @@ A SICP'ish Points implemented in Python using hexlet-pairs.`
`14`	`14`	`100`
`15`	`15`	`>>> points.get_y(p)`
`16`	`16`	`200`
	`17`	`+ >>> points.get_quadrant(p)`
	`18`	`+ 1`