Skip to content

Commit 058addd

Browse files
authored
add requirements dir (AtsushiSakai#630)
* add requirements dir * add requirements dir * add requirements dir
1 parent 2878c4a commit 058addd

14 files changed

+30
-53
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
command: |
1515
python -m venv venv
1616
. venv/bin/activate
17-
pip install -r requirements.txt
17+
pip install -r docs/doc_requirements.txt
1818
cd docs;make html
1919
- store_artifacts:
2020
path: docs/_build/html/

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2
22
updates:
33
- package-ecosystem: pip
4-
directory: "/"
4+
directory: "/requirements"
55
schedule:
66
interval: weekly
77
time: "20:00"

.github/workflows/Linux_CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Install dependencies
2828
run: |
2929
python -m pip install --upgrade pip
30-
python -m pip install -r requirements.txt
30+
python -m pip install -r requirements/requirements.txt
3131
- name: do all unit tests
3232
run: bash runtests.sh
3333

.github/workflows/MacOS_CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install dependencies
3434
run: |
3535
python -m pip install --upgrade pip
36-
pip install numpy # cvxpy install workaround
37-
pip install -r requirements.txt
36+
#pip install numpy # cvxpy install workaround
37+
pip install -r requirements/requirements.txt
3838
- name: do all unit tests
3939
run: bash runtests.sh

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@ All animation gifs are stored here: [AtsushiSakai/PythonRoboticsGifs: Animation
141141

142142
using conda :
143143

144-
> conda env create -f environment.yml
144+
> conda env create -f requirements/environment.yml
145145
146146
using pip :
147147

148-
> pip install -r requirements.txt
148+
> pip install -r requirements/requirements.txt
149149
150150

151151
3. Execute python script in each directory.

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ install:
3737
- SET PATH=%PYTHON%;%PYTHON%\Scripts;%PYTHON%\Library\bin;%PATH%
3838
- SET PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin
3939
- "python -m pip install --upgrade pip"
40-
- "python -m pip install -r requirements.txt"
40+
- "python -m pip install -r requirements/requirements.txt"
4141
- "python -m pip install pytest-xdist"
4242

4343
# Check that we have the expected version and architecture for Python

docs/doc_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
sphinx == 4.3.2 # For sphinx documentation
22
sphinx_rtd_theme == 1.0.0
3-
IPython == 8.0.1 # For sphinx documentation
3+
IPython == 7.31.1 # For sphinx documentation

docs/getting_started_main.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ using conda :
6767

6868
.. code-block::
6969
70-
>$ conda env create -f environment.yml
70+
>$ conda env create -f requirements/environment.yml
7171
7272
using pip :
7373

7474
.. code-block::
7575
76-
>$ pip install -r requirements.txt
76+
>$ pip install -r requirements/requirements.txt
7777
7878
7979
3. Execute python script in each directory.

docs/modules/control/move_to_a_pose_control/move_to_a_pose_control.rst

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1+
Move to a Pose Control
2+
----------------------
3+
4+
In this section, we present the logic of PathFinderController that drives a car from a start pose (x, y, theta) to a goal pose. A simulation of moving to a pose control is presented below.
5+
6+
.. image:: https://github.com/AtsushiSakai/PythonRoboticsGifs/raw/master/PathTracking/move_to_pose/animation.gif
7+
18
Position Control of non-Holonomic Systems
2-
-----------------------------------------
9+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
310

411
This section explains the logic of a position controller for systems with constraint (non-Holonomic system).
512

@@ -9,20 +16,11 @@ To describe the configuration of a car on a 2D plane, we need three DOFs (i.e.,
916

1017
Note that a car is normally a non-Holonomic system but if the road is slippery, the car turns into a Holonomic system and thus it needs three independent commands to be controlled.
1118

12-
Move to a Pose Control
13-
----------------------
14-
15-
In this section, we present the logic of PathFinderController that drives a car from a start pose (x, y, theta) to a goal pose. A simulation of moving to a pose control is presented below.
16-
17-
.. image:: https://github.com/AtsushiSakai/PythonRoboticsGifs/raw/master/PathTracking/move_to_pose/animation.gif
18-
19-
20-
2119
PathFinderController class
2220
~~~~~~~~~~~~~~~~~~~~~~~~~~
2321

2422
Constructor
25-
~~~~~~~~~~~
23+
^^^^^^^^^^^
2624

2725
.. code-block:: ipython3
2826
@@ -38,7 +36,7 @@ Parameters:
3836

3937

4038
Member function(s)
41-
~~~~~~~~~~~~~~~~~~
39+
^^^^^^^^^^^^^^^^^^
4240

4341
.. code-block:: ipython3
4442
@@ -99,7 +97,8 @@ The final angular speed command is given by
9997
The linear and angular speeds (Equations :eq:`eq1` and :eq:`eq2`) are the output of the algorithm.
10098

10199
Move to a Pose Robot (Class)
102-
----------------------------
100+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
101+
103102
This program (move_to_pose_robot.py) provides a Robot class to define different robots with different specifications.
104103
Using this class, you can simulate different robots simultaneously and compare the effect of your parameter settings.
105104

@@ -108,10 +107,10 @@ Using this class, you can simulate different robots simultaneously and compare t
108107
Note: The robot class is based on PathFinderController class in 'the move_to_pose.py'.
109108

110109
Robot Class
111-
~~~~~~~~~~~
110+
^^^^^^^^^^^^
112111

113112
Constructor
114-
~~~~~~~~~~~
113+
^^^^^^^^^^^^
115114

116115
.. code-block:: ipython3
117116
@@ -128,7 +127,7 @@ Parameters:
128127
- | **path_finder_controller** : (PathFinderController) A configurable controller to finds the path and calculates command linear and angular velocities.
129128

130129
Member function(s)
131-
~~~~~~~~~~~~~~~~~~
130+
^^^^^^^^^^^^^^^^^^^
132131

133132
.. code-block:: ipython3
134133
@@ -151,12 +150,10 @@ Parameters:
151150

152151
- | **dt** : <float> time increment
153152

154-
See Also
155-
--------
156-
- PathFinderController class
157153

158154

159-
Ref:
160-
----
155+
References
156+
~~~~~~~~~~~~
157+
- PathFinderController class
161158
- `P. I. Corke, "Robotics, Vision and Control" \| SpringerLink
162159
p102 <https://link.springer.com/book/10.1007/978-3-642-20144-8>`__
File renamed without changes.

0 commit comments

Comments
 (0)