Added CEC2005Functions

Added the CEC2005 benchmark to be dynamically called
Added BLX-A
Modified NdimFunctionRandomInitializer and Mutation

OsgiliathFunctionsProblems/.classpath

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="bin/"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>

OsgiliathFunctionsProblems/META-INF/MANIFEST.MF

@@ -14,5 +14,16 @@ Import-Package: es.ugr.osgiliath,
  es.ugr.osgiliath.evolutionary.individual.comparators,
  es.ugr.osgiliath.problem,
  es.ugr.osgiliath.utils,
+ org.osgi.framework;version="1.7.0",
  org.osgi.service.component;version="1.1.0"
-Service-Component: OSGI-INF/FitnessCalculator.xml, OSGI-INF/Initializer.xml, OSGI-INF/Mutator.xml, OSGI-INF/EvolutionaryParameters.xml, OSGI-INF/ProblemParameters.xml, OSGI-INF/Problem.xml
+Service-Component: OSGI-INF/FitnessCalculator.xml, OSGI-INF/Initializer.xml, OSGI-INF/Mutation.xml,
+ OSGI-INF/Crossover.xml
+Bundle-ClassPath: .,
+ src/cec05/,
+ src/,
+ cec05,
+ bin/
+Export-Package: 
+ es.ugr.osgiliath.problem.mofunctions,
+ es.ugr.osgiliath.problem.ndimfunctions,
+ es.ugr.osgiliath.problem.ndimfunctions.evolutionary.implementations

OsgiliathFunctionsProblems/OSGI-INF/FitnessCalculator.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="true" immediate="true" modified="modified" name="OsgiliathFunctionsProblemsFitnessCalculator">
-   <implementation class="es.ugr.osgiliath.problem.ndimfunctions.evolutionary.implementations.GriewankFitnessCalculator"/>
+   <implementation class="es.ugr.osgiliath.problem.ndimfunctions.evolutionary.implementations.CEC2005FitnessCalculator"/>
    <service>
       <provide interface="es.ugr.osgiliath.evolutionary.elements.FitnessCalculator"/>
    </service>
-   <reference bind="setProblem" cardinality="1..1" interface="es.ugr.osgiliath.problem.Problem" name="Problem" policy="static" unbind="unsetProblem"/>
    <property name="calculatorType" type="String" value="daiwal"/>
    <property name="remoteService" type="String" value="true"/>
+   <reference bind="setAlgorithmParameters" cardinality="1..1" interface="es.ugr.osgiliath.algorithms.AlgorithmParameters" name="AlgorithmParameters" policy="static" unbind="unsetAlgorithmParameters"/>
    <property name="service.pid" type="String" value="pollas"/>
    <!--<property name="service.exported.interfaces" type="String" value="*"/>
    <property name="service.exported.configs" type="String" value="ecf.generic.server"/>

OsgiliathFunctionsProblems/OSGI-INF/Initializer.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="OsgiliathFunctionsProblemsInitializer">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" immediate="true" name="OsgiliathFunctionsProblemsInitializer">
    <implementation class="es.ugr.osgiliath.problem.ndimfunctions.evolutionary.implementations.NdimFunctionRandomInitializer"/>
    <service>
       <provide interface="es.ugr.osgiliath.evolutionary.individual.Initializer"/>
    </service>
-   <reference bind="setProblem" cardinality="1..1" interface="es.ugr.osgiliath.problem.Problem" name="Problem" policy="static" unbind="unsetProblem"/>
-   <reference bind="setFitnessCalculator" cardinality="1..1" interface="es.ugr.osgiliath.evolutionary.elements.FitnessCalculator" name="FitnessCalculator" policy="static" target="(calculatorType=distributed)" unbind="unsetFitnessCalculator"/>
+   <reference bind="setFitnessCalculator" cardinality="1..1" interface="es.ugr.osgiliath.evolutionary.elements.FitnessCalculator" name="FitnessCalculator" policy="static" unbind="unsetFitnessCalculator"/>
+   <reference bind="setAlgorithmParameters" cardinality="1..1" interface="es.ugr.osgiliath.algorithms.AlgorithmParameters" name="AlgorithmParameters" policy="static" unbind="unsetAlgorithmParameters"/>
+   <property name="name" type="String" value="ndimfunctioninitializer"/>
 </scr:component>

OsgiliathFunctionsProblems/OSGI-INF/Mutation.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="OsgiliathFunctionsProblemsMutator">
-   <implementation class="es.ugr.osgiliath.problem.ndimfunctions.evolutionary.implementations.NdimFunctionRandomMutator"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="Mutation">
+   <implementation class="es.ugr.osgiliath.problem.ndimfunctions.evolutionary.implementations.NdimFunctionRandomMutation"/>
+   <reference bind="setAlgorithmParameters" cardinality="1..1" interface="es.ugr.osgiliath.algorithms.AlgorithmParameters" name="AlgorithmParameters" policy="static" unbind="unsetAlgorithmParameters"/>
    <service>
-      <provide interface="es.ugr.osgiliath.evolutionary.elements.Mutator"/>
+      <provide interface="es.ugr.osgiliath.evolutionary.elements.Mutation"/>
    </service>
-   <reference bind="setAlgorithmParameters" cardinality="1..1" interface="es.ugr.osgiliath.algorithms.AlgorithmParameters" name="AlgorithmParameters" policy="static" unbind="unsetAlgorithmParameters"/>
-   <reference bind="setFitnessCalculator" cardinality="1..1" interface="es.ugr.osgiliath.evolutionary.elements.FitnessCalculator" name="FitnessCalculator" policy="static" target="(calculatorType=distributed)" unbind="unsetFitnessCalculator"/>
 </scr:component>

OsgiliathFunctionsProblems/build.properties

@@ -2,7 +2,8 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                OSGI-INF/,\
-               OSGI-INF/EvolutionaryParameters.xml,\
-               OSGI-INF/ProblemParameters.xml,\
-               OSGI-INF/Problem.xml
+               bin/,\
+               cec.jar,\
+               src/cec05/,\
+               src/
 source.. = src/