Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renata/docs #563

Merged
merged 62 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
683dd31
docs
r-akemii Aug 16, 2024
556bc2c
split network file
r-akemii Aug 16, 2024
56fa117
updates conf file
r-akemii Aug 16, 2024
46d608a
docs
r-akemii Aug 16, 2024
24b8a72
route choice model docs
r-akemii Aug 29, 2024
2d38c12
.
r-akemii Aug 29, 2024
c2a49c7
Update route_choice.py
r-akemii Aug 29, 2024
790dd31
Merge branch 'develop' into renata/docs
r-akemii Aug 29, 2024
72a93b0
docs
r-akemii Aug 29, 2024
2821f79
.
r-akemii Aug 29, 2024
ae6f105
.
r-akemii Aug 30, 2024
ea16285
change folder structure
r-akemii Sep 2, 2024
e28dbc1
.
r-akemii Sep 2, 2024
70d710d
.
r-akemii Sep 2, 2024
abbbb64
.
r-akemii Sep 2, 2024
3c304c8
rename folders
r-akemii Sep 2, 2024
0a582da
linting
r-akemii Sep 2, 2024
87ec3ca
rename files
r-akemii Sep 2, 2024
b8710a3
.
r-akemii Sep 2, 2024
949c441
.
r-akemii Sep 3, 2024
3236cf7
.
r-akemii Sep 3, 2024
12b286c
adds modules references in examples
r-akemii Sep 3, 2024
e8bc298
.
r-akemii Sep 3, 2024
a73eb90
Merge branch 'develop' of github.com:AequilibraE/aequilibrae into ren…
Sep 5, 2024
7ab7bfc
adds new sections in docs
r-akemii Sep 5, 2024
118e6bc
docs
r-akemii Sep 5, 2024
795ec5f
.
r-akemii Sep 5, 2024
a69e26a
Update 7-project_components.rst
r-akemii Sep 6, 2024
674584b
.
r-akemii Sep 6, 2024
c2b1e4b
docs
r-akemii Sep 6, 2024
32fc4b9
Merge branch 'develop' into renata/docs
r-akemii Sep 9, 2024
07279ad
removes data_model tables
r-akemii Sep 9, 2024
9571da4
nodes docs
r-akemii Sep 9, 2024
c183c6d
links and zones docs
r-akemii Sep 9, 2024
3b8dad2
docs
r-akemii Sep 9, 2024
95c7084
.
r-akemii Sep 9, 2024
5f64a87
rename folder
r-akemii Sep 9, 2024
2271aba
.
r-akemii Sep 9, 2024
fb8ebe8
Update table_documentation.py
r-akemii Sep 9, 2024
6e0c349
Create datamodel.rst.template
r-akemii Sep 9, 2024
64b1aed
removes geopandas from some examples
r-akemii Sep 10, 2024
c7106b4
fixes imports
r-akemii Sep 10, 2024
0408db7
Merge branch 'develop' into renata/docs
r-akemii Sep 12, 2024
d382665
update docs
r-akemii Sep 12, 2024
685c3ff
Merge branch 'renata/docs' of https://github.com/AequilibraE/aequilib…
r-akemii Sep 12, 2024
c7e9fbc
update docs
r-akemii Sep 12, 2024
bd4d36d
Update route_choice.py
r-akemii Sep 12, 2024
f3a6f66
.
r-akemii Sep 12, 2024
646de22
add doctest strings
r-akemii Sep 13, 2024
e7cc21a
.
r-akemii Sep 13, 2024
11950de
.
r-akemii Sep 13, 2024
c90d6d4
.
r-akemii Sep 13, 2024
a2cd9ea
Update project_components.rst
r-akemii Sep 13, 2024
fc8bbb7
modifies doctest ellipsis
r-akemii Sep 13, 2024
6a6b17a
print test string
r-akemii Sep 16, 2024
12c22cb
modify switcher
r-akemii Sep 16, 2024
10b11b7
change project structure
r-akemii Sep 16, 2024
0715ee5
changes
r-akemii Sep 17, 2024
8a8b08e
Update plot_subarea_analysis.py
r-akemii Sep 17, 2024
34076a4
Update project_components.rst
r-akemii Sep 17, 2024
669e37b
typos, tests, and admonitions
r-akemii Sep 18, 2024
70b4d79
admonitions
r-akemii Sep 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@ jobs:
- name: Test docstrings
run: |
python -m pytest --doctest-modules aequilibrae/log.py aequilibrae/parameters.py aequilibrae/paths/vdf.py
python -m pytest docs/source/modeling_with_aequilibrae/project_pieces --doctest-glob=*.rst

- name: Build documentation
run: |
jupyter nbconvert --to rst docs/source/validation_benchmarking/IPF_benchmark.ipynb
jupyter nbconvert --to rst docs/source/useful_information/validation_benchmarking/IPF_benchmark.ipynb
sphinx-build -M latexpdf docs/source docs/source/_static
sphinx-build -b html docs/source docs/build
python3 -m zipfile -c AequilibraE.zip docs/build
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
_build
_static
_templates
docs/source/sg_execution_times.rst
docs/source/_auto_examples
docs/source/api/generated
docs/source/modeling_with_aequilibrae/project_database/data_model
docs/source/modeling_with_aequilibrae/transit_database/data_model

# User-specific stuff:
.idea/**/workspace.xml
Expand Down
23 changes: 13 additions & 10 deletions aequilibrae/matrix/aequilibrae_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ def save(self, names=(), file_name=None) -> None:

:Arguments:
**names** (:obj:`tuple(str)`, *Optional*): New names for the matrices. Required if working with OMX files

**file_name** (:obj:`str`, *Optional*): Local path to the matrix file
"""
if file_name is not None:
cores = names if len(names) else self.names
Expand Down Expand Up @@ -293,21 +295,22 @@ def create_from_omx(
Creates an AequilibraeMatrix from an original OpenMatrix

:Arguments:
**file_path** (:obj:`str`): Path for the output AequilibraEMatrix
**file_path** (:obj:`str`): Path for the output AequilibraeMatrix

**omx_path** (:obj:`str`): Path to the OMX file one wants to import

**cores** (:obj:`list`): List of matrix cores to be imported
**cores** (:obj:`list`, *Optional*): List of matrix cores to be imported

**mappings** (:obj:`list`): List of the matrix mappings (i.e. indices, centroid numbers) to be imported
**mappings** (:obj:`list`, *Optional*): List of the matrix mappings (i.e. indices, centroid numbers)
to be imported

**robust** (:obj:`bool`, *Optional*): Boolean for whether AequilibraE should try to adjust the names for cores
and indices in case they are too long. Defaults to True
**robust** (:obj:`bool`, *Optional*): Boolean for whether AequilibraE should try to adjust the names
for cores and indices in case they are too long. Defaults to ``True``

**compressed** (:obj:`bool`, *Optional*): Boolean for whether we should compress the output matrix.
Not yet implemented

**memory_only** (:obj:`bool`, *Optional*): Whether you want to keep the matrix copy in memory only. Defaults to True
**memory_only** (:obj:`bool`, *Optional*): Whether you want to keep the matrix copy in memory only. Defaults to ``True``

"""

Expand Down Expand Up @@ -405,7 +408,7 @@ def create_from_trip_list(self, path_to_file: str, from_column: str, to_column:

**from_column** (:obj:`str`): trip list file column containing the origin zones numbers

**from_column** (:obj:`str`): trip list file column containing the destination zones numbers
**to_column** (:obj:`str`): trip list file column containing the destination zones numbers

**list_cores** (:obj:`list`): list of core columns in the trip list file

Expand Down Expand Up @@ -840,7 +843,7 @@ def load(self, file_path: str):
self.__load_aem__()

def is_omx(self):
"""Returns ``True`` if matrix data source is OMX, False otherwise"""
"""Returns ``True`` if matrix data source is OMX, ``False`` otherwise"""
return self.__omx

def computational_view(self, core_list: List[str] = None):
Expand Down Expand Up @@ -920,7 +923,7 @@ def copy(
**output_name** (:obj:`str`): Name of the new matrix file.
If none is provided, returns a copy in memory only

**cores** (:obj:`list`):List of the matrix cores to be copied
**cores** (:obj:`list`): List of the matrix cores to be copied

**names** (:obj:`list`, *Optional*): List with the new names for the cores. Defaults to current names

Expand Down Expand Up @@ -1044,7 +1047,7 @@ def columns(self) -> np.ndarray:

def nan_to_num(self):
"""
Converts all NaN values in all cores in the computational view to zeros
Converts all ``NaN`` values in all cores in the computational view to zeros

.. code-block:: python

Expand Down
16 changes: 12 additions & 4 deletions aequilibrae/parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,24 @@


class Parameters:
"""Global parameters module
"""Global parameters module.

Parameters are used in many procedures, and are often defined in the ``parameters.yml`` file ONLY.

Parameters are used in many procedures, and are often defined only in the parameters.yml file ONLY
Parameters are organized in the following groups:

* assignment
* distribution
* network
* links
* modes
* nodes
* osm
* gmns
* osm
* system
* report zeros
* temp directory

Please observe that OSM information handled on network is not the same on the OSM group.

.. code-block:: python

Expand Down
Loading