shortened names and filenames of rcc2, rcc8 and cardir

Author: Yiannis Gatsoulis

qsr_lib/src/qsrlib_qsrs/__init__.py

@@ -1,7 +1,7 @@
-from qsr_rcc2_rectangle_bounding_boxes_2d import QSR_RCC2_Rectangle_Bounding_Boxes_2D
+from qsr_rcc2 import QSR_RCC2
 from qsr_rcc3_rectangle_bounding_boxes_2d import QSR_RCC3_Rectangle_Bounding_Boxes_2D
-from qsr_rcc8_rectangle_bounding_boxes_2d import QSR_RCC8_Rectangle_Bounding_Boxes_2D
-from qsr_cardinal_direction_bounding_boxes_centroid_2d import QSR_Cardinal_Direction_Bounding_Boxes_Centroid_2D
+from qsr_rcc8 import QSR_RCC8
+from qsr_cardinal_direction import QSR_Cardinal_Direction
 from qsr_qtc_b_simplified import QSR_QTC_B_Simplified
 from qsr_qtc_c_simplified import QSR_QTC_C_Simplified
 from qsr_qtc_bc_simplified import QSR_QTC_BC_Simplified
@@ -11,10 +11,10 @@
 from qsr_new_mwe import QSR_MWE
 
 # register new qsrs by class name below
-qsrs_registry = (QSR_RCC2_Rectangle_Bounding_Boxes_2D,
+qsrs_registry = (QSR_RCC2,
                  QSR_RCC3_Rectangle_Bounding_Boxes_2D,
-                 QSR_RCC8_Rectangle_Bounding_Boxes_2D,
-                 QSR_Cardinal_Direction_Bounding_Boxes_Centroid_2D,
+                 QSR_RCC8,
+                 QSR_Cardinal_Direction,
                  QSR_QTC_B_Simplified,
                  QSR_QTC_C_Simplified,
                  QSR_QTC_BC_Simplified,

qsr_lib/src/qsrlib_qsrs/qsr_cardinal_direction_bounding_boxes_centroid_2d.py renamed to qsr_lib/src/qsrlib_qsrs/qsr_cardinal_direction.py

@@ -3,7 +3,7 @@
 from qsrlib_qsrs.qsr_dyadic_abstractclass import QSR_Dyadic_1t_Abstractclass
 import math
 
-class QSR_Cardinal_Direction_Bounding_Boxes_Centroid_2D(QSR_Dyadic_1t_Abstractclass):
+class QSR_Cardinal_Direction(QSR_Dyadic_1t_Abstractclass):
     """Cardinal direction relations.
 
     Values of the abstract properties
@@ -25,7 +25,7 @@ class QSR_Cardinal_Direction_Bounding_Boxes_Centroid_2D(QSR_Dyadic_1t_Abstractcl
 
     def __init__(self):
         """Constructor."""
-        super(QSR_Cardinal_Direction_Bounding_Boxes_Centroid_2D, self).__init__()
+        super(QSR_Cardinal_Direction, self).__init__()
 
     def _compute_qsr(self, data1, data2, qsr_params, **kwargs):
         """Compute QSR relation.

qsr_lib/src/qsrlib_qsrs/qsr_rcc2_rectangle_bounding_boxes_2d.py renamed to qsr_lib/src/qsrlib_qsrs/qsr_rcc2.py

@@ -3,7 +3,7 @@
 from qsrlib_qsrs.qsr_rcc_abstractclass import QSR_RCC_Abstractclass
 
 
-class QSR_RCC2_Rectangle_Bounding_Boxes_2D(QSR_RCC_Abstractclass):
+class QSR_RCC2(QSR_RCC_Abstractclass):
     """RCC2 relations.
 
     Values of the abstract properties
@@ -22,7 +22,7 @@ class QSR_RCC2_Rectangle_Bounding_Boxes_2D(QSR_RCC_Abstractclass):
 
     def __init__(self):
         """Constructor."""
-        super(QSR_RCC2_Rectangle_Bounding_Boxes_2D, self).__init__()
+        super(QSR_RCC2, self).__init__()
 
     def _convert_to_requested_rcc_type(self, qsr):
         """Remap QSR values from RCC8 to RCC2.

qsr_lib/src/qsrlib_qsrs/qsr_rcc8_rectangle_bounding_boxes_2d.py renamed to qsr_lib/src/qsrlib_qsrs/qsr_rcc8.py

@@ -3,7 +3,7 @@
 from qsrlib_qsrs.qsr_rcc_abstractclass import QSR_RCC_Abstractclass
 
 
-class QSR_RCC8_Rectangle_Bounding_Boxes_2D(QSR_RCC_Abstractclass):
+class QSR_RCC8(QSR_RCC_Abstractclass):
     """RCC8 relations.
 
     Values of the abstract properties
@@ -14,18 +14,6 @@ class QSR_RCC8_Rectangle_Bounding_Boxes_2D(QSR_RCC_Abstractclass):
     .. seealso:: For further details about RCC8, refer to its :doc:`description. <../handwritten/qsrs/rcc8>`
     """
 
-    """RCC8
-
-        # 'dc'     bb1 is disconnected from bb2
-        # 'ec'     bb1 is externally connected with bb2
-        # 'po'     bb1 partially overlaps bb2
-        # 'eq'     bb1 equals bb2
-        # 'tpp'    bb1 is a tangential proper part of bb2
-        # 'ntpp'   bb1 is a non-tangential proper part of bb2
-        # 'tppi'   bb2 is a tangential proper part of bb1
-        # 'ntppi'  bb2 is a non-tangential proper part of bb1
-    """
-
     _unique_id = "rcc8"
     """str: Unique identifier name of the QSR."""
 
@@ -34,7 +22,7 @@ class QSR_RCC8_Rectangle_Bounding_Boxes_2D(QSR_RCC_Abstractclass):
 
     def __init__(self):
         """Constructor."""
-        super(QSR_RCC8_Rectangle_Bounding_Boxes_2D, self).__init__()
+        super(QSR_RCC8, self).__init__()
 
     def _convert_to_requested_rcc_type(self, qsr):
         """No need for remapping.