diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ffe6c4..4014cd9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ #*************************************************************************** # MoRIS (Model of Routes of Invasive Spread) -# Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet +# Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet # Web: https://github.com/charlesrocabert/MoRIS # # This program is free software: you can redistribute it and/or modify @@ -41,7 +41,7 @@ set(PACKAGE "\"MoRIS\"") #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~# set(VERSION_MAJOR 0) set(VERSION_MINOR 9) -set(VERSION_PATCH 6) +set(VERSION_PATCH 7) #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~# @@ -53,7 +53,7 @@ ADD_DEFINITIONS(-std=c++11) #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~# # Set DEBUG and RELEASE flags # #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~# -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -g -pg -Wall -Wextra -pedantic") +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -g -Wall -Wextra -pedantic") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -O3 -Wall -Wextra -pedantic") @@ -75,9 +75,6 @@ set(EXECUTABLE_OUTPUT_PATH ../build/bin) set(RUN_EXECUTABLE MoRIS_run) add_executable(${RUN_EXECUTABLE} src/MoRIS_run.cpp) -#set(GENERATE_ARTIFICIAL_DATA_EXECUTABLE MoRIS_artificial_data) -#add_executable(${GENERATE_ARTIFICIAL_DATA_EXECUTABLE} src/MoRIS_artificial_data.cpp) - #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~# # Find and link external libraries # @@ -86,7 +83,6 @@ find_package(GSL REQUIRED) if(GSL_FOUND) include_directories(${GSL_INCLUDE_DIR}) target_link_libraries(${RUN_EXECUTABLE} ${GSL_LIBRARIES}) - #target_link_libraries(${GENERATE_ARTIFICIAL_DATA_EXECUTABLE} ${GSL_LIBRARIES}) endif(GSL_FOUND) diff --git a/README.md b/README.md index 1b7a12d..07d1b33 100644 --- a/README.md +++ b/README.md @@ -218,7 +218,7 @@ To determine the HMD parameters explaining at best a given experimental dataset, A tutorial to build MoRIS input files is available here. ## Copyright -Copyright © 2014-2020 Charles Rocabert, Jérôme M.W Gippet, Serge Fenet. All rights reserved. +Copyright © 2014-2021 Charles Rocabert, Jérôme M.W Gippet, Serge Fenet. All rights reserved. ## License This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/cmake/make.sh b/cmake/make.sh index d38dc82..d6d0a06 100644 --- a/cmake/make.sh +++ b/cmake/make.sh @@ -3,7 +3,7 @@ #*************************************************************************** # MoRIS (Model of Routes of Invasive Spread) -# Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet +# Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet # Web: https://github.com/charlesrocabert/MoRIS # # This program is free software: you can redistribute it and/or modify diff --git a/cmake/make_clean.sh b/cmake/make_clean.sh index bfecbcf..b96d3a5 100644 --- a/cmake/make_clean.sh +++ b/cmake/make_clean.sh @@ -3,7 +3,7 @@ #*************************************************************************** # MoRIS (Model of Routes of Invasive Spread) -# Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet +# Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet # Web: https://github.com/charlesrocabert/MoRIS # # This program is free software: you can redistribute it and/or modify diff --git a/cmake/make_debug.sh b/cmake/make_debug.sh index 5c5f23b..a814640 100644 --- a/cmake/make_debug.sh +++ b/cmake/make_debug.sh @@ -3,7 +3,7 @@ #*************************************************************************** # MoRIS (Model of Routes of Invasive Spread) -# Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet +# Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet # Web: https://github.com/charlesrocabert/MoRIS # # This program is free software: you can redistribute it and/or modify diff --git a/cmake/modules/Config.h.in b/cmake/modules/Config.h.in index 577e9d0..df10611 100644 --- a/cmake/modules/Config.h.in +++ b/cmake/modules/Config.h.in @@ -3,14 +3,14 @@ * \file Config.h * \author Charles Rocabert, Jérôme Gippet, Serge Fenet * \date 16-11-2015 - * \copyright MoRIS. Copyright © 2014-2020 Charles Rocabert, Jérôme Gippet, Serge Fenet. All rights reserved + * \copyright MoRIS. Copyright © 2014-2021 Charles Rocabert, Jérôme Gippet, Serge Fenet. All rights reserved * \license This project is released under the GNU General Public License * \brief Definition of CMake configuration parameters */ /************************************************************************ * MoRIS (Model of Routes of Invasive Spread) - * Copyright © 2014-2020 Charles Rocabert, Jérôme Gippet, Serge Fenet + * Copyright © 2014-2021 Charles Rocabert, Jérôme Gippet, Serge Fenet * Web: https://github.com/charlesrocabert/MoRIS * * This program is free software: you can redistribute it and/or modify diff --git a/examples/parameters.txt b/examples/parameters.txt index f7b2f03..138f456 100644 --- a/examples/parameters.txt +++ b/examples/parameters.txt @@ -1,7 +1,7 @@ /*************************************************************************** / MoRIS (Model of Routes of Invasive Spread) -/ Copyright © 2014-2019 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet +/ Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet / Web: https://github.com/charlesrocabert/MoRIS / / This program is free software: you can redistribute it and/or modify diff --git a/examples/rscripts/plot_single_simulation.R b/examples/rscripts/plot_single_simulation.R index 713ab5f..95c401d 100644 --- a/examples/rscripts/plot_single_simulation.R +++ b/examples/rscripts/plot_single_simulation.R @@ -87,9 +87,8 @@ plot_nb_jumps <- function( filename ) args = commandArgs(trailingOnly=TRUE) setwd(args[1]) print(args[1]) -#setwd("/Users/charlesrocabert/git/MoRIS/example") -p1 = plot_invasion_map("./output/final_state.txt", "Invasion geographical pattern", 59891.22, 31742.16) +p1 = plot_invasion_map("./output/final_state.txt", "Invasion geographical pattern", as.numeric(args[2]), as.numeric(args[3])) p2 = plot_jump_size_distribution("./output/lineage_tree.txt") p3 = plot_nb_jumps("./output/lineage_tree.txt") p = plot_grid(p1, plot_grid(p2, p3, ncol=1), ncol=2) diff --git a/examples/run_single_simulation.sh b/examples/run_single_simulation.sh index d118319..afd1564 100644 --- a/examples/run_single_simulation.sh +++ b/examples/run_single_simulation.sh @@ -10,8 +10,8 @@ -optimfunc LOG_LIKELIHOOD \ -humanactivity YES \ -wmin 0.0 \ --xintro 59891.22 \ --yintro 31742.16 \ +-xintro 44000 \ +-yintro 42000 \ -pintro 1.0 \ -lambda 23.13390 \ -mu 6.4951562 \ @@ -25,4 +25,4 @@ -w6 0.0 \ -save-outputs -Rscript ./rscripts/plot_single_simulation.R $(pwd) +Rscript ./rscripts/plot_single_simulation.R $(pwd) 44000 42000 diff --git a/src/MoRIS_optimize.py b/src/MoRIS_optimize.py index 4b9aa97..63d87c2 100644 --- a/src/MoRIS_optimize.py +++ b/src/MoRIS_optimize.py @@ -3,7 +3,7 @@ #*************************************************************************** # MoRIS (Model of Routes of Invasive Spread) -# Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet +# Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet # Web: https://github.com/charlesrocabert/MoRIS # # This program is free software: you can redistribute it and/or modify @@ -831,7 +831,7 @@ def printHelp(): print(" * MoRIS Optimize * ") print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~") print(" MoRIS (Model of Routes of Invasive Spread) ") - print(" Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet ") + print(" Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet ") print(" Web: https://github.com/charlesrocabert/MoRIS ") print(" ") print(" This program comes with ABSOLUTELY NO WARRANTY. ") @@ -851,7 +851,7 @@ def printHeader(): print(" * MoRIS Optimize * ") print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~") print(" MoRIS (Model of Routes of Invasive Spread) ") - print(" Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet ") + print(" Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet ") print(" Web: https://github.com/charlesrocabert/MoRIS ") print(" ") print(" This program comes with ABSOLUTELY NO WARRANTY. ") diff --git a/src/MoRIS_run.cpp b/src/MoRIS_run.cpp index 3b3313f..ce4f069 100644 --- a/src/MoRIS_run.cpp +++ b/src/MoRIS_run.cpp @@ -2,14 +2,14 @@ * \file MoRIS_run.cpp * \author Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * \date 15-12-2014 - * \copyright MoRIS. Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved + * \copyright MoRIS. Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved * \license This project is released under the GNU General Public License * \brief MoRIS_run executable */ /**************************************************************************** * MoRIS (Model of Routes of Invasive Spread) - * Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet + * Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * Web: https://github.com/charlesrocabert/MoRIS * * This program is free software: you can redistribute it and/or modify @@ -573,7 +573,7 @@ void printUsage( void ) std::cout << " " << PACKAGE << " " << VERSION_MAJOR << "." << VERSION_MINOR << "." << VERSION_PATCH << " ( release )\n"; #endif std::cout << " MoRIS (Model of Routes of Invasive Spread) \n"; - std::cout << " Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet \n"; + std::cout << " Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet \n"; std::cout << " Web: https://github.com/charlesrocabert/MoRIS \n"; std::cout << " \n"; std::cout << " This program comes with ABSOLUTELY NO WARRANTY. \n"; diff --git a/src/lib/Enums.h b/src/lib/Enums.h index 7dca59c..262666f 100644 --- a/src/lib/Enums.h +++ b/src/lib/Enums.h @@ -2,14 +2,14 @@ * \file Enums.h * \author Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * \date 15-12-2014 - * \copyright MoRIS. Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved + * \copyright MoRIS. Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved * \license This project is released under the GNU General Public License * \brief Definition of enumerations */ /**************************************************************************** * MoRIS (Model of Routes of Invasive Spread) - * Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet + * Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * Web: https://github.com/charlesrocabert/MoRIS * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/Graph.cpp b/src/lib/Graph.cpp index f2430ec..e8e0b3c 100644 --- a/src/lib/Graph.cpp +++ b/src/lib/Graph.cpp @@ -2,14 +2,14 @@ * \file Graph.cpp * \author Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * \date 16-12-2014 - * \copyright MoRIS. Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved + * \copyright MoRIS. Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved * \license This project is released under the GNU General Public License * \brief Graph class definition */ /**************************************************************************** * MoRIS (Model of Routes of Invasive Spread) - * Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet + * Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * Web: https://github.com/charlesrocabert/MoRIS * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/Graph.h b/src/lib/Graph.h index 6ad4b50..52e2c12 100644 --- a/src/lib/Graph.h +++ b/src/lib/Graph.h @@ -2,14 +2,14 @@ * \file Graph.h * \author Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * \date 16-12-2014 - * \copyright MoRIS. Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved + * \copyright MoRIS. Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved * \license This project is released under the GNU General Public License * \brief Graph class declaration */ /**************************************************************************** * MoRIS (Model of Routes of Invasive Spread) - * Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet + * Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * Web: https://github.com/charlesrocabert/MoRIS * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/Node.cpp b/src/lib/Node.cpp index 2110026..2f2e388 100644 --- a/src/lib/Node.cpp +++ b/src/lib/Node.cpp @@ -2,14 +2,14 @@ * \file Node.cpp * \author Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * \date 16-12-2014 - * \copyright MoRIS. Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved + * \copyright MoRIS. Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved * \license This project is released under the GNU General Public License * \brief Node class definition */ /**************************************************************************** * MoRIS (Model of Routes of Invasive Spread) - * Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet + * Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * Web: https://github.com/charlesrocabert/MoRIS * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/Node.h b/src/lib/Node.h index 1f07dfc..b14ea02 100644 --- a/src/lib/Node.h +++ b/src/lib/Node.h @@ -2,14 +2,14 @@ * \file Node.h * \author Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * \date 16-12-2014 - * \copyright MoRIS. Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved + * \copyright MoRIS. Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved * \license This project is released under the GNU General Public License * \brief Node class declaration */ /**************************************************************************** * MoRIS (Model of Routes of Invasive Spread) - * Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet + * Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * Web: https://github.com/charlesrocabert/MoRIS * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/Parameters.cpp b/src/lib/Parameters.cpp index 34d07b9..cfb3908 100644 --- a/src/lib/Parameters.cpp +++ b/src/lib/Parameters.cpp @@ -2,14 +2,14 @@ * \file Parameters.cpp * \author Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * \date 15-12-2014 - * \copyright MoRIS. Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved + * \copyright MoRIS. Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved * \license This project is released under the GNU General Public License * \brief Parameters class definition */ /**************************************************************************** * MoRIS (Model of Routes of Invasive Spread) - * Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet + * Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * Web: https://github.com/charlesrocabert/MoRIS * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/Parameters.h b/src/lib/Parameters.h index 1e9c8de..b456e04 100644 --- a/src/lib/Parameters.h +++ b/src/lib/Parameters.h @@ -2,14 +2,14 @@ * \file Parameters.h * \author Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * \date 15-12-2014 - * \copyright MoRIS. Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved + * \copyright MoRIS. Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved * \license This project is released under the GNU General Public License * \brief Parameters class declaration */ /**************************************************************************** * MoRIS (Model of Routes of Invasive Spread) - * Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet + * Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * Web: https://github.com/charlesrocabert/MoRIS * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/Prng.cpp b/src/lib/Prng.cpp index 6a8701d..b8026a8 100644 --- a/src/lib/Prng.cpp +++ b/src/lib/Prng.cpp @@ -2,14 +2,14 @@ * \file Prng.cpp * \author Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * \date 07-12-2014 - * \copyright MoRIS. Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved + * \copyright MoRIS. Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved * \license This project is released under the GNU General Public License * \brief Prng class definition */ /**************************************************************************** * MoRIS (Model of Routes of Invasive Spread) - * Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet + * Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * Web: https://github.com/charlesrocabert/MoRIS * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/Prng.h b/src/lib/Prng.h index 3f87b90..3b8bd74 100644 --- a/src/lib/Prng.h +++ b/src/lib/Prng.h @@ -2,14 +2,14 @@ * \file Prng.h * \author Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * \date 07-12-2014 - * \copyright MoRIS. Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved + * \copyright MoRIS. Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved * \license This project is released under the GNU General Public License * \brief Prng class declaration */ /**************************************************************************** * MoRIS (Model of Routes of Invasive Spread) - * Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet + * Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * Web: https://github.com/charlesrocabert/MoRIS * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/Simulation.cpp b/src/lib/Simulation.cpp index 1b0b997..59ea0bc 100644 --- a/src/lib/Simulation.cpp +++ b/src/lib/Simulation.cpp @@ -2,14 +2,14 @@ * \file Simulation.cpp * \author Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * \date 16-12-2014 - * \copyright MoRIS. Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved + * \copyright MoRIS. Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved * \license This project is released under the GNU General Public License * \brief Simulation class definition */ /**************************************************************************** * MoRIS (Model of Routes of Invasive Spread) - * Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet + * Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * Web: https://github.com/charlesrocabert/MoRIS * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/Simulation.h b/src/lib/Simulation.h index 109b86a..0172c85 100644 --- a/src/lib/Simulation.h +++ b/src/lib/Simulation.h @@ -2,14 +2,14 @@ * \file Simulation.h * \author Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * \date 16-12-2014 - * \copyright MoRIS. Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved + * \copyright MoRIS. Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet. All rights reserved * \license This project is released under the GNU General Public License * \brief Simulation class declaration */ /**************************************************************************** * MoRIS (Model of Routes of Invasive Spread) - * Copyright © 2014-2020 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet + * Copyright © 2014-2021 Charles Rocabert, Jérôme M.W. Gippet, Serge Fenet * Web: https://github.com/charlesrocabert/MoRIS * * This program is free software: you can redistribute it and/or modify