fix doc typo

[simgrid.git] / docs / source / Tutorial_Algorithms.rst

diff --git a/docs/source/Tutorial_Algorithms.rst b/docs/source/Tutorial_Algorithms.rst
index 0f7c3797adb3cd1fc9b22d797a5f21773f89cebb..7cf77734df87d5694cb283987caa59cadc164fa0 100644 (file)
--- a/docs/source/Tutorial_Algorithms.rst
+++ b/docs/source/Tutorial_Algorithms.rst
@@ -408,10 +408,14 @@ recompile it when you first log in:
 
 .. code-block:: console
 
 
 .. code-block:: console
 

-   $ cp -r /source/simgrid-template-s4u.git/* /source/tutorial
-   $ cd /source/tutorial
-   $ cmake .
-   $ make
+   $ # Make sure the simgrid-tutorial directory can be read and written by the non-root user
+   $ sudo chown $UID:$GID ~/simgrid-tutorial
+   $ # Connect to the running container if needed
+   $ docker exec --user $UID:$GID -ti simgrid bash
+   $container) cp -r /source/simgrid-template-s4u.git/* /source/tutorial
+   $container) cd /source/tutorial
+   $container) cmake .
+   $container) make

 
 Using your Computer Natively
 ............................
 
 Using your Computer Natively
 ............................


@@ -528,21 +532,6 @@ Discovering the Provided Code
       If you get an error stating that the simgrid module does not exist, you need to get a newer version of SimGrid. 
       You may want to take the tutorial from the docker to get the newest version.
 
       If you get an error stating that the simgrid module does not exist, you need to get a newer version of SimGrid. 
       You may want to take the tutorial from the docker to get the newest version.
 

-For a more "fancy" output, you can use simgrid-colorizer.
-
-.. code-block:: console
-
-   # Run C++ code
-   $ ./master-workers small_platform.xml master-workers_d.xml 2>&1 | simgrid-colorizer
-
-   # Run Python code
-   $ python master-workers.py small_platform.xml master-workers_d.xml 2>&1 | simgrid-colorizer
-
-If you installed SimGrid to a non-standard path, you may have to
-specify the full path to simgrid-colorizer on the above line, such as
-``/opt/simgrid/bin/simgrid-colorizer``. If you did not install it at all,
-you can find it in <simgrid_root_directory>/bin/colorize.
-

 For a classical Gantt-Chart visualization, you can use `Vite
 <http://vite.gforge.inria.fr/>`_ if you have it installed, as
 follows. But do not spend too much time installing Vite, because there
 For a classical Gantt-Chart visualization, you can use `Vite
 <http://vite.gforge.inria.fr/>`_ if you have it installed, as
 follows. But do not spend too much time installing Vite, because there


@@ -563,9 +552,6 @@ is a better way to visualize SimGrid traces (see below).
 
 .. note::
 
 
 .. note::
 

-   If you use an older version of SimGrid (before v3.26), you should use
-   ``--cfg=tracing/msg/process:yes`` instead of ``--cfg=tracing/actor:yes``.
-

 If you want the full power to visualize SimGrid traces, you need
 to use R. As a start, you can download this `starter script
 <https://framagit.org/simgrid/simgrid/raw/master/docs/source/tuto_s4u/draw_gantt.R>`_
 If you want the full power to visualize SimGrid traces, you need
 to use R. As a start, you can download this `starter script
 <https://framagit.org/simgrid/simgrid/raw/master/docs/source/tuto_s4u/draw_gantt.R>`_


@@ -632,8 +618,8 @@ information is only written once. It thus follows the `DRY
       .. code-block:: cpp
 
          for (int i = 0; i < tasks_count; i++) {
       .. code-block:: cpp
 
          for (int i = 0; i < tasks_count; i++) {

-            std::string worker_rank          = std::to_string(i % workers_count);
-            std::string mailbox_name         = std::string("worker-") + worker_rank;
+            std::string worker_rank        = std::to_string(i % workers_count);
+            std::string mailbox_name       = "worker-" + worker_rank;

             simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(mailbox_name);
 
             mailbox->put(...);
             simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(mailbox_name);
 
             mailbox->put(...);


@@ -998,12 +984,6 @@ After this Tutorial
 This tutorial is now terminated. You could keep reading the online documentation and
 tutorials, or you could head up to the :ref:`example section <s4u_examples>` to read some code.
 
 This tutorial is now terminated. You could keep reading the online documentation and
 tutorials, or you could head up to the :ref:`example section <s4u_examples>` to read some code.
 

-.. todo::
-
-   Things to improve in the future:
-
-   - Propose equivalent exercises and skeleton in Java once we fix the Java binding.
-

 .. |br| raw:: html
 
    <br />
 .. |br| raw:: html
 
    <br />