From 7ceb1c0eb94625ae388ab97676caf2f71155c67c Mon Sep 17 00:00:00 2001 From: Florian Mirus Date: Wed, 31 Jul 2024 10:41:49 +0200 Subject: [PATCH 1/3] add missing libs and correct dead links in overview table in libraries.rst --- docs/libraries.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/libraries.rst b/docs/libraries.rst index 80cf029b..3362eca5 100644 --- a/docs/libraries.rst +++ b/docs/libraries.rst @@ -16,8 +16,12 @@ Beside ``osc.standard`` provided by OpenSCENARIO 2 (which we divide into ``osc.s - Robotics Library (provided with :repo_link:`scenario_execution`) * - ``osc.ros`` - ROS Library (provided with :repo_link:`scenario_execution_ros`) + * - ``osc.nav2`` + - ROS Nav2 navigation stack Library (provided with :repo_link:`libs/scenario_execution_nav2`) + * - ``osc.os`` + - Library to interact with the operating system (provided with :repo_link:`libs/scenario_execution_os`) * - ``osc.gazebo`` - - Gazebo Library (provided with :repo_link:`scenario_execution_gazebo`) + - Gazebo Library (provided with :repo_link:`libs/scenario_execution_gazebo`) Additional features can be implemented by defining your own library. From 1f14cc566a730d86d993720eaeb3697563d562ec Mon Sep 17 00:00:00 2001 From: Florian Mirus Date: Wed, 31 Jul 2024 10:42:36 +0200 Subject: [PATCH 2/3] format fixes --- .../osc2_parsing/OpenSCENARIO2Parser.py | 20 +++++++++---------- scenario_execution/setup.py | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/scenario_execution/scenario_execution/osc2_parsing/OpenSCENARIO2Parser.py b/scenario_execution/scenario_execution/osc2_parsing/OpenSCENARIO2Parser.py index 535b1e05..0eb38263 100644 --- a/scenario_execution/scenario_execution/osc2_parsing/OpenSCENARIO2Parser.py +++ b/scenario_execution/scenario_execution/osc2_parsing/OpenSCENARIO2Parser.py @@ -2179,7 +2179,7 @@ def siBaseUnitName(self): self.enterOuterAlt(localctx, 1) self.state = 397 _la = self._input.LA(1) - if not((((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << OpenSCENARIO2Parser.T__11) | (1 << OpenSCENARIO2Parser.T__12) | (1 << OpenSCENARIO2Parser.T__13) | (1 << OpenSCENARIO2Parser.T__14) | (1 << OpenSCENARIO2Parser.T__15) | (1 << OpenSCENARIO2Parser.T__16) | (1 << OpenSCENARIO2Parser.T__17) | (1 << OpenSCENARIO2Parser.T__18))) != 0)): + if not ((((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << OpenSCENARIO2Parser.T__11) | (1 << OpenSCENARIO2Parser.T__12) | (1 << OpenSCENARIO2Parser.T__13) | (1 << OpenSCENARIO2Parser.T__14) | (1 << OpenSCENARIO2Parser.T__15) | (1 << OpenSCENARIO2Parser.T__16) | (1 << OpenSCENARIO2Parser.T__17) | (1 << OpenSCENARIO2Parser.T__18))) != 0)): self._errHandler.recoverInline(self) else: self._errHandler.reportMatch(self) @@ -2370,7 +2370,7 @@ def enumMemberValue(self): self.enterOuterAlt(localctx, 1) self.state = 419 _la = self._input.LA(1) - if not(_la == OpenSCENARIO2Parser.UintLiteral or _la == OpenSCENARIO2Parser.HexUintLiteral): + if not (_la == OpenSCENARIO2Parser.UintLiteral or _la == OpenSCENARIO2Parser.HexUintLiteral): self._errHandler.recoverInline(self) else: self._errHandler.reportMatch(self) @@ -4618,7 +4618,7 @@ def primitiveType(self): self.enterOuterAlt(localctx, 1) self.state = 670 _la = self._input.LA(1) - if not((((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << OpenSCENARIO2Parser.T__32) | (1 << OpenSCENARIO2Parser.T__33) | (1 << OpenSCENARIO2Parser.T__34) | (1 << OpenSCENARIO2Parser.T__35) | (1 << OpenSCENARIO2Parser.T__36))) != 0)): + if not ((((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << OpenSCENARIO2Parser.T__32) | (1 << OpenSCENARIO2Parser.T__33) | (1 << OpenSCENARIO2Parser.T__34) | (1 << OpenSCENARIO2Parser.T__35) | (1 << OpenSCENARIO2Parser.T__36))) != 0)): self._errHandler.recoverInline(self) else: self._errHandler.reportMatch(self) @@ -5378,7 +5378,7 @@ def everyExpression(self): localctx._Identifier = self.match(OpenSCENARIO2Parser.Identifier) offsetName = (None if localctx._Identifier is None else localctx._Identifier.text) - if(not (offsetName == "offset")): + if (not (offsetName == "offset")): print("%s must be offset" % offsetName) raise NoViableAltException(self) @@ -6155,7 +6155,7 @@ def constraintQualifier(self): self.enterOuterAlt(localctx, 1) self.state = 837 _la = self._input.LA(1) - if not(_la == OpenSCENARIO2Parser.T__49 or _la == OpenSCENARIO2Parser.T__50): + if not (_la == OpenSCENARIO2Parser.T__49 or _la == OpenSCENARIO2Parser.T__50): self._errHandler.recoverInline(self) else: self._errHandler.reportMatch(self) @@ -6956,7 +6956,7 @@ def compositionOperator(self): self.enterOuterAlt(localctx, 1) self.state = 927 _la = self._input.LA(1) - if not((((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << OpenSCENARIO2Parser.T__54) | (1 << OpenSCENARIO2Parser.T__55) | (1 << OpenSCENARIO2Parser.T__56))) != 0)): + if not ((((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << OpenSCENARIO2Parser.T__54) | (1 << OpenSCENARIO2Parser.T__55) | (1 << OpenSCENARIO2Parser.T__56))) != 0)): self._errHandler.recoverInline(self) else: self._errHandler.reportMatch(self) @@ -8897,7 +8897,7 @@ def relationalOp(self): self.enterOuterAlt(localctx, 1) self.state = 1139 _la = self._input.LA(1) - if not(((((_la - 23)) & ~0x3f) == 0 and ((1 << (_la - 23)) & ((1 << (OpenSCENARIO2Parser.T__22 - 23)) | (1 << (OpenSCENARIO2Parser.T__75 - 23)) | (1 << (OpenSCENARIO2Parser.T__76 - 23)) | (1 << (OpenSCENARIO2Parser.T__77 - 23)) | (1 << (OpenSCENARIO2Parser.T__78 - 23)) | (1 << (OpenSCENARIO2Parser.T__79 - 23)) | (1 << (OpenSCENARIO2Parser.T__80 - 23)))) != 0)): + if not (((((_la - 23)) & ~0x3f) == 0 and ((1 << (_la - 23)) & ((1 << (OpenSCENARIO2Parser.T__22 - 23)) | (1 << (OpenSCENARIO2Parser.T__75 - 23)) | (1 << (OpenSCENARIO2Parser.T__76 - 23)) | (1 << (OpenSCENARIO2Parser.T__77 - 23)) | (1 << (OpenSCENARIO2Parser.T__78 - 23)) | (1 << (OpenSCENARIO2Parser.T__79 - 23)) | (1 << (OpenSCENARIO2Parser.T__80 - 23)))) != 0)): self._errHandler.recoverInline(self) else: self._errHandler.reportMatch(self) @@ -9055,7 +9055,7 @@ def additiveOp(self): self.enterOuterAlt(localctx, 1) self.state = 1153 _la = self._input.LA(1) - if not(_la == OpenSCENARIO2Parser.T__81 or _la == OpenSCENARIO2Parser.T__82): + if not (_la == OpenSCENARIO2Parser.T__81 or _la == OpenSCENARIO2Parser.T__82): self._errHandler.recoverInline(self) else: self._errHandler.reportMatch(self) @@ -9213,7 +9213,7 @@ def multiplicativeOp(self): self.enterOuterAlt(localctx, 1) self.state = 1167 _la = self._input.LA(1) - if not(((((_la - 84)) & ~0x3f) == 0 and ((1 << (_la - 84)) & ((1 << (OpenSCENARIO2Parser.T__83 - 84)) | (1 << (OpenSCENARIO2Parser.T__84 - 84)) | (1 << (OpenSCENARIO2Parser.T__85 - 84)))) != 0)): + if not (((((_la - 84)) & ~0x3f) == 0 and ((1 << (_la - 84)) & ((1 << (OpenSCENARIO2Parser.T__83 - 84)) | (1 << (OpenSCENARIO2Parser.T__84 - 84)) | (1 << (OpenSCENARIO2Parser.T__85 - 84)))) != 0)): self._errHandler.recoverInline(self) else: self._errHandler.reportMatch(self) @@ -10544,7 +10544,7 @@ def integerLiteral(self): self.enterOuterAlt(localctx, 1) self.state = 1324 _la = self._input.LA(1) - if not(((((_la - 99)) & ~0x3f) == 0 and ((1 << (_la - 99)) & ((1 << (OpenSCENARIO2Parser.UintLiteral - 99)) | (1 << (OpenSCENARIO2Parser.HexUintLiteral - 99)) | (1 << (OpenSCENARIO2Parser.IntLiteral - 99)))) != 0)): + if not (((((_la - 99)) & ~0x3f) == 0 and ((1 << (_la - 99)) & ((1 << (OpenSCENARIO2Parser.UintLiteral - 99)) | (1 << (OpenSCENARIO2Parser.HexUintLiteral - 99)) | (1 << (OpenSCENARIO2Parser.IntLiteral - 99)))) != 0)): self._errHandler.recoverInline(self) else: self._errHandler.reportMatch(self) diff --git a/scenario_execution/setup.py b/scenario_execution/setup.py index 587699b3..d92f2926 100644 --- a/scenario_execution/setup.py +++ b/scenario_execution/setup.py @@ -26,7 +26,7 @@ this_directory = Path(__file__).parent try: LONG_DESCRIPTION = (this_directory / "README.md").read_text() -except: # pylint: disable=W0702 +except: # pylint: disable=W0702 # in case we do colcon build --symlink-install, wo do not need the # description LONG_DESCRIPTION = '' From 80e931051da012165c72d2128f8c1c6e631a3723 Mon Sep 17 00:00:00 2001 From: Florian Mirus Date: Wed, 31 Jul 2024 11:11:49 +0200 Subject: [PATCH 3/3] repo link fix --- docs/libraries.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/libraries.rst b/docs/libraries.rst index 3362eca5..ef61eeac 100644 --- a/docs/libraries.rst +++ b/docs/libraries.rst @@ -29,7 +29,7 @@ Additional features can be implemented by defining your own library. Gazebo ------ -The library contains actions to interact with the `Gazebo Simulation `_. Import it with ``import osc.gazebo``. It's provided by the package :repo_link:`scenario_execution_gazebo`. +The library contains actions to interact with the `Gazebo Simulation `_. Import it with ``import osc.gazebo``. It's provided by the package :repo_link:`libs/scenario_execution_gazebo`. Actions ^^^^^^^