From 4e4b713d4442c786077d628033b32337a811864f Mon Sep 17 00:00:00 2001 From: wcancino Date: Tue, 17 Mar 2009 09:36:28 +0000 Subject: [PATCH] Changes for the serial version git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1554 331e1502-861f-0410-8da2-ba01fb791d7f --- .../PhyloMOEA/PhyloMOEA-serial/PhyloMOEA/CMakeLists.txt | 2 +- .../branches/PhyloMOEA/PhyloMOEA-serial/PhyloMOEA/moeoNSGAII2.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contribution/branches/PhyloMOEA/PhyloMOEA-serial/PhyloMOEA/CMakeLists.txt b/contribution/branches/PhyloMOEA/PhyloMOEA-serial/PhyloMOEA/CMakeLists.txt index 76a67b67b..298586c70 100644 --- a/contribution/branches/PhyloMOEA/PhyloMOEA-serial/PhyloMOEA/CMakeLists.txt +++ b/contribution/branches/PhyloMOEA/PhyloMOEA-serial/PhyloMOEA/CMakeLists.txt @@ -30,7 +30,7 @@ SET( PHYLOMOEA_SOURCES eigensolver.cpp treeIterator.cpp utils.cpp ) -ADD_EXECUTABLE( PhyloMOEA ${PHYLOMOEA_SOURCES} ) +ADD_EXECUTABLE( PhyloMOEA-serial ${PHYLOMOEA_SOURCES} ) TARGET_LINK_LIBRARIES(PhyloMOEA gsl gslcblas GTL eo eoutils ga moeo cma) diff --git a/contribution/branches/PhyloMOEA/PhyloMOEA-serial/PhyloMOEA/moeoNSGAII2.h b/contribution/branches/PhyloMOEA/PhyloMOEA-serial/PhyloMOEA/moeoNSGAII2.h index 06b00d732..0ca267d5e 100644 --- a/contribution/branches/PhyloMOEA/PhyloMOEA-serial/PhyloMOEA/moeoNSGAII2.h +++ b/contribution/branches/PhyloMOEA/PhyloMOEA-serial/PhyloMOEA/moeoNSGAII2.h @@ -201,7 +201,7 @@ protected: /** fitness assignment used in NSGA */ moeoDominanceDepthFitnessAssignment < MOEOT > fitnessAssignment; /** diversity assignment used in NSGA-II */ - moeoFrontByFrontCrowdingDiversityAssignment2 < MOEOT > diversityAssignment; + moeoFrontByFrontCrowdingDiversityAssignment < MOEOT > diversityAssignment; /** elitist replacement */ moeoElitistReplacement < MOEOT > replace;