Merge output-gnuplot#441

Add Gnuplot output functionality

Author: Luca Geretti

.github/workflows/coverage.yml

@@ -18,7 +18,7 @@ jobs:
 
     - name: Set Up Dependencies
       run: |
-        sudo apt install -y cmake ninja-build pkg-config lcov g++-10 libcairo2-dev libmpfr-dev python3-pip python3-dev
+        sudo apt install -y cmake ninja-build pkg-config lcov g++-10 libcairo2-dev gnuplot libmpfr-dev python3-pip python3-dev gnuplot
         sudo pip3 install coverage pytest
 
     - name: Create Build Environment

.github/workflows/debug.yml

@@ -47,7 +47,7 @@ jobs:
     - name: Set Up macOS Dependencies
       if: runner.os == 'macOS'
       run: |
-        brew install ninja gcc@10 python3 mpfr cairo
+        brew install ninja gcc@10 python3 mpfr cairo gnuplot
         export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
         sudo easy_install pip
         sudo pip3 install --upgrade pip
@@ -56,7 +56,7 @@ jobs:
     - name: Set Up Linux Dependencies
       if: runner.os == 'Linux'
       run: |
-        sudo apt install -y cmake ninja-build pkg-config clang-11 libcairo2-dev libmpfr-dev python3-pip python3-dev
+        sudo apt install -y cmake ninja-build pkg-config clang-11 libcairo2-dev gnuplot libmpfr-dev python3-pip python3-dev
         sudo pip3 install pytest
 
     - name: Create Build Environment

.github/workflows/release.yml

@@ -52,13 +52,13 @@ jobs:
     - name: Set Up macOS Dependencies
       if: runner.os == 'macOS'
       run: |
-        brew install ninja gcc@10 python3 mpfr cairo
+        brew install ninja gcc@10 python3 mpfr cairo gnuplot
         export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
 
     - name: Set Up Linux Dependencies
       if: runner.os == 'Linux'
       run: |
-        sudo apt install -y cmake ninja-build pkg-config clang-11 g++-10 libcairo2-dev libmpfr-dev python3-pip python3-dev
+        sudo apt install -y cmake ninja-build pkg-config clang-11 g++-10 libcairo2-dev gnuplot libmpfr-dev python3-pip python3-dev
 
     - name: Create Build Environment
       run: cmake -E make_directory ${{runner.workspace}}/build

CMakeLists.txt

@@ -118,13 +118,21 @@ else()
     message(WARNING "Unable to find Cairo. You will not be able to use graphics.")
 endif()
 
-configure_file(${PROJECT_SOURCE_DIR}/cmake/config.hpp.cmake ${PROJECT_SOURCE_DIR}/source/config.hpp)
-
-include_directories(${PROJECT_SOURCE_DIR}/source)
+find_package(Gnuplot 5.2.8)
+if(GNUPLOT_FOUND)
+    set(HAVE_GNUPLOT_H ON)
+else()
+    message(WARNING "Unable to find GNUPLOT 5.2.8. You will not be able to use GNUPLOT.")
+    set(HAVE_GNUPLOT_H OFF)
+endif()
 
 add_custom_target(everything)
 add_custom_target(tests)
 
+configure_file(${PROJECT_SOURCE_DIR}/cmake/config.hpp.cmake ${PROJECT_SOURCE_DIR}/source/config.hpp)
+
+include_directories(${PROJECT_SOURCE_DIR}/source)
+
 add_subdirectory(source)
 add_subdirectory(python)
 

README.md

@@ -14,7 +14,7 @@ Official packages are available for Ubuntu derivatives and macOS, but if your ar
 
 ### Official packages
 
-Supplied packages are published using the official Launchpad platform for Ubuntu, and a custom Homebrew tap repository for macOS. Packages simply require all the dependencies, namely: MPFR, Cairo and Python 3.
+Supplied packages are published using the official Launchpad platform for Ubuntu, and a custom Homebrew tap repository for macOS. Packages simply require all the dependencies, namely: MPFR, Cairo, Gnuplot and Python 3.
 
 #### Ubuntu
 
@@ -44,7 +44,7 @@ which in one line both sets up the "tap" for Ariadne and installs the package al
 
 ### Dependencies
 
-If installed from sources, the only required library dependency is MPFR. To enable the graphical output you will require Cairo in order to save into png files. Finally, the Python bindings require the Python headers (version 3 is only supported, since version 2 is discontinued). In particular for Python, there is an internal Git submodule dependency on the header-only [pybind11](https://github.com/pybind/pybind11) library. Therefore in order to build the Python interface, Git must be installed even if Ariadne has been downloaded as an archive. Download of the dependency is automatic though.
+If installed from sources, the only required library dependency is MPFR. To enable the graphical output you will require either Cairo or Gnuplot in order to save into png files. Finally, the Python bindings require the Python headers (version 3 is only supported, since version 2 is discontinued). In particular for Python, there is an internal Git submodule dependency on the header-only [pybind11](https://github.com/pybind/pybind11) library. Therefore in order to build the Python interface, Git must be installed even if Ariadne has been downloaded as an archive. Download of the dependency is automatic though.
 
 Finally, if you want to build the documentation, you need Doxygen and a working Latex distribution (including the Math packages).
 
@@ -54,15 +54,15 @@ Specific instructions for Ubuntu and macOS follow, starting from installation fr
 
 #### Ubuntu
 
-Aptitude packages: `cmake pkg-config git libmpfr-dev libcairo2-dev` and either `clang-11` or `g++-10` for the compiler toolchain.
+Aptitude packages: `cmake pkg-config git libmpfr-dev libcairo2-dev gnuplot` and either `clang-11` or `g++-10` for the compiler toolchain.
 
 Additional package required for the Python interface: `python3-dev`.
 
 Additional packages required for documentation: `doxygen doxygen-latex`
 
 #### macOS
 
-Homebrew packages: `cmake git mpfr cairo` and `gcc@10` if using GCC.
+Homebrew packages: `cmake git mpfr cairo gnuplot` and `gcc@10` if using GCC.
 
 For Cairo support, you may need to set up a permanent variable for the path of pkgconfig by adding the following line in your `~\.bash_profile`:
 

cmake/config.hpp.cmake

@@ -13,5 +13,6 @@
 #cmakedefine ARIADNE_ENABLE_STACK_TRACE
 
 #cmakedefine HAVE_CAIRO_H
+#cmakedefine HAVE_GNUPLOT_H
 
 #endif /* ARIADNE_CONFIG_HPP */

examples/continuous/noisy/noisy-utilities.hpp

@@ -119,7 +119,6 @@ void run_noisy_system(String name, const DottedRealAssignments& dynamics, const
     ThresholdSweeperDP sweeper(DoublePrecision(),sw_threshold);
 
     bool draw = false;
-    DRAWING_METHOD = DrawingMethod::AFFINE;
 
     List<InputApproximation> approximations;
     approximations.append(ZeroApproximation());

examples/hybrid/heating.cpp

@@ -135,9 +135,6 @@ Int main(Int argc, const char* argv[])
 
 
     // Set colours for drawing
-    DRAWING_METHOD = DrawingMethod::AFFINE;
-    DRAWING_ACCURACY += 1;
-
     Colour guard_colour(0.5,0.5,0.5);
     Colour midnight_guard_colour(0.75,0.75,0.75);
     Colour picard_orbit_colour(0.0,1.0,1.0);

experimental/examples/continuous/noisy/noisy-utilities.hpp

@@ -119,7 +119,6 @@ void run_noisy_system(String name, const DottedRealAssignments& dynamics, const
     ThresholdSweeperDP sweeper(DoublePrecision(),sw_threshold);
 
     bool draw = true;
-    DRAWING_METHOD = DrawingMethod::AFFINE;
 
     List<InputApproximation> approximations;
     approximations.append(ZeroApproximation());

python/source/evolution_submodule.cpp

@@ -38,7 +38,7 @@ using namespace Ariadne;
 template<class ORB>
 Void export_orbit(pybind11::module& module, const char* name)
 {
-    pybind11::class_<ORB,pybind11::bases<LabelledDrawableInterface>> orbit_class(module,name);
+    pybind11::class_<ORB,pybind11::bases<LabelledDrawable2dInterface>> orbit_class(module,name);
     orbit_class.def("reach", &ORB::reach);
     orbit_class.def("evolve", &ORB::final);
     orbit_class.def("final", &ORB::final);
@@ -65,10 +65,10 @@ template<> Void export_simulator<VectorFieldSimulator>(pybind11::module& module,
 
     auto const& reference_internal = pybind11::return_value_policy::reference_internal;
 
-    pybind11::class_<LabelledDrawableInterface> labelled_drawable_interface_class(module,"LabelledDrawableInterface");
-    pybind11::class_<LabelledInterpolatedCurve,pybind11::bases<LabelledDrawableInterface>> labelled_interpolated_curve_class(module,"LabelledInterpolatedCurve");
+    pybind11::class_<LabelledDrawable2dInterface> labelled_drawable_interface_class(module,"LabelledDrawable2dInterface");
+    pybind11::class_<LabelledInterpolatedCurve,pybind11::bases<LabelledDrawable2dInterface>> labelled_interpolated_curve_class(module,"LabelledInterpolatedCurve");
 
-    pybind11::class_<OrbitType,pybind11::bases<LabelledDrawableInterface>> simulator_orbit_class(module,"ApproximatePointOrbit");
+    pybind11::class_<OrbitType,pybind11::bases<LabelledDrawable2dInterface>> simulator_orbit_class(module,"ApproximatePointOrbit");
     simulator_orbit_class.def("curve", &OrbitType::curve);
 
     pybind11::class_<VectorFieldSimulator> simulator_class(module,name);
@@ -125,7 +125,7 @@ Void export_vector_field_evolver_configuration(pybind11::module& module) {
 }
 
 Void export_labelled_storage(pybind11::module& module) {
-    pybind11::class_<LabelledStorage,pybind11::bases<LabelledDrawableInterface>> labelled_storage_class(module,"LabelledStorage");
+    pybind11::class_<LabelledStorage,pybind11::bases<LabelledDrawable2dInterface>> labelled_storage_class(module,"LabelledStorage");
 }
 
 template<class RA> Void export_safety_certificate(pybind11::module& module, const char* name) {