ROUZAUD-CORNABAS Jonathan authored 4 years ago and TURPIN Laurent committed 4 years ago

Naming has changed, so merge was not straighforward, could contain errors.

The name SIMD was meant to specify the Single Instruction Multiple Data implementation i.e. vectorization but it is now the aevol_7 (previously known as parallel_6) version.

Tree/lineage/ancestor stats are working for both vanilla and SIMD (but reproduceability issues between both)

The sole method from Fuzzy_X11 was moved to ae_exp_manager_X11
with an additional Fuzzy& param

And fix mising includes, cleanup.

ae_fuzzy_set has been replaced by the Fuzzy class. But it remained as a
typedef and some references in the files that used it. Hereby removed
all references to ae_fuzzy_set.

I also fixed the corresponding includes and added some mising ones.

The name convention ae_* for aevol-related classes and functions comes
from C language lacking namespaces. It was meant to prevent name
clashes. Since C++ provides namespaces, this commit wraps everything
inside an "aevol" namespace.

This means that there is no need anylonger to name classes according to
ae_*. But any new class needs to be within the aevol namespace if it is
part of aevol or to start with a "using" clause if it relies on aevol.

Updated all the file headers

Modified compilation chain:

  --with-regul changed to --with-raevol
  --without-xlib changed to the (standard) without-x

  lib-aevol was changed to libaevol for a more intuitive use with -laevol.
  Libraries generated with different compilation options are no longer differentiated by postfixes (save for the RAEVOL option) => if --with-raevol is used, the generated lib will be called libraevol (whether X and/or DEBUG are used or not). if --without-raevol (default), the generated lib will be called libaevol.
  make clean is called automatically at the end of ./configure to avoid compatibility issues.

* Organized the repository to manage branches. *
************************************************

Everything you already know has been moved to "trunk"
Added a "branches" directory with 2 subdirectories "releases" and "features"
  * "releases" will be used for branches related to a given release, e.g. when a change to post-treatments are needed for the analysis of data generated using that release.
    For example: I am analysing data that I generated using versions 2.1.2 of the code. I hence created the branch "releases/aevol-2.1.2" so that I can code my post-treatments in a properly versionned way. These development may (depending on the level of specificity) be added to the trunk eventually (using svn merge)
  * "features" is meant to be used when developing a new feature that takes time developing. This will enable us to use svn feature more thouroughly, e.g. commit more often (even "unstable" versions) in a personal branch of the svn.

If you don't want to use branches or if you just want to be able to update regularly, you need not change your habits, just add "/trunk" when you check out
=> "svn checkout svn+ssh://username@svn.gforge.liris.cnrs.fr/svnroot/aevol/trunk"

Questions/remarks are welcome!
David