Skip to content

Commit a18447d

Browse files
committed
docs(readme): improve
1 parent 49136c4 commit a18447d

File tree

2 files changed

+53
-39
lines changed

2 files changed

+53
-39
lines changed

README.rst

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,20 @@ Installation
3535
``pip`` and ``poetry`` installation only supported for ``linux`` -based
3636
operating systems. For Windows and MacOS install using
3737
`(ana)conda <#conda>`__. A container exists for exposing a simplified
38-
web interface using `marimo <https://github.com/marimo-team/marimo>`__.
38+
web interface, created with `marimo <https://github.com/marimo-team/marimo>`__.
3939

4040
conda
4141
~~~~~
4242

43-
- Only (supported) installation method for ``Windows`` and ``MacOS``!
43+
- This is the only supported installation method for ``Windows`` and
44+
``MacOS``!
4445

4546
.. code:: bash
4647
4748
# Create new environment for fractopo (recommended but optional)
4849
conda env create -n fractopo-env
4950
conda activate fractopo-env
51+
# Install to the newly created environment
5052
# Available on conda-forge channel
5153
conda install -c conda-forge fractopo
5254
@@ -57,7 +59,6 @@ The module is on `PyPI <https://www.pypi.org>`__.
5759

5860
.. code:: bash
5961
60-
# Non-development installation
6162
pip install fractopo
6263
6364
poetry
@@ -69,8 +70,8 @@ For usage:
6970
7071
poetry add fractopo
7172
72-
For development, only ``poetry`` installation of ``fractopo`` is
73-
supported:
73+
For development, use ``poetry`` to install the latest development
74+
version of ``fractopo``:
7475

7576
.. code:: bash
7677
@@ -86,8 +87,9 @@ A `marimo <https://github.com/marimo-team/marimo>`__ +
8687
``./marimos``, ``api.py``. This is included in the
8788
``ghcr.io/nialov/fractopo-app:latest`` image. By default, when the image
8889
is run, the network analysis app is run accessible at root (``/``). To
89-
access validation functinality, use path ``/validation``. Network
90-
analysis is also available at ``/network``.
90+
access validation functinality, use path ``/validation`` when accessing
91+
the container (e.g. `localhost:2718/validation``). Network
92+
analysis is also explicitly available at ``/network``.
9193

9294
The app host and port can be chosen with ``HOST`` (default is
9395
``0.0.0.0``) and ``PORT`` (default is ``2718``) environment variables.
@@ -101,9 +103,9 @@ To run app:
101103
102104
docker run --rm --interactive --tty --publish 2718:2718 ghcr.io/nialov/fractopo-app:latest
103105
104-
The network analysis functionality should be available at
105-
http://localhost:2718/network and validation functionality at
106-
http://localhost:2718/validation.
106+
After running the above command, the network analysis functionality
107+
should be available at ``http://localhost:2718/network`` and validation
108+
functionality at ``http://localhost:2718/validation``.
107109

108110
Usage
109111
-----
@@ -163,7 +165,7 @@ Multi-scale length distributions `Multi-scale`_
163165
.. _Multi-scale:
164166
https://nialov.github.io/fractopo/auto_examples/plot_multi_scale_networks.html#sphx-glr-auto-examples-plot-multi-scale-networks-py
165167

166-
For a short tutorial on use of ``fractopo`` continue reading:
168+
For a short tutorial on use of ``fractopo``, continue reading:
167169

168170
Input data
169171
~~~~~~~~~~
@@ -234,7 +236,7 @@ data.
234236
fractopo tracevalidate /path/to/trace_data.shp /path/to/target_area.shp\
235237
--output /path/to/validated_trace_data.shp
236238
237-
# Or with automatic saving to validated/ directory
239+
# Or with a printed summary and automatic saving to validated/ directory
238240
fractopo tracevalidate /path/to/trace_data.shp /path/to/target_area.shp\
239241
--summary
240242
@@ -286,19 +288,20 @@ visualizing different parameters and attributes of trace data.
286288
network.plot_trace_lengths()
287289
288290
Network analysis is also available through the ``fractopo`` command-line
289-
interface but using the Python interface (e.g. ``jupyter lab``,
290-
``ipython``) is recommended when analysing ``Networks`` to have access
291-
to all available analysis and plotting methods. The command-line
292-
entrypoint is **opinionated** in what outputs it produces. Brief example
293-
of command-line entrypoint:
291+
interface but using the Python interface (e.g. ``marimo``,
292+
``jupyter lab``, ``ipython``) is recommended when analysing ``Networks``
293+
to have access to all available analysis and plotting methods. The
294+
command-line entrypoint is **opinionated** in what outputs it produces.
295+
Brief example of command-line entrypoint:
294296

295297
.. code:: bash
296298
299+
# Use --help to see all up-to-date arguments and help
300+
fractopo network --help
301+
297302
fractopo network /path/to/trace_data.shp /path/to/area_data.shp\
298303
--name mynetwork
299304
300-
# Use --help to see all up-to-date arguments and help
301-
fractopo network --help
302305
303306
.. figure:: /docs_src/imgs/fractopo_workflow_visualisation.jpg
304307
:alt: Data analysis workflow visualisation for fracture trace data.
@@ -353,6 +356,10 @@ are referred to multiple sources:
353356

354357
- Application of ``fractopo`` for subsampling analysis of fracture networks.
355358

359+
- `Ovaskainen et al, 2023 <https://doi.org/10.5194/se-14-603-2023>`__
360+
361+
- Application of ``fractopo`` for multi-scale lineament and fracture analysis
362+
356363
- `Nyberg et al., 2018 <https://doi.org/10.1130/GES01595.1>`__
357364

358365
- A similar package to ``fractopo`` with a ``QGIS`` GUI.

docs_src/index.rst

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,20 @@ Installation
5252
``pip`` and ``poetry`` installation only supported for ``linux`` -based
5353
operating systems. For Windows and MacOS install using
5454
`(ana)conda <#conda>`__. A container exists for exposing a simplified
55-
web interface using `marimo <https://github.com/marimo-team/marimo>`__.
55+
web interface, created with `marimo <https://github.com/marimo-team/marimo>`__.
5656

5757
conda
5858
~~~~~
5959

60-
- Only (supported) installation method for ``Windows`` and ``MacOS``!
60+
- This is the only supported installation method for ``Windows`` and
61+
``MacOS``!
6162

6263
.. code:: bash
6364
6465
# Create new environment for fractopo (recommended but optional)
6566
conda env create -n fractopo-env
6667
conda activate fractopo-env
68+
# Install to the newly created environment
6769
# Available on conda-forge channel
6870
conda install -c conda-forge fractopo
6971
@@ -74,7 +76,6 @@ The module is on `PyPI <https://www.pypi.org>`__.
7476

7577
.. code:: bash
7678
77-
# Non-development installation
7879
pip install fractopo
7980
8081
poetry
@@ -86,8 +87,8 @@ For usage:
8687
8788
poetry add fractopo
8889
89-
For development, only ``poetry`` installation of ``fractopo`` is
90-
supported:
90+
For development, use ``poetry`` to install the latest development
91+
version of ``fractopo``:
9192

9293
.. code:: bash
9394
@@ -103,8 +104,9 @@ A `marimo <https://github.com/marimo-team/marimo>`__ +
103104
``./marimos``, ``api.py``. This is included in the
104105
``ghcr.io/nialov/fractopo-app:latest`` image. By default, when the image
105106
is run, the network analysis app is run accessible at root (``/``). To
106-
access validation functinality, use path ``/validation``. Network
107-
analysis is also available at ``/network``.
107+
access validation functinality, use path ``/validation`` when accessing
108+
the container (e.g. `localhost:2718/validation``). Network
109+
analysis is also explicitly available at ``/network``.
108110

109111
The app host and port can be chosen with ``HOST`` (default is
110112
``0.0.0.0``) and ``PORT`` (default is ``2718``) environment variables.
@@ -118,9 +120,9 @@ To run app:
118120
119121
docker run --rm --interactive --tty --publish 2718:2718 ghcr.io/nialov/fractopo-app:latest
120122
121-
The network analysis functionality should be available at
122-
http://localhost:2718/network and validation functionality at
123-
http://localhost:2718/validation.
123+
After running the above command, the network analysis functionality
124+
should be available at ``http://localhost:2718/network`` and validation
125+
functionality at ``http://localhost:2718/validation``.
124126

125127
Usage
126128
-----
@@ -180,7 +182,7 @@ Multi-scale length distributions `Multi-scale`_
180182
.. _Multi-scale:
181183
https://nialov.github.io/fractopo/auto_examples/plot_multi_scale_networks.html#sphx-glr-auto-examples-plot-multi-scale-networks-py
182184

183-
For a short tutorial on use of ``fractopo`` continue reading:
185+
For a short tutorial on use of ``fractopo``, continue reading:
184186

185187
Input data
186188
~~~~~~~~~~
@@ -251,7 +253,7 @@ data.
251253
fractopo tracevalidate /path/to/trace_data.shp /path/to/target_area.shp\
252254
--output /path/to/validated_trace_data.shp
253255
254-
# Or with automatic saving to validated/ directory
256+
# Or with a printed summary and automatic saving to validated/ directory
255257
fractopo tracevalidate /path/to/trace_data.shp /path/to/target_area.shp\
256258
--summary
257259
@@ -303,19 +305,20 @@ visualizing different parameters and attributes of trace data.
303305
network.plot_trace_lengths()
304306
305307
Network analysis is also available through the ``fractopo`` command-line
306-
interface but using the Python interface (e.g. ``jupyter lab``,
307-
``ipython``) is recommended when analysing ``Networks`` to have access
308-
to all available analysis and plotting methods. The command-line
309-
entrypoint is **opinionated** in what outputs it produces. Brief example
310-
of command-line entrypoint:
308+
interface but using the Python interface (e.g. ``marimo``,
309+
``jupyter lab``, ``ipython``) is recommended when analysing ``Networks``
310+
to have access to all available analysis and plotting methods. The
311+
command-line entrypoint is **opinionated** in what outputs it produces.
312+
Brief example of command-line entrypoint:
311313

312314
.. code:: bash
313315
316+
# Use --help to see all up-to-date arguments and help
317+
fractopo network --help
318+
314319
fractopo network /path/to/trace_data.shp /path/to/area_data.shp\
315320
--name mynetwork
316321
317-
# Use --help to see all up-to-date arguments and help
318-
fractopo network --help
319322
320323
.. figure:: /imgs/fractopo_workflow_visualisation.jpg
321324
:alt: Data analysis workflow visualisation for fracture trace data.
@@ -370,6 +373,10 @@ are referred to multiple sources:
370373

371374
- Application of ``fractopo`` for subsampling analysis of fracture networks.
372375

376+
- `Ovaskainen et al, 2023 <https://doi.org/10.5194/se-14-603-2023>`__
377+
378+
- Application of ``fractopo`` for multi-scale lineament and fracture analysis
379+
373380
- `Nyberg et al., 2018 <https://doi.org/10.1130/GES01595.1>`__
374381

375382
- A similar package to ``fractopo`` with a ``QGIS`` GUI.
@@ -433,7 +440,7 @@ Copyright © 2020-2026, Nikolas Ovaskainen.
433440
:target: https://mybinder.org/v2/gh/nialov/fractopo/HEAD?filepath=docs_src%2Fnotebooks%2Ffractopo_network_1.ipynb
434441
.. |Zenodo| image:: https://zenodo.org/badge/297451015.svg
435442
:target: https://zenodo.org/badge/latestdoi/297451015
436-
.. [[[end]]] (checksum: 0fed91a430072b847114ba600a6aec78)
443+
.. [[[end]]] (checksum: 30fa4ce9db93537eaf15a03562daebb9)
437444
438445
.. toctree::
439446
:hidden:

0 commit comments

Comments
 (0)