Merge branch 'master' of ssh://eodev.git.sourceforge.net/gitroot/eodev/eodev

edo/AUTHORS

@@ -1,4 +1,3 @@
-
 The Evolving Distribution Objects framework (EDO) is a template-based,
 ANSI-C++ evolutionary computation library which helps you to write your
 own estimation of distribution algorithms.

edo/CMakeLists.txt

@@ -1,5 +1,14 @@
+############################################################################
+##########
+### 1) If you want to set your own variables in install.cmake and avoid the cmd line
 ######################################################################################
-### 1) Set the application properties
+
+INCLUDE(install.cmake OPTIONAL)
+
+######################################################################################
+
+######################################################################################
+### 2) Project properties
 ######################################################################################
 
 # Checks cmake version compatibility
@@ -16,15 +25,12 @@ SET(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT
 
 
 ######################################################################################
-### 2) Include useful features
+### 3) Include useful features
 ######################################################################################
 
 INCLUDE(FindDoxygen)
 INCLUDE(FindPkgConfig)
 
-PKG_CHECK_MODULES(EO eo REQUIRED)
-PKG_CHECK_MODULES(MO mo REQUIRED)
-
 FIND_PACKAGE(Boost 1.33.0)
 
 INCLUDE_DIRECTORIES(
@@ -34,11 +40,16 @@ INCLUDE_DIRECTORIES(
   #  /Dev/ometah-0.3/common
   )
 
+LINK_DIRECTORIES(
+  ${EO_LIBRARY_DIRS}
+  ${MO_LIBRARY_DIRS}
+  )
+
 ######################################################################################
 
 
 ######################################################################################
-### 3) Include header files path
+### 4) Include header files path
 ######################################################################################
 
 INCLUDE_DIRECTORIES(
@@ -49,7 +60,7 @@ INCLUDE_DIRECTORIES(
 
 
 ######################################################################################
-### 4) Set compiler definitions
+### 5) Set compiler definitions
 ######################################################################################
 
 IF(UNIX)
@@ -63,7 +74,7 @@ ENDIF()
 
 
 ######################################################################################
-### 5) Prepare some variables for CMAKE usage
+### 6) Prepare some variables for CMAKE usage
 ######################################################################################
 
 SET(SAMPLE_SRCS)
@@ -72,7 +83,7 @@ SET(SAMPLE_SRCS)
 
 
 ######################################################################################
-### 6) Now where we go ?
+### 7) Now where we go ?
 ######################################################################################
 
 ADD_SUBDIRECTORY(src)
@@ -85,7 +96,7 @@ ADD_SUBDIRECTORY(doc)
 
 
 ######################################################################################
-### 7) Create executable, link libraries and prepare target
+### 8) Create executable, link libraries and prepare target
 ######################################################################################
 
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
@@ -99,7 +110,7 @@ INSTALL(TARGETS edo ARCHIVE DESTINATION lib COMPONENT libraries)
 
 
 ######################################################################################
-### 8) Install pkg-config config file for EO
+### 9) Install pkg-config config file for EO
 ######################################################################################
 
 INSTALL(FILES edo.pc DESTINATION lib/pkgconfig COMPONENT headers)
@@ -108,7 +119,7 @@ INSTALL(FILES edo.pc DESTINATION lib/pkgconfig COMPONENT headers)
 
 
 ######################################################################################
-### 9) Include packaging
+### 10) Include packaging
 ######################################################################################
 
 INCLUDE(Packaging.cmake)

edo/COPYING

@@ -1,5 +1,5 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
+		  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
+		       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-                            Preamble
+			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +112,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-                  GNU LESSER GENERAL PUBLIC LICENSE
+		  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-                            NO WARRANTY
+			    NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,9 +455,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
+		     END OF TERMS AND CONDITIONS
 
-           How to Apply These Terms to Your New Libraries
+	   How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
 possible use to the public, we recommend making it free software that

edo/application/common/CMakeLists.txt

@@ -10,6 +10,6 @@ FOREACH(file ${RESOURCES})
   EXECUTE_PROCESS(
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
     ${CMAKE_CURRENT_SOURCE_DIR}/${file}
-    ${DO_BINARY_DIR}/${file}
+    ${EDO_BINARY_DIR}/${file}
     )
 ENDFOREACH(file)

edo/install.cmake-dist

@@ -0,0 +1,20 @@
+# Variables to set
+
+#  directory we need to build project
+SET(EO_DIR "<<PATH_TO_EO>>" CACHE PATH "EO directory" FORCE)
+SET(MO_DIR "<<PATH_TO_MO>>" CACHE PATH "MO directory" FORCE)
+
+# automagically set parameters, do not edit
+
+SET(EO_INCLUDE_DIRS "${EO_DIR}/src" CACHE PATH "EO include directory" FORCE)
+SET(EO_LIBRARY_DIRS "${EO_DIR}/release/lib" CACHE PATH "EO library directory" FORCE)
+SET(EO_LIBRARIES "eoutils eo es ga cma gcov")
+
+SET(MO_INCLUDE_DIRS "${MO_DIR}/src" CACHE PATH "MO include directory" FORCE)
+SET(MO_LIBRARY_DIRS "${MO_DIR}/release/lib" CACHE PATH "MO library directory" FORCE)
+SET(MO_LIBRARIES "mo")
+
+# ... or rather use pkg-config (dont forget to comment the code above)
+
+#PKG_CHECK_MODULES(EO eo REQUIRED)
+#PKG_CHECK_MODULES(MO mo REQUIRED)

edo/src/edo.cpp

@@ -25,4 +25,3 @@ Authors:
 */
 
 #include "edo"
-

edo/src/edoBounderRng.h

@@ -60,4 +60,3 @@ private:
 };
 
 #endif // !_edoBounderRng_h
-

edo/src/edoBounderUniform.h

@@ -39,16 +39,16 @@ public:
 
     void operator()( EOT& sol )
     {
-        unsigned int size = sol.size();
+	unsigned int size = sol.size();
-        assert(size > 0);
+	assert(size > 0);
 
-        for (unsigned int d = 0; d < size; ++d) {
+	for (unsigned int d = 0; d < size; ++d) {
 
-            if ( sol[d] < this->min()[d] || sol[d] > this->max()[d]) {
+	    if ( sol[d] < this->min()[d] || sol[d] > this->max()[d]) {
-                // use EO's global "rng"
+		// use EO's global "rng"
-                sol[d] = rng.uniform( this->min()[d], this->max()[d] );
+		sol[d] = rng.uniform( this->min()[d], this->max()[d] );
-            }
+	    }
-        } // for d in size
+	} // for d in size
     }
 };
 

edo/src/edoEDA.h

@@ -108,7 +108,7 @@ public:
     */
     void operator ()(eoPop< EOT > & pop)
     {
-        assert(pop.size() > 0);
+	assert(pop.size() > 0);
 
 	//double temperature = _initial_temperature;
 

edo/src/edoEDASA.h

@@ -108,7 +108,7 @@ public:
     */
     void operator ()(eoPop< EOT > & pop)
     {
-        assert(pop.size() > 0);
+	assert(pop.size() > 0);
 
 	double temperature = _initial_temperature;