Loading CMakeLists.txt +7 −5 Original line number Diff line number Diff line Loading @@ -35,7 +35,7 @@ ELSE(NO_DEP_CHECK) # library implements. # In other words, the library implements all the interface numbers in the # range from number current - age to current. SET(${PROJECT_NAME}_VERSION_CURRENT "7") SET(${PROJECT_NAME}_VERSION_CURRENT "8") SET(${PROJECT_NAME}_VERSION_REVISION "0") SET(${PROJECT_NAME}_VERSION_AGE "0") Loading @@ -53,7 +53,7 @@ if (CMAKE_INSTALL_PREFIX) endif (CMAKE_INSTALL_PREFIX) include (GNUInstallDirs) find_package (bpp-seq 11.0.0 REQUIRED) find_package (bpp-seq 12.0.0 REQUIRED) # CMake package set (cmake-package-location ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) Loading Loading @@ -95,10 +95,10 @@ ENDIF(NO_DEP_CHECK) # Packager SET(CPACK_PACKAGE_NAME "libbpp-popgen") SET(CPACK_PACKAGE_VENDOR "Bio++ Development Team") SET(CPACK_PACKAGE_VERSION "2.3.1") SET(CPACK_PACKAGE_VERSION "2.4.0") SET(CPACK_PACKAGE_VERSION_MAJOR "2") SET(CPACK_PACKAGE_VERSION_MINOR "3") SET(CPACK_PACKAGE_VERSION_PATCH "1") SET(CPACK_PACKAGE_VERSION_MINOR "4") SET(CPACK_PACKAGE_VERSION_PATCH "0") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The Bio++ Population Genetics library") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.txt") SET(CPACK_RESOURCE_FILE_AUTHORS "${CMAKE_SOURCE_DIR}/AUTHORS.txt") Loading @@ -107,6 +107,8 @@ SET(CPACK_SOURCE_GENERATOR "TGZ") # /!\ This assumes that an external build is used SET(CPACK_SOURCE_IGNORE_FILES "/build/" "/html/" "/PopGen.tag" "/\\\\.git/" "/\\\\.gitignore" ${CPACK_SOURCE_IGNORE_FILES} Loading ChangeLog +5 −0 Original line number Diff line number Diff line 26/02/18 -*- Version 2.4.0 -*- 25/02/18 Julien Dutheil * Removed all dynamic exception specification (gcc 7) 24/11/17 Julien Dutheil * Fixed error in tajima83. Loading Doxyfile +1 −1 Original line number Diff line number Diff line Loading @@ -38,7 +38,7 @@ PROJECT_NAME = bpp-popgen # could be handy for archiving the generated documentation or if some version # control system is used. PROJECT_NUMBER = 2.3.0 PROJECT_NUMBER = 2.4.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a Loading bpp-popgen.spec +26 −26 Original line number Diff line number Diff line %define _basename bpp-popgen %define _version 2.3.1 %define _release 1 %define _prefix /usr URL: http://biopp.univ-montp2.fr/ URL: https://github.com/BioPP/bpp-seq Name: %{_basename} Version: %{_version} Release: %{_release} Name: bpp-popgen Version: 2.4.0 Release: 1%{?dist} License: CECILL-2.0 Vendor: The Bio++ Project Source: http://biopp.univ-montp2.fr/repos/sources/%{_basename}-%{_version}.tar.gz Source: %{name}-%{version}.tar.gz Summary: Bio++ Population Genetics library Group: Development/Libraries/C and C++ Requires: bpp-core = %{_version} Requires: bpp-seq = %{_version} Requires: bpp-core = %{version} Requires: bpp-seq = %{version} BuildRoot: %{_builddir}/%{_basename}-root BuildRoot: %{_builddir}/%{name}-root BuildRequires: cmake >= 2.8.11 BuildRequires: gcc-c++ >= 4.7.0 BuildRequires: libbpp-core3 = %{_version} BuildRequires: libbpp-core-devel = %{_version} BuildRequires: libbpp-seq11 = %{_version} BuildRequires: libbpp-seq-devel = %{_version} BuildRequires: libbpp-core4 = %{version} BuildRequires: libbpp-core-devel = %{version} BuildRequires: libbpp-seq12 = %{version} BuildRequires: libbpp-seq-devel = %{version} AutoReq: yes AutoProv: yes Loading @@ -31,26 +28,26 @@ AutoProv: yes This library contains utilitary and classes for population genetics analysis. It is part of the Bio++ project. %package -n libbpp-popgen7 %package -n libbpp-popgen8 Summary: Bio++ Population Genetics library Group: Development/Libraries/C and C++ %description -n libbpp-popgen7 %description -n libbpp-popgen8 This library contains utilitary and classes for population genetics and molecular evolution analysis. It is part of the Bio++ project. %package -n libbpp-popgen-devel Summary: Libraries, includes to develop applications with %{_basename} Group: Development/Libraries/C and C++ Requires: libbpp-popgen7 = %{_version} Requires: libbpp-seq11 = %{_version} Requires: libbpp-seq-devel = %{_version} Requires: libbpp-core3 = %{_version} Requires: libbpp-core-devel = %{_version} Requires: libbpp-popgen8 = %{version} Requires: libbpp-seq12 = %{version} Requires: libbpp-seq-devel = %{version} Requires: libbpp-core4 = %{version} Requires: libbpp-core-devel = %{version} %description -n libbpp-popgen-devel The libbpp-popgen-devel package contains the header files and static libraries for building applications which use %{_basename}. building applications which use %{name}. %prep %setup -q Loading @@ -67,11 +64,11 @@ make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf $RPM_BUILD_ROOT %post -n libbpp-popgen7 -p /sbin/ldconfig %post -n libbpp-popgen8 -p /sbin/ldconfig %postun -n libbpp-popgen7 -p /sbin/ldconfig %postun -n libbpp-popgen8 -p /sbin/ldconfig %files -n libbpp-popgen7 %files -n libbpp-popgen8 %defattr(-,root,root) %doc AUTHORS.txt COPYING.txt INSTALL.txt ChangeLog %{_prefix}/%{_lib}/lib*.so.* Loading @@ -87,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/include/* %changelog * Mon Mar 12 2018 Julien Dutheil <julien.dutheil@univ-montp2.fr> 2.4.0-1 - Remove deprecated dynamic exception specifications - Increased interface number * Tue Jun 06 2017 Julien Dutheil <julien.dutheil@univ-montp2.fr> 2.3.1-1 - Increased interface number * Wed May 10 2017 Julien Dutheil <julien.dutheil@univ-montp2.fr> 2.3.0-1 Loading src/Bpp/PopGen/BiAlleleMonolocusGenotype.cpp +1 −1 Original line number Diff line number Diff line Loading @@ -52,7 +52,7 @@ BiAlleleMonolocusGenotype::BiAlleleMonolocusGenotype( allele_index_[1] = second_allele_index; } BiAlleleMonolocusGenotype::BiAlleleMonolocusGenotype(std::vector<size_t> allele_index) throw (BadSizeException) : allele_index_(vector<size_t>(2)) BiAlleleMonolocusGenotype::BiAlleleMonolocusGenotype(std::vector<size_t> allele_index) : allele_index_(vector<size_t>(2)) { if (allele_index.size() != 2) throw BadSizeException("BiAlleleMonolocusGenotype::BiAlleleMonolocusGenotype: allele_index must contain two values.", allele_index.size(), 2); Loading Loading
CMakeLists.txt +7 −5 Original line number Diff line number Diff line Loading @@ -35,7 +35,7 @@ ELSE(NO_DEP_CHECK) # library implements. # In other words, the library implements all the interface numbers in the # range from number current - age to current. SET(${PROJECT_NAME}_VERSION_CURRENT "7") SET(${PROJECT_NAME}_VERSION_CURRENT "8") SET(${PROJECT_NAME}_VERSION_REVISION "0") SET(${PROJECT_NAME}_VERSION_AGE "0") Loading @@ -53,7 +53,7 @@ if (CMAKE_INSTALL_PREFIX) endif (CMAKE_INSTALL_PREFIX) include (GNUInstallDirs) find_package (bpp-seq 11.0.0 REQUIRED) find_package (bpp-seq 12.0.0 REQUIRED) # CMake package set (cmake-package-location ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) Loading Loading @@ -95,10 +95,10 @@ ENDIF(NO_DEP_CHECK) # Packager SET(CPACK_PACKAGE_NAME "libbpp-popgen") SET(CPACK_PACKAGE_VENDOR "Bio++ Development Team") SET(CPACK_PACKAGE_VERSION "2.3.1") SET(CPACK_PACKAGE_VERSION "2.4.0") SET(CPACK_PACKAGE_VERSION_MAJOR "2") SET(CPACK_PACKAGE_VERSION_MINOR "3") SET(CPACK_PACKAGE_VERSION_PATCH "1") SET(CPACK_PACKAGE_VERSION_MINOR "4") SET(CPACK_PACKAGE_VERSION_PATCH "0") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The Bio++ Population Genetics library") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.txt") SET(CPACK_RESOURCE_FILE_AUTHORS "${CMAKE_SOURCE_DIR}/AUTHORS.txt") Loading @@ -107,6 +107,8 @@ SET(CPACK_SOURCE_GENERATOR "TGZ") # /!\ This assumes that an external build is used SET(CPACK_SOURCE_IGNORE_FILES "/build/" "/html/" "/PopGen.tag" "/\\\\.git/" "/\\\\.gitignore" ${CPACK_SOURCE_IGNORE_FILES} Loading
ChangeLog +5 −0 Original line number Diff line number Diff line 26/02/18 -*- Version 2.4.0 -*- 25/02/18 Julien Dutheil * Removed all dynamic exception specification (gcc 7) 24/11/17 Julien Dutheil * Fixed error in tajima83. Loading
Doxyfile +1 −1 Original line number Diff line number Diff line Loading @@ -38,7 +38,7 @@ PROJECT_NAME = bpp-popgen # could be handy for archiving the generated documentation or if some version # control system is used. PROJECT_NUMBER = 2.3.0 PROJECT_NUMBER = 2.4.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a Loading
bpp-popgen.spec +26 −26 Original line number Diff line number Diff line %define _basename bpp-popgen %define _version 2.3.1 %define _release 1 %define _prefix /usr URL: http://biopp.univ-montp2.fr/ URL: https://github.com/BioPP/bpp-seq Name: %{_basename} Version: %{_version} Release: %{_release} Name: bpp-popgen Version: 2.4.0 Release: 1%{?dist} License: CECILL-2.0 Vendor: The Bio++ Project Source: http://biopp.univ-montp2.fr/repos/sources/%{_basename}-%{_version}.tar.gz Source: %{name}-%{version}.tar.gz Summary: Bio++ Population Genetics library Group: Development/Libraries/C and C++ Requires: bpp-core = %{_version} Requires: bpp-seq = %{_version} Requires: bpp-core = %{version} Requires: bpp-seq = %{version} BuildRoot: %{_builddir}/%{_basename}-root BuildRoot: %{_builddir}/%{name}-root BuildRequires: cmake >= 2.8.11 BuildRequires: gcc-c++ >= 4.7.0 BuildRequires: libbpp-core3 = %{_version} BuildRequires: libbpp-core-devel = %{_version} BuildRequires: libbpp-seq11 = %{_version} BuildRequires: libbpp-seq-devel = %{_version} BuildRequires: libbpp-core4 = %{version} BuildRequires: libbpp-core-devel = %{version} BuildRequires: libbpp-seq12 = %{version} BuildRequires: libbpp-seq-devel = %{version} AutoReq: yes AutoProv: yes Loading @@ -31,26 +28,26 @@ AutoProv: yes This library contains utilitary and classes for population genetics analysis. It is part of the Bio++ project. %package -n libbpp-popgen7 %package -n libbpp-popgen8 Summary: Bio++ Population Genetics library Group: Development/Libraries/C and C++ %description -n libbpp-popgen7 %description -n libbpp-popgen8 This library contains utilitary and classes for population genetics and molecular evolution analysis. It is part of the Bio++ project. %package -n libbpp-popgen-devel Summary: Libraries, includes to develop applications with %{_basename} Group: Development/Libraries/C and C++ Requires: libbpp-popgen7 = %{_version} Requires: libbpp-seq11 = %{_version} Requires: libbpp-seq-devel = %{_version} Requires: libbpp-core3 = %{_version} Requires: libbpp-core-devel = %{_version} Requires: libbpp-popgen8 = %{version} Requires: libbpp-seq12 = %{version} Requires: libbpp-seq-devel = %{version} Requires: libbpp-core4 = %{version} Requires: libbpp-core-devel = %{version} %description -n libbpp-popgen-devel The libbpp-popgen-devel package contains the header files and static libraries for building applications which use %{_basename}. building applications which use %{name}. %prep %setup -q Loading @@ -67,11 +64,11 @@ make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf $RPM_BUILD_ROOT %post -n libbpp-popgen7 -p /sbin/ldconfig %post -n libbpp-popgen8 -p /sbin/ldconfig %postun -n libbpp-popgen7 -p /sbin/ldconfig %postun -n libbpp-popgen8 -p /sbin/ldconfig %files -n libbpp-popgen7 %files -n libbpp-popgen8 %defattr(-,root,root) %doc AUTHORS.txt COPYING.txt INSTALL.txt ChangeLog %{_prefix}/%{_lib}/lib*.so.* Loading @@ -87,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/include/* %changelog * Mon Mar 12 2018 Julien Dutheil <julien.dutheil@univ-montp2.fr> 2.4.0-1 - Remove deprecated dynamic exception specifications - Increased interface number * Tue Jun 06 2017 Julien Dutheil <julien.dutheil@univ-montp2.fr> 2.3.1-1 - Increased interface number * Wed May 10 2017 Julien Dutheil <julien.dutheil@univ-montp2.fr> 2.3.0-1 Loading
src/Bpp/PopGen/BiAlleleMonolocusGenotype.cpp +1 −1 Original line number Diff line number Diff line Loading @@ -52,7 +52,7 @@ BiAlleleMonolocusGenotype::BiAlleleMonolocusGenotype( allele_index_[1] = second_allele_index; } BiAlleleMonolocusGenotype::BiAlleleMonolocusGenotype(std::vector<size_t> allele_index) throw (BadSizeException) : allele_index_(vector<size_t>(2)) BiAlleleMonolocusGenotype::BiAlleleMonolocusGenotype(std::vector<size_t> allele_index) : allele_index_(vector<size_t>(2)) { if (allele_index.size() != 2) throw BadSizeException("BiAlleleMonolocusGenotype::BiAlleleMonolocusGenotype: allele_index must contain two values.", allele_index.size(), 2); Loading