shortened name, unittests

Author: Yiannis Gatsoulis

.gitignore

@@ -58,6 +58,7 @@ target/
 .idea/
 
 *~
+*.DS_Store*
 
 # DOC
 qsr_lib/docs/_build/

qsr_lib/CMakeLists.txt

@@ -50,6 +50,7 @@ if (CATKIN_ENABLE_TESTING)
   add_rostest(tests/qtcbcs_tester.test)
   add_rostest(tests/rcc2_tester.test)
   add_rostest(tests/rcc3_tester.test)
+  add_rostest(tests/rcc5_tester.test)
   add_rostest(tests/rcc8_tester.test)
   add_rostest(tests/multiple_tester.test)
 

qsr_lib/src/qsrlib_qsrs/__init__.py

@@ -1,6 +1,6 @@
 from qsr_rcc2_rectangle_bounding_boxes_2d import QSR_RCC2_Rectangle_Bounding_Boxes_2D
 from qsr_rcc3_rectangle_bounding_boxes_2d import QSR_RCC3_Rectangle_Bounding_Boxes_2D
-from qsr_rcc5_rectangle_bounding_boxes_2d import QSR_RCC5_Rectangle_Bounding_Boxes_2D
+from qsr_rcc5 import QSR_RCC5
 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_qtc_b_simplified import QSR_QTC_B_Simplified
@@ -14,7 +14,7 @@
 # register new qsrs by class name below
 qsrs_registry = (QSR_RCC2_Rectangle_Bounding_Boxes_2D,
                  QSR_RCC3_Rectangle_Bounding_Boxes_2D,
-                 QSR_RCC5_Rectangle_Bounding_Boxes_2D,
+                 QSR_RCC5,
                  QSR_RCC8_Rectangle_Bounding_Boxes_2D,
                  QSR_Cardinal_Direction_Bounding_Boxes_Centroid_2D,
                  QSR_QTC_B_Simplified,

qsr_lib/src/qsrlib_qsrs/qsr_rcc5_rectangle_bounding_boxes_2d.py renamed to qsr_lib/src/qsrlib_qsrs/qsr_rcc5.py

@@ -3,7 +3,7 @@
 from qsrlib_qsrs.qsr_rcc_abstractclass import QSR_RCC_Abstractclass
 
 
-class QSR_RCC5_Rectangle_Bounding_Boxes_2D(QSR_RCC_Abstractclass):
+class QSR_RCC5(QSR_RCC_Abstractclass):
     """Computes symmetrical RCC5 relations
 
     """
@@ -22,7 +22,7 @@ class QSR_RCC5_Rectangle_Bounding_Boxes_2D(QSR_RCC_Abstractclass):
                            "eq": "eq"}
 
     def __init__(self):
-        super(QSR_RCC5_Rectangle_Bounding_Boxes_2D, self).__init__()
+        super(QSR_RCC5, self).__init__()
 
     def _convert_to_requested_rcc_type(self, qsr):
         return self.__mapping_from_rcc8[qsr]

qsr_lib/tests/data/data1_rcc5_custom.txt

@@ -0,0 +1 @@
+["1.0,o1,o2,{'rcc5': 'po'}", "2.0,o1,o2,{'rcc5': 'po'}", "3.0,o1,o2,{'rcc5': 'po'}", "4.0,o1,o2,{'rcc5': 'po'}", "5.0,o1,o2,{'rcc5': 'po'}", "6.0,o1,o2,{'rcc5': 'po'}", "7.0,o1,o2,{'rcc5': 'po'}", "8.0,o1,o2,{'rcc5': 'po'}", "9.0,o1,o2,{'rcc5': 'po'}", "10.0,o1,o2,{'rcc5': 'po'}", "11.0,o1,o2,{'rcc5': 'po'}", "12.0,o1,o2,{'rcc5': 'po'}", "13.0,o1,o2,{'rcc5': 'po'}", "14.0,o1,o2,{'rcc5': 'po'}", "15.0,o1,o2,{'rcc5': 'po'}", "16.0,o1,o2,{'rcc5': 'po'}", "17.0,o1,o2,{'rcc5': 'po'}", "18.0,o1,o2,{'rcc5': 'po'}", "19.0,o1,o2,{'rcc5': 'po'}", "20.0,o1,o2,{'rcc5': 'po'}", "21.0,o1,o2,{'rcc5': 'po'}", "22.0,o1,o2,{'rcc5': 'po'}", "23.0,o1,o2,{'rcc5': 'po'}", "24.0,o1,o2,{'rcc5': 'po'}", "25.0,o1,o2,{'rcc5': 'eq'}", "26.0,o1,o2,{'rcc5': 'po'}", "27.0,o1,o2,{'rcc5': 'po'}", "28.0,o1,o2,{'rcc5': 'po'}", "29.0,o1,o2,{'rcc5': 'po'}", "30.0,o1,o2,{'rcc5': 'po'}", "31.0,o1,o2,{'rcc5': 'po'}", "32.0,o1,o2,{'rcc5': 'po'}", "33.0,o1,o2,{'rcc5': 'po'}", "34.0,o1,o2,{'rcc5': 'po'}", "35.0,o1,o2,{'rcc5': 'po'}", "36.0,o1,o2,{'rcc5': 'po'}", "37.0,o1,o2,{'rcc5': 'po'}", "38.0,o1,o2,{'rcc5': 'po'}", "39.0,o1,o2,{'rcc5': 'po'}", "40.0,o1,o2,{'rcc5': 'po'}", "41.0,o1,o2,{'rcc5': 'po'}", "42.0,o1,o2,{'rcc5': 'po'}", "43.0,o1,o2,{'rcc5': 'po'}", "44.0,o1,o2,{'rcc5': 'po'}", "45.0,o1,o2,{'rcc5': 'po'}", "46.0,o1,o2,{'rcc5': 'po'}", "47.0,o1,o2,{'rcc5': 'po'}", "48.0,o1,o2,{'rcc5': 'po'}", "49.0,o1,o2,{'rcc5': 'po'}"]

qsr_lib/tests/data/data1_rcc5_defaults.txt

@@ -0,0 +1 @@
+["1.0,o1,o2,{'rcc5': 'dr'}", "1.0,o2,o1,{'rcc5': 'dr'}", "2.0,o1,o2,{'rcc5': 'dr'}", "2.0,o2,o1,{'rcc5': 'dr'}", "3.0,o1,o2,{'rcc5': 'dr'}", "3.0,o2,o1,{'rcc5': 'dr'}", "4.0,o1,o2,{'rcc5': 'dr'}", "4.0,o2,o1,{'rcc5': 'dr'}", "5.0,o1,o2,{'rcc5': 'dr'}", "5.0,o2,o1,{'rcc5': 'dr'}", "6.0,o1,o2,{'rcc5': 'dr'}", "6.0,o2,o1,{'rcc5': 'dr'}", "7.0,o1,o2,{'rcc5': 'dr'}", "7.0,o2,o1,{'rcc5': 'dr'}", "8.0,o1,o2,{'rcc5': 'dr'}", "8.0,o2,o1,{'rcc5': 'dr'}", "9.0,o1,o2,{'rcc5': 'dr'}", "9.0,o2,o1,{'rcc5': 'dr'}", "10.0,o1,o2,{'rcc5': 'dr'}", "10.0,o2,o1,{'rcc5': 'dr'}", "11.0,o1,o2,{'rcc5': 'dr'}", "11.0,o2,o1,{'rcc5': 'dr'}", "12.0,o1,o2,{'rcc5': 'dr'}", "12.0,o2,o1,{'rcc5': 'dr'}", "13.0,o1,o2,{'rcc5': 'dr'}", "13.0,o2,o1,{'rcc5': 'dr'}", "14.0,o1,o2,{'rcc5': 'dr'}", "14.0,o2,o1,{'rcc5': 'dr'}", "15.0,o1,o2,{'rcc5': 'dr'}", "15.0,o2,o1,{'rcc5': 'dr'}", "16.0,o1,o2,{'rcc5': 'dr'}", "16.0,o2,o1,{'rcc5': 'dr'}", "17.0,o1,o2,{'rcc5': 'po'}", "17.0,o2,o1,{'rcc5': 'po'}", "18.0,o1,o2,{'rcc5': 'po'}", "18.0,o2,o1,{'rcc5': 'po'}", "19.0,o1,o2,{'rcc5': 'po'}", "19.0,o2,o1,{'rcc5': 'po'}", "20.0,o1,o2,{'rcc5': 'dr'}", "20.0,o2,o1,{'rcc5': 'dr'}", "21.0,o1,o2,{'rcc5': 'dr'}", "21.0,o2,o1,{'rcc5': 'dr'}", "22.0,o1,o2,{'rcc5': 'dr'}", "22.0,o2,o1,{'rcc5': 'dr'}", "23.0,o1,o2,{'rcc5': 'dr'}", "23.0,o2,o1,{'rcc5': 'dr'}", "24.0,o1,o2,{'rcc5': 'po'}", "24.0,o2,o1,{'rcc5': 'po'}", "25.0,o1,o2,{'rcc5': 'eq'}", "25.0,o2,o1,{'rcc5': 'eq'}", "26.0,o1,o2,{'rcc5': 'po'}", "26.0,o2,o1,{'rcc5': 'po'}", "27.0,o1,o2,{'rcc5': 'dr'}", "27.0,o2,o1,{'rcc5': 'dr'}", "28.0,o1,o2,{'rcc5': 'dr'}", "28.0,o2,o1,{'rcc5': 'dr'}", "29.0,o1,o2,{'rcc5': 'dr'}", "29.0,o2,o1,{'rcc5': 'dr'}", "30.0,o1,o2,{'rcc5': 'dr'}", "30.0,o2,o1,{'rcc5': 'dr'}", "31.0,o1,o2,{'rcc5': 'po'}", "31.0,o2,o1,{'rcc5': 'po'}", "32.0,o1,o2,{'rcc5': 'po'}", "32.0,o2,o1,{'rcc5': 'po'}", "33.0,o1,o2,{'rcc5': 'po'}", "33.0,o2,o1,{'rcc5': 'po'}", "34.0,o1,o2,{'rcc5': 'dr'}", "34.0,o2,o1,{'rcc5': 'dr'}", "35.0,o1,o2,{'rcc5': 'dr'}", "35.0,o2,o1,{'rcc5': 'dr'}", "36.0,o1,o2,{'rcc5': 'dr'}", "36.0,o2,o1,{'rcc5': 'dr'}", "37.0,o1,o2,{'rcc5': 'dr'}", "37.0,o2,o1,{'rcc5': 'dr'}", "38.0,o1,o2,{'rcc5': 'dr'}", "38.0,o2,o1,{'rcc5': 'dr'}", "39.0,o1,o2,{'rcc5': 'dr'}", "39.0,o2,o1,{'rcc5': 'dr'}", "40.0,o1,o2,{'rcc5': 'dr'}", "40.0,o2,o1,{'rcc5': 'dr'}", "41.0,o1,o2,{'rcc5': 'dr'}", "41.0,o2,o1,{'rcc5': 'dr'}", "42.0,o1,o2,{'rcc5': 'dr'}", "42.0,o2,o1,{'rcc5': 'dr'}", "43.0,o1,o2,{'rcc5': 'dr'}", "43.0,o2,o1,{'rcc5': 'dr'}", "44.0,o1,o2,{'rcc5': 'dr'}", "44.0,o2,o1,{'rcc5': 'dr'}", "45.0,o1,o2,{'rcc5': 'dr'}", "45.0,o2,o1,{'rcc5': 'dr'}", "46.0,o1,o2,{'rcc5': 'dr'}", "46.0,o2,o1,{'rcc5': 'dr'}", "47.0,o1,o2,{'rcc5': 'dr'}", "47.0,o2,o1,{'rcc5': 'dr'}", "48.0,o1,o2,{'rcc5': 'dr'}", "48.0,o2,o1,{'rcc5': 'dr'}", "49.0,o1,o2,{'rcc5': 'dr'}", "49.0,o2,o1,{'rcc5': 'dr'}"]

qsr_lib/tests/data/data1_rcc5_q_factor_2p0.txt

@@ -0,0 +1 @@
+["1.0,o1,o2,{'rcc5': 'po'}", "1.0,o2,o1,{'rcc5': 'po'}", "2.0,o1,o2,{'rcc5': 'po'}", "2.0,o2,o1,{'rcc5': 'po'}", "3.0,o1,o2,{'rcc5': 'po'}", "3.0,o2,o1,{'rcc5': 'po'}", "4.0,o1,o2,{'rcc5': 'po'}", "4.0,o2,o1,{'rcc5': 'po'}", "5.0,o1,o2,{'rcc5': 'po'}", "5.0,o2,o1,{'rcc5': 'po'}", "6.0,o1,o2,{'rcc5': 'po'}", "6.0,o2,o1,{'rcc5': 'po'}", "7.0,o1,o2,{'rcc5': 'po'}", "7.0,o2,o1,{'rcc5': 'po'}", "8.0,o1,o2,{'rcc5': 'po'}", "8.0,o2,o1,{'rcc5': 'po'}", "9.0,o1,o2,{'rcc5': 'po'}", "9.0,o2,o1,{'rcc5': 'po'}", "10.0,o1,o2,{'rcc5': 'po'}", "10.0,o2,o1,{'rcc5': 'po'}", "11.0,o1,o2,{'rcc5': 'po'}", "11.0,o2,o1,{'rcc5': 'po'}", "12.0,o1,o2,{'rcc5': 'po'}", "12.0,o2,o1,{'rcc5': 'po'}", "13.0,o1,o2,{'rcc5': 'po'}", "13.0,o2,o1,{'rcc5': 'po'}", "14.0,o1,o2,{'rcc5': 'po'}", "14.0,o2,o1,{'rcc5': 'po'}", "15.0,o1,o2,{'rcc5': 'po'}", "15.0,o2,o1,{'rcc5': 'po'}", "16.0,o1,o2,{'rcc5': 'po'}", "16.0,o2,o1,{'rcc5': 'po'}", "17.0,o1,o2,{'rcc5': 'po'}", "17.0,o2,o1,{'rcc5': 'po'}", "18.0,o1,o2,{'rcc5': 'po'}", "18.0,o2,o1,{'rcc5': 'po'}", "19.0,o1,o2,{'rcc5': 'po'}", "19.0,o2,o1,{'rcc5': 'po'}", "20.0,o1,o2,{'rcc5': 'po'}", "20.0,o2,o1,{'rcc5': 'po'}", "21.0,o1,o2,{'rcc5': 'po'}", "21.0,o2,o1,{'rcc5': 'po'}", "22.0,o1,o2,{'rcc5': 'po'}", "22.0,o2,o1,{'rcc5': 'po'}", "23.0,o1,o2,{'rcc5': 'po'}", "23.0,o2,o1,{'rcc5': 'po'}", "24.0,o1,o2,{'rcc5': 'po'}", "24.0,o2,o1,{'rcc5': 'po'}", "25.0,o1,o2,{'rcc5': 'eq'}", "25.0,o2,o1,{'rcc5': 'eq'}", "26.0,o1,o2,{'rcc5': 'po'}", "26.0,o2,o1,{'rcc5': 'po'}", "27.0,o1,o2,{'rcc5': 'po'}", "27.0,o2,o1,{'rcc5': 'po'}", "28.0,o1,o2,{'rcc5': 'po'}", "28.0,o2,o1,{'rcc5': 'po'}", "29.0,o1,o2,{'rcc5': 'po'}", "29.0,o2,o1,{'rcc5': 'po'}", "30.0,o1,o2,{'rcc5': 'po'}", "30.0,o2,o1,{'rcc5': 'po'}", "31.0,o1,o2,{'rcc5': 'po'}", "31.0,o2,o1,{'rcc5': 'po'}", "32.0,o1,o2,{'rcc5': 'po'}", "32.0,o2,o1,{'rcc5': 'po'}", "33.0,o1,o2,{'rcc5': 'po'}", "33.0,o2,o1,{'rcc5': 'po'}", "34.0,o1,o2,{'rcc5': 'po'}", "34.0,o2,o1,{'rcc5': 'po'}", "35.0,o1,o2,{'rcc5': 'po'}", "35.0,o2,o1,{'rcc5': 'po'}", "36.0,o1,o2,{'rcc5': 'po'}", "36.0,o2,o1,{'rcc5': 'po'}", "37.0,o1,o2,{'rcc5': 'po'}", "37.0,o2,o1,{'rcc5': 'po'}", "38.0,o1,o2,{'rcc5': 'po'}", "38.0,o2,o1,{'rcc5': 'po'}", "39.0,o1,o2,{'rcc5': 'po'}", "39.0,o2,o1,{'rcc5': 'po'}", "40.0,o1,o2,{'rcc5': 'po'}", "40.0,o2,o1,{'rcc5': 'po'}", "41.0,o1,o2,{'rcc5': 'po'}", "41.0,o2,o1,{'rcc5': 'po'}", "42.0,o1,o2,{'rcc5': 'po'}", "42.0,o2,o1,{'rcc5': 'po'}", "43.0,o1,o2,{'rcc5': 'po'}", "43.0,o2,o1,{'rcc5': 'po'}", "44.0,o1,o2,{'rcc5': 'po'}", "44.0,o2,o1,{'rcc5': 'po'}", "45.0,o1,o2,{'rcc5': 'po'}", "45.0,o2,o1,{'rcc5': 'po'}", "46.0,o1,o2,{'rcc5': 'po'}", "46.0,o2,o1,{'rcc5': 'po'}", "47.0,o1,o2,{'rcc5': 'po'}", "47.0,o2,o1,{'rcc5': 'po'}", "48.0,o1,o2,{'rcc5': 'po'}", "48.0,o2,o1,{'rcc5': 'po'}", "49.0,o1,o2,{'rcc5': 'po'}", "49.0,o2,o1,{'rcc5': 'po'}"]

qsr_lib/tests/data/data1_rcc5_qsrs_for_global_namespace.txt

@@ -0,0 +1 @@
+["1.0,o2,o1,{'rcc5': 'dr'}", "2.0,o2,o1,{'rcc5': 'dr'}", "3.0,o2,o1,{'rcc5': 'dr'}", "4.0,o2,o1,{'rcc5': 'dr'}", "5.0,o2,o1,{'rcc5': 'dr'}", "6.0,o2,o1,{'rcc5': 'dr'}", "7.0,o2,o1,{'rcc5': 'dr'}", "8.0,o2,o1,{'rcc5': 'dr'}", "9.0,o2,o1,{'rcc5': 'dr'}", "10.0,o2,o1,{'rcc5': 'dr'}", "11.0,o2,o1,{'rcc5': 'dr'}", "12.0,o2,o1,{'rcc5': 'dr'}", "13.0,o2,o1,{'rcc5': 'dr'}", "14.0,o2,o1,{'rcc5': 'dr'}", "15.0,o2,o1,{'rcc5': 'dr'}", "16.0,o2,o1,{'rcc5': 'dr'}", "17.0,o2,o1,{'rcc5': 'po'}", "18.0,o2,o1,{'rcc5': 'po'}", "19.0,o2,o1,{'rcc5': 'po'}", "20.0,o2,o1,{'rcc5': 'dr'}", "21.0,o2,o1,{'rcc5': 'dr'}", "22.0,o2,o1,{'rcc5': 'dr'}", "23.0,o2,o1,{'rcc5': 'dr'}", "24.0,o2,o1,{'rcc5': 'po'}", "25.0,o2,o1,{'rcc5': 'eq'}", "26.0,o2,o1,{'rcc5': 'po'}", "27.0,o2,o1,{'rcc5': 'dr'}", "28.0,o2,o1,{'rcc5': 'dr'}", "29.0,o2,o1,{'rcc5': 'dr'}", "30.0,o2,o1,{'rcc5': 'dr'}", "31.0,o2,o1,{'rcc5': 'po'}", "32.0,o2,o1,{'rcc5': 'po'}", "33.0,o2,o1,{'rcc5': 'po'}", "34.0,o2,o1,{'rcc5': 'dr'}", "35.0,o2,o1,{'rcc5': 'dr'}", "36.0,o2,o1,{'rcc5': 'dr'}", "37.0,o2,o1,{'rcc5': 'dr'}", "38.0,o2,o1,{'rcc5': 'dr'}", "39.0,o2,o1,{'rcc5': 'dr'}", "40.0,o2,o1,{'rcc5': 'dr'}", "41.0,o2,o1,{'rcc5': 'dr'}", "42.0,o2,o1,{'rcc5': 'dr'}", "43.0,o2,o1,{'rcc5': 'dr'}", "44.0,o2,o1,{'rcc5': 'dr'}", "45.0,o2,o1,{'rcc5': 'dr'}", "46.0,o2,o1,{'rcc5': 'dr'}", "47.0,o2,o1,{'rcc5': 'dr'}", "48.0,o2,o1,{'rcc5': 'dr'}", "49.0,o2,o1,{'rcc5': 'dr'}"]

qsr_lib/tests/data/data1_rcc5_qsrs_for_qsr_namespace.txt

@@ -0,0 +1 @@
+["1.0,o1,o2,{'rcc5': 'dr'}", "2.0,o1,o2,{'rcc5': 'dr'}", "3.0,o1,o2,{'rcc5': 'dr'}", "4.0,o1,o2,{'rcc5': 'dr'}", "5.0,o1,o2,{'rcc5': 'dr'}", "6.0,o1,o2,{'rcc5': 'dr'}", "7.0,o1,o2,{'rcc5': 'dr'}", "8.0,o1,o2,{'rcc5': 'dr'}", "9.0,o1,o2,{'rcc5': 'dr'}", "10.0,o1,o2,{'rcc5': 'dr'}", "11.0,o1,o2,{'rcc5': 'dr'}", "12.0,o1,o2,{'rcc5': 'dr'}", "13.0,o1,o2,{'rcc5': 'dr'}", "14.0,o1,o2,{'rcc5': 'dr'}", "15.0,o1,o2,{'rcc5': 'dr'}", "16.0,o1,o2,{'rcc5': 'dr'}", "17.0,o1,o2,{'rcc5': 'po'}", "18.0,o1,o2,{'rcc5': 'po'}", "19.0,o1,o2,{'rcc5': 'po'}", "20.0,o1,o2,{'rcc5': 'dr'}", "21.0,o1,o2,{'rcc5': 'dr'}", "22.0,o1,o2,{'rcc5': 'dr'}", "23.0,o1,o2,{'rcc5': 'dr'}", "24.0,o1,o2,{'rcc5': 'po'}", "25.0,o1,o2,{'rcc5': 'eq'}", "26.0,o1,o2,{'rcc5': 'po'}", "27.0,o1,o2,{'rcc5': 'dr'}", "28.0,o1,o2,{'rcc5': 'dr'}", "29.0,o1,o2,{'rcc5': 'dr'}", "30.0,o1,o2,{'rcc5': 'dr'}", "31.0,o1,o2,{'rcc5': 'po'}", "32.0,o1,o2,{'rcc5': 'po'}", "33.0,o1,o2,{'rcc5': 'po'}", "34.0,o1,o2,{'rcc5': 'dr'}", "35.0,o1,o2,{'rcc5': 'dr'}", "36.0,o1,o2,{'rcc5': 'dr'}", "37.0,o1,o2,{'rcc5': 'dr'}", "38.0,o1,o2,{'rcc5': 'dr'}", "39.0,o1,o2,{'rcc5': 'dr'}", "40.0,o1,o2,{'rcc5': 'dr'}", "41.0,o1,o2,{'rcc5': 'dr'}", "42.0,o1,o2,{'rcc5': 'dr'}", "43.0,o1,o2,{'rcc5': 'dr'}", "44.0,o1,o2,{'rcc5': 'dr'}", "45.0,o1,o2,{'rcc5': 'dr'}", "46.0,o1,o2,{'rcc5': 'dr'}", "47.0,o1,o2,{'rcc5': 'dr'}", "48.0,o1,o2,{'rcc5': 'dr'}", "49.0,o1,o2,{'rcc5': 'dr'}"]