Skip to content

Commit 031974c

Browse files
yianniyianni
committed
Merge pull request #185 from yianni/shortnames
shortened names and filenames of rcc2, rcc8 and cardir
2 parents 587f691 + 81625cb commit 031974c

File tree

8 files changed

+20
-32
lines changed

8 files changed

+20
-32
lines changed

‎docs/rsts/handwritten/qsrs/qsrs.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Currently, the following QSRs are supported:
2727
+----------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------+----------------+
2828
| **argprobd** | Qualitative Argument Probabilistic Distances | :doc:`descr. <argprobd>` \| :mod:`api <qsrlib_qsrs.qsr_arg_prob_relations_distance>` | ? |
2929
+----------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------+----------------+
30-
| **cardir** | Cardinal Directions | :doc:`descr. <cardir>` \| :mod:`api <qsrlib_qsrs.qsr_cardinal_direction_bounding_boxes_centroid_2d>` | [1]_ |
30+
| **cardir** | Cardinal Directions | :doc:`descr. <cardir>` \| :mod:`api <qsrlib_qsrs.qsr_cardinal_direction>` | [1]_ |
3131
+----------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------+----------------+
3232
| **mos** | Moving or Stationary | :doc:`descr. <mos>` \| :mod:`api <qsrlib_qsrs.qsr_moving_or_stationary>` | |
3333
+----------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------+----------------+
@@ -39,13 +39,13 @@ Currently, the following QSRs are supported:
3939
+----------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------+----------------+
4040
| **qtcbcs** | Qualitative Trajectory Calculus *bc* Simplified | :doc:`descr. <qtcbcs>` \| :mod:`api <qsrlib_qsrs.qsr_qtc_bc_simplified>` | ? |
4141
+----------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------+----------------+
42-
| **rcc2** | Region Connection Calculus 2 | :doc:`descr. <rcc2>` \| :mod:`api <qsrlib_qsrs.qsr_rcc2_rectangle_bounding_boxes_2d>` | [2]_ [3]_ |
42+
| **rcc2** | Region Connection Calculus 2 | :doc:`descr. <rcc2>` \| :mod:`api <qsrlib_qsrs.qsr_rcc2>` | [2]_ [3]_ |
4343
+----------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------+----------------+
44-
| **rcc3** | Region Connection Calculus 3 | :doc:`descr. <rcc3>` \| :mod:`api <qsrlib_qsrs.qsr_rcc3_rectangle_bounding_boxes_2d>` | [2]_ [3]_ |
44+
| **rcc3** | Region Connection Calculus 3 | :doc:`descr. <rcc3>` \| :mod:`api <qsrlib_qsrs.qsr_rcc3>` | [2]_ [3]_ |
4545
+----------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------+----------------+
46-
| **rcc5** | Region Connection Calculus 5 | :doc:`descr. <rcc5>` \| :mod:`api <qsrlib_qsrs.qsr_rcc5_rectangle_bounding_boxes_2d>` | [2]_ [3]_ |
46+
| **rcc5** | Region Connection Calculus 5 | :doc:`descr. <rcc5>` \| :mod:`api <qsrlib_qsrs.qsr_rcc5>` | [2]_ [3]_ |
4747
+----------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------+----------------+
48-
| **rcc8** | Region Connection Calculus 8 | :doc:`descr. <rcc8>` \| :mod:`api <qsrlib_qsrs.qsr_rcc8_rectangle_bounding_boxes_2d>` | [2]_ [3]_ |
48+
| **rcc8** | Region Connection Calculus 8 | :doc:`descr. <rcc8>` \| :mod:`api <qsrlib_qsrs.qsr_rcc8>` | [2]_ [3]_ |
4949
+----------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------+----------------+
5050

5151

‎docs/rsts/handwritten/qsrs/rcc2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ All the possible RCC5 relations between a blue object X and a red object Y are:
6060
API
6161
---
6262

63-
The API can be found :mod:`here <qsrlib_qsrs.qsr_rcc2_rectangle_bounding_boxes_2d>`.
63+
The API can be found :mod:`here <qsrlib_qsrs.qsr_rcc2>`.
6464

6565

6666
References

‎docs/rsts/handwritten/qsrs/rcc5.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ All the possible RCC5 relations between a blue object X and a red object Y are:
5959
API
6060
---
6161

62-
The API can be found :mod:`here <qsrlib_qsrs.qsr_rcc5_rectangle_bounding_boxes_2d>`.
62+
The API can be found :mod:`here <qsrlib_qsrs.qsr_rcc5>`.
6363

6464

6565
References

‎docs/rsts/handwritten/qsrs/rcc8.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ All the possible RCC8 relations between a blue object X and a red object Y are:
3636
API
3737
---
3838

39-
The API can be found :mod:`here <qsrlib_qsrs.qsr_rcc8_rectangle_bounding_boxes_2d>`.
39+
The API can be found :mod:`here <qsrlib_qsrs.qsr_rcc8>`.
4040

4141
References
4242
----------

‎qsr_lib/src/qsrlib_qsrs/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from qsr_rcc2_rectangle_bounding_boxes_2d import QSR_RCC2_Rectangle_Bounding_Boxes_2D
1+
from qsr_rcc2 import QSR_RCC2
22
from qsr_rcc3_rectangle_bounding_boxes_2d import QSR_RCC3_Rectangle_Bounding_Boxes_2D
3-
from qsr_rcc8_rectangle_bounding_boxes_2d import QSR_RCC8_Rectangle_Bounding_Boxes_2D
4-
from qsr_cardinal_direction_bounding_boxes_centroid_2d import QSR_Cardinal_Direction_Bounding_Boxes_Centroid_2D
3+
from qsr_rcc8 import QSR_RCC8
4+
from qsr_cardinal_direction import QSR_Cardinal_Direction
55
from qsr_qtc_b_simplified import QSR_QTC_B_Simplified
66
from qsr_qtc_c_simplified import QSR_QTC_C_Simplified
77
from qsr_qtc_bc_simplified import QSR_QTC_BC_Simplified
@@ -11,10 +11,10 @@
1111
from qsr_new_mwe import QSR_MWE
1212

1313
# register new qsrs by class name below
14-
qsrs_registry = (QSR_RCC2_Rectangle_Bounding_Boxes_2D,
14+
qsrs_registry = (QSR_RCC2,
1515
QSR_RCC3_Rectangle_Bounding_Boxes_2D,
16-
QSR_RCC8_Rectangle_Bounding_Boxes_2D,
17-
QSR_Cardinal_Direction_Bounding_Boxes_Centroid_2D,
16+
QSR_RCC8,
17+
QSR_Cardinal_Direction,
1818
QSR_QTC_B_Simplified,
1919
QSR_QTC_C_Simplified,
2020
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from qsrlib_qsrs.qsr_dyadic_abstractclass import QSR_Dyadic_1t_Abstractclass
44
import math
55

6-
class QSR_Cardinal_Direction_Bounding_Boxes_Centroid_2D(QSR_Dyadic_1t_Abstractclass):
6+
class QSR_Cardinal_Direction(QSR_Dyadic_1t_Abstractclass):
77
"""Cardinal direction relations.
88
99
Values of the abstract properties
@@ -25,7 +25,7 @@ class QSR_Cardinal_Direction_Bounding_Boxes_Centroid_2D(QSR_Dyadic_1t_Abstractcl
2525

2626
def __init__(self):
2727
"""Constructor."""
28-
super(QSR_Cardinal_Direction_Bounding_Boxes_Centroid_2D, self).__init__()
28+
super(QSR_Cardinal_Direction, self).__init__()
2929

3030
def _compute_qsr(self, data1, data2, qsr_params, **kwargs):
3131
"""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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from qsrlib_qsrs.qsr_rcc_abstractclass import QSR_RCC_Abstractclass
44

55

6-
class QSR_RCC2_Rectangle_Bounding_Boxes_2D(QSR_RCC_Abstractclass):
6+
class QSR_RCC2(QSR_RCC_Abstractclass):
77
"""RCC2 relations.
88
99
Values of the abstract properties
@@ -22,7 +22,7 @@ class QSR_RCC2_Rectangle_Bounding_Boxes_2D(QSR_RCC_Abstractclass):
2222

2323
def __init__(self):
2424
"""Constructor."""
25-
super(QSR_RCC2_Rectangle_Bounding_Boxes_2D, self).__init__()
25+
super(QSR_RCC2, self).__init__()
2626

2727
def _convert_to_requested_rcc_type(self, qsr):
2828
"""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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from qsrlib_qsrs.qsr_rcc_abstractclass import QSR_RCC_Abstractclass
44

55

6-
class QSR_RCC8_Rectangle_Bounding_Boxes_2D(QSR_RCC_Abstractclass):
6+
class QSR_RCC8(QSR_RCC_Abstractclass):
77
"""RCC8 relations.
88
99
Values of the abstract properties
@@ -14,18 +14,6 @@ class QSR_RCC8_Rectangle_Bounding_Boxes_2D(QSR_RCC_Abstractclass):
1414
.. seealso:: For further details about RCC8, refer to its :doc:`description. <../handwritten/qsrs/rcc8>`
1515
"""
1616

17-
"""RCC8
18-
19-
# 'dc' bb1 is disconnected from bb2
20-
# 'ec' bb1 is externally connected with bb2
21-
# 'po' bb1 partially overlaps bb2
22-
# 'eq' bb1 equals bb2
23-
# 'tpp' bb1 is a tangential proper part of bb2
24-
# 'ntpp' bb1 is a non-tangential proper part of bb2
25-
# 'tppi' bb2 is a tangential proper part of bb1
26-
# 'ntppi' bb2 is a non-tangential proper part of bb1
27-
"""
28-
2917
_unique_id = "rcc8"
3018
"""str: Unique identifier name of the QSR."""
3119

@@ -34,7 +22,7 @@ class QSR_RCC8_Rectangle_Bounding_Boxes_2D(QSR_RCC_Abstractclass):
3422

3523
def __init__(self):
3624
"""Constructor."""
37-
super(QSR_RCC8_Rectangle_Bounding_Boxes_2D, self).__init__()
25+
super(QSR_RCC8, self).__init__()
3826

3927
def _convert_to_requested_rcc_type(self, qsr):
4028
"""No need for remapping.

0 commit comments

Comments
 (0)