diff --git a/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/GHSBuilder.java b/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/GHSBuilder.java index c3205d7..8c62a3c 100644 --- a/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/GHSBuilder.java +++ b/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/GHSBuilder.java @@ -2,6 +2,7 @@ import org.uma.jmetal.problem.DoubleProblem; import org.uma.jmetal.solution.DoubleSolution; +import org.uma.jmetal.util.AlgorithmBuilder; import org.uma.jmetal.util.evaluator.SolutionListEvaluator; import org.uma.jmetal.util.evaluator.impl.SequentialSolutionListEvaluator; @@ -9,7 +10,7 @@ * * @author Daniel Pusil */ -public class GHSBuilder { +public class GHSBuilder implements AlgorithmBuilder { private DoubleProblem problem; private int maxEvaluations;//Maximum number of evaluations of the objective function @@ -36,6 +37,7 @@ public GHSBuilder(DoubleProblem problem) { this.evaluator = new SequentialSolutionListEvaluator<>(); } + @Override public GHS build() { GHS hs = new GHS(problem, maxEvaluations, HMS, HMCR, PARMIN, PARMAX, evaluator); return hs; diff --git a/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/HS.java b/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/HS.java index 72d11df..46bef75 100644 --- a/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/HS.java +++ b/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/HS.java @@ -53,7 +53,7 @@ public HS(DoubleProblem problem, int maxEvaluations, int hms, setComparator(comparator); this.PAR = PAR; this.BW = BW; - this.HMCR = HMCR; + this.HMCR = HMCR; if (randomGenerator == null) { randomGenerator = JMetalRandom.getInstance(); } diff --git a/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/HSBuilder.java b/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/HSBuilder.java index d4c8f17..2af2510 100644 --- a/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/HSBuilder.java +++ b/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/HSBuilder.java @@ -2,6 +2,7 @@ import org.uma.jmetal.problem.DoubleProblem; import org.uma.jmetal.solution.DoubleSolution; +import org.uma.jmetal.util.AlgorithmBuilder; import org.uma.jmetal.util.evaluator.SolutionListEvaluator; import org.uma.jmetal.util.evaluator.impl.SequentialSolutionListEvaluator; @@ -9,7 +10,8 @@ * * @author Daniel Pusil */ -public class HSBuilder { +public class HSBuilder + implements AlgorithmBuilder { /** * Parameters @@ -35,6 +37,7 @@ public HSBuilder(DoubleProblem problem) { /** * @return HarmonySearch algorithm */ + @Override public HS build() { return new HS(problem, maxEvaluations, HMS, HMCR, PAR, BW, evaluator); } diff --git a/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/IHSBuilder.java b/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/IHSBuilder.java index 70510c3..c1d5392 100644 --- a/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/IHSBuilder.java +++ b/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/IHSBuilder.java @@ -2,6 +2,7 @@ import org.uma.jmetal.problem.DoubleProblem; import org.uma.jmetal.solution.DoubleSolution; +import org.uma.jmetal.util.AlgorithmBuilder; import org.uma.jmetal.util.evaluator.SolutionListEvaluator; import org.uma.jmetal.util.evaluator.impl.SequentialSolutionListEvaluator; @@ -9,7 +10,7 @@ * * @author Daniel Pusil */ -public class IHSBuilder { +public class IHSBuilder implements AlgorithmBuilder { private DoubleProblem problem; private int maxEvaluations; @@ -36,6 +37,7 @@ public IHSBuilder(DoubleProblem problem) { this.evaluator = new SequentialSolutionListEvaluator<>(); } + @Override public IHS build() { IHS hs = new IHS(problem, maxEvaluations, HMS, HMCR, PARMIN, PARMAX, BWMIN, BWMAX, evaluator); return hs; diff --git a/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/NGHS.java b/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/NGHS.java index 619b151..5826e3d 100644 --- a/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/NGHS.java +++ b/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/NGHS.java @@ -6,7 +6,6 @@ import org.uma.jmetal.problem.DoubleProblem; import org.uma.jmetal.solution.DoubleSolution; import org.uma.jmetal.util.comparator.FitnessNorma2Comparator; -import org.uma.jmetal.util.comparator.ObjectiveComparator; import org.uma.jmetal.util.evaluator.SolutionListEvaluator; import org.uma.jmetal.util.pseudorandom.JMetalRandom; diff --git a/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/NGHSBuilder.java b/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/NGHSBuilder.java index c688180..7e1c4cc 100644 --- a/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/NGHSBuilder.java +++ b/jMetal-jmetal-5.2/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/singleobjective/harmonySearch/NGHSBuilder.java @@ -2,6 +2,7 @@ import org.uma.jmetal.problem.DoubleProblem; import org.uma.jmetal.solution.DoubleSolution; +import org.uma.jmetal.util.AlgorithmBuilder; import org.uma.jmetal.util.evaluator.SolutionListEvaluator; import org.uma.jmetal.util.evaluator.impl.SequentialSolutionListEvaluator; @@ -9,7 +10,7 @@ * * @author Daniel Pusil */ -public class NGHSBuilder { +public class NGHSBuilder implements AlgorithmBuilder{ private DoubleProblem problem; private int maxEvaluations; @@ -24,6 +25,7 @@ public NGHSBuilder(DoubleProblem problem) { this.evaluator = new SequentialSolutionListEvaluator<>(); } + @Override public NGHS build() { NGHS hs = new NGHS(problem, maxEvaluations, HMS, PM, evaluator); return hs; diff --git a/jMetal-jmetal-5.2/jmetal-core/src/main/java/org/uma/jmetal/util/comparator/FitnessNorma2Comparator.java b/jMetal-jmetal-5.2/jmetal-core/src/main/java/org/uma/jmetal/util/comparator/FitnessNorma2Comparator.java index 35efcf8..91d5fb2 100644 --- a/jMetal-jmetal-5.2/jmetal-core/src/main/java/org/uma/jmetal/util/comparator/FitnessNorma2Comparator.java +++ b/jMetal-jmetal-5.2/jmetal-core/src/main/java/org/uma/jmetal/util/comparator/FitnessNorma2Comparator.java @@ -38,7 +38,7 @@ public int compare(S solution1, S solution2) { if (fitness1 > fitness2) { return 1; } - if (solution1.getAttribute("norm2") != null && solution2.getAttribute("norm2") != null) { + if (solution1.getAttribute("B") != null && solution2.getAttribute("B") != null) { return compareNorma(solution1, solution2); } @@ -46,13 +46,13 @@ public int compare(S solution1, S solution2) { } private int compareNorma(S solution1, S solution2) { - double norm2Solution1 = (double) solution1.getAttribute("norm2"); - double norm2Solution2 = (double) solution2.getAttribute("norm2"); - if (norm2Solution1 < norm2Solution2) { + double BSolution1 = (double) solution1.getAttribute("B"); + double BSolution2 = (double) solution2.getAttribute("B"); + if (BSolution1 < BSolution2) { return -1; } - if (norm2Solution1 > norm2Solution2) { + if (BSolution1 > BSolution2) { return 1; } return 0; diff --git a/jMetal-jmetal-5.2/unicauca-ann/jMetal.log b/jMetal-jmetal-5.2/unicauca-ann/jMetal.log index dfab9e2..157a757 100644 --- a/jMetal-jmetal-5.2/unicauca-ann/jMetal.log +++ b/jMetal-jmetal-5.2/unicauca-ann/jMetal.log @@ -2,8 +2,8 @@ - 2018-02-15T14:24:21 - 1518722661125 + 2018-03-19T19:47:40 + 1521506860335 0 org.uma.jmetal.util.JMetalLogger INFO @@ -13,8 +13,8 @@ Loggers configured with null - 2018-02-15T14:24:21 - 1518722661182 + 2018-03-19T19:47:40 + 1521506860419 1 org.uma.jmetal.util.JMetalLogger SEVERE @@ -23,7 +23,7 @@ 1 Class.forName() did not recognized the name of the class - java.lang.ClassNotFoundException: co.edu.unicauca.problem.cross_validation.9834 + java.lang.ClassNotFoundException: co.edu.unicauca.problem.cross_validation.Iri java.net.URLClassLoader findClass @@ -61,144 +61,62 @@ co.edu.unicauca.exec.Run readDataSet - 122 + 113 co.edu.unicauca.exec.Run readConfigurationExecution - 59 + 54 co.edu.unicauca.exec.Run main - 36 + 33 - 2018-02-15T14:24:40 - 1518722680127 + 2018-03-19T19:47:45 + 1521506865944 2 - org.uma.jmetal.util.JMetalLogger - SEVERE - org.uma.jmetal.util.JMetalException - <init> - 1 - Class.forName() did not recognized the name of the class - - java.lang.ClassNotFoundException: co.edu.unicauca.problem.cross_validation.ajksdlñfj - - java.net.URLClassLoader - findClass - 381 - - - java.lang.ClassLoader - loadClass - 424 - - - sun.misc.Launcher$AppClassLoader - loadClass - 335 - - - java.lang.ClassLoader - loadClass - 357 - - - java.lang.Class - forName0 - - - java.lang.Class - forName - 264 - - - org.uma.jmetal.util.ProblemUtils - loadProblem - 23 - - - co.edu.unicauca.exec.Run - readDataSet - 122 - - - co.edu.unicauca.exec.Run - readConfigurationExecution - 59 - - - co.edu.unicauca.exec.Run - main - 36 - - + com.github.fommil.netlib.BLAS + WARNING + com.github.fommil.netlib.BLAS + <clinit> + 11 + Failed to load implementation from: com.github.fommil.netlib.NativeSystemBLAS - 2018-02-15T14:24:41 - 1518722681659 + 2018-03-19T19:47:47 + 1521506867065 3 - org.uma.jmetal.util.JMetalLogger - SEVERE - org.uma.jmetal.util.JMetalException - <init> - 1 - Class.forName() did not recognized the name of the class - - java.lang.ClassNotFoundException: co.edu.unicauca.problem.cross_validation.08324 - - java.net.URLClassLoader - findClass - 381 - - - java.lang.ClassLoader - loadClass - 424 - - - sun.misc.Launcher$AppClassLoader - loadClass - 335 - - - java.lang.ClassLoader - loadClass - 357 - - - java.lang.Class - forName0 - - - java.lang.Class - forName - 264 - - - org.uma.jmetal.util.ProblemUtils - loadProblem - 23 - - - co.edu.unicauca.exec.Run - readDataSet - 122 - - - co.edu.unicauca.exec.Run - readConfigurationExecution - 59 - - - co.edu.unicauca.exec.Run - main - 36 - - + com.github.fommil.jni.JniLoader + INFO + com.github.fommil.jni.JniLoader + liberalLoad + 11 + successfully loaded C:\Users\Daniel\AppData\Local\Temp\jniloader5971280112330389898netlib-native_ref-win-x86_64.dll + + + 2018-03-19T19:47:47 + 1521506867658 + 4 + com.github.fommil.netlib.LAPACK + WARNING + com.github.fommil.netlib.LAPACK + <clinit> + 11 + Failed to load implementation from: com.github.fommil.netlib.NativeSystemLAPACK + + + 2018-03-19T19:47:47 + 1521506867717 + 5 + com.github.fommil.jni.JniLoader + INFO + com.github.fommil.jni.JniLoader + load + 11 + already loaded netlib-native_ref-win-x86_64.dll diff --git a/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/algorithm/AbstractBuilderFactory.java b/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/algorithm/AbstractBuilderFactory.java index 78f664b..7ce4e1e 100644 --- a/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/algorithm/AbstractBuilderFactory.java +++ b/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/algorithm/AbstractBuilderFactory.java @@ -40,7 +40,6 @@ public AbstractBuilderFactory(AbstractParametersFactory parametersFactory) { this.parametersFactory = parametersFactory; } - public abstract AlgorithmBuilder getAlgorithm(String name, AbstractELMEvaluator.EvaluatorType evaluatorType, DoubleProblem problem) throws Exception; diff --git a/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/algorithm/AlgorithmFactory.java b/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/algorithm/AlgorithmFactory.java index 25d2111..8c819c9 100644 --- a/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/algorithm/AlgorithmFactory.java +++ b/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/algorithm/AlgorithmFactory.java @@ -10,20 +10,19 @@ /** * Creates algorithms as needed to run elm problems */ -public class AlgorithmFactory -{ - private DifferentialEvolutionFactory de ; - private HillClimbingFactory hc ; - private IHDELSFactory ihdels ; - private MOSFactory mos ; - private MTSFactory mts ; - private SolisAndWetsFactory sw ; - private RandomFactory random ; +public class AlgorithmFactory { + + private DifferentialEvolutionFactory de; + private HillClimbingFactory hc; + private IHDELSFactory ihdels; + private MOSFactory mos; + private MTSFactory mts; + private SolisAndWetsFactory sw; + private RandomFactory random; private AbstractParametersFactory parametersFactory; + private HSVariansFactory HSVariansFactory; - - public AlgorithmFactory(AbstractParametersFactory parametersFactory) - { + public AlgorithmFactory(AbstractParametersFactory parametersFactory) { de = new DifferentialEvolutionFactory(parametersFactory); hc = new HillClimbingFactory(parametersFactory); ihdels = new IHDELSFactory(parametersFactory); @@ -31,14 +30,13 @@ public AlgorithmFactory(AbstractParametersFactory parametersFactory) mts = new MTSFactory(parametersFactory); sw = new SolisAndWetsFactory(parametersFactory); random = new RandomFactory(parametersFactory); + HSVariansFactory = new HSVariansFactory(parametersFactory); } - - public Algorithm getAlgorithm(String name, AbstractELMEvaluator.EvaluatorType evaluatorType, - DoubleProblem problem) throws Exception - { + + public Algorithm getAlgorithm(String name, AbstractELMEvaluator.EvaluatorType evaluatorType, + DoubleProblem problem) throws Exception { AlgorithmBuilder builder = null; - switch(name) - { + switch (name) { case "DECC_G": return de.getAlgorithm(name, evaluatorType, problem).build(); case "DEUnicauca": @@ -61,8 +59,16 @@ public Algorithm getAlgorithm(String name, AbstractELMEvaluator.EvaluatorType e return hc.getAlgorithm(name, evaluatorType, problem).build(); case "Random": return random.getAlgorithm(name, evaluatorType, problem).build(); + case "HS": + return HSVariansFactory.getAlgorithm(name, evaluatorType, problem).build(); + case "IHS": + return HSVariansFactory.getAlgorithm(name, evaluatorType, problem).build(); + case "GHS": + return HSVariansFactory.getAlgorithm(name, evaluatorType, problem).build(); + case "NGHS": + return HSVariansFactory.getAlgorithm(name, evaluatorType, problem).build(); default: - throw new JMetalException("Algorithm "+name+" not exists"); + throw new JMetalException("Algorithm " + name + " not exists"); } } diff --git a/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/algorithm/HSVariansFactory.java b/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/algorithm/HSVariansFactory.java new file mode 100644 index 0000000..0212bc8 --- /dev/null +++ b/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/algorithm/HSVariansFactory.java @@ -0,0 +1,85 @@ +package co.edu.unicauca.factory.algorithm; + +import static co.edu.unicauca.factory.algorithm.AbstractBuilderFactory.EVALUATIONS_TT; +import co.edu.unicauca.factory.parameters.AbstractParametersFactory; +import co.edu.unicauca.problem.AbstractELMEvaluator; +import org.uma.jmetal.problem.DoubleProblem; +import org.uma.jmetal.util.AlgorithmBuilder; +import org.uma.jmetal.algorithm.singleobjective.harmonySearch.*; +import org.uma.jmetal.util.JMetalException; + +/** + * + * @author Daniel Pusil + */ +public class HSVariansFactory extends AbstractBuilderFactory { + + private int HMS; + private double HMCR; + private double PAR; + private double BW; + private double BWMin; + private double BWMax; + private double PARMax; + private double PARMin; + private double PM; + + public HSVariansFactory(AbstractParametersFactory parametersFactory) { + super(parametersFactory); + } + + @Override + public AlgorithmBuilder getAlgorithm(String name, AbstractELMEvaluator.EvaluatorType evaluatorType, DoubleProblem problem) throws Exception { + this.evaluatorType = evaluatorType; + int evaluations = evaluatorType == AbstractELMEvaluator.EvaluatorType.TT ? EVALUATIONS_TT : EVALUATIONS_CV; + AlgorithmBuilder builder = null; + this.loadAlgorithmValues(name, evaluatorType); + switch (name) { + case "HS": + builder = this.getHS(evaluations, problem); + break; + case "IHS": + builder = this.getIHS(evaluations, problem); + break; + case "GHS": + builder = this.getGHS(evaluations, problem); + break; + case "NGHS": + builder = this.getNGHS(evaluations, problem); + break; + default: + throw new JMetalException("Algorithm " + name + " not exists"); + } + return builder; + } + + @Override + protected void loadAlgorithmValues(String name, AbstractELMEvaluator.EvaluatorType evaluatorType) throws Exception { + HMS = (int) parametersFactory.getValue("HMS", evaluatorType, "HS"); + HMCR = parametersFactory.getValue("HMCR", evaluatorType, "HS"); + PAR = parametersFactory.getValue("PAR", evaluatorType, "HS"); + BW = parametersFactory.getValue("BW", evaluatorType, "HS"); + PARMax = parametersFactory.getValue("PARMax", evaluatorType, "IHS"); + PARMin = parametersFactory.getValue("PARMin", evaluatorType, "IHS"); + BWMax = parametersFactory.getValue("BWMax", evaluatorType, "IHS"); + BWMin = parametersFactory.getValue("BWMin", evaluatorType, "IHS"); + PM = parametersFactory.getValue("PM", evaluatorType, "NGHS"); + } + + public AlgorithmBuilder getHS(int evaluations, DoubleProblem problem) { + return new HSBuilder(problem).setHMS(HMS).setHMCR(HMCR).setPAR(PAR).setBW(BW).setMaxEvaluations(evaluations); + } + + public AlgorithmBuilder getIHS(int evaluations, DoubleProblem problem) { + return new IHSBuilder(problem).setHMS(HMS).setHMCR(HMCR).setPARMAX(PARMax).setPARMIN(PARMin).setBWMAX(BWMax).setBWMIN(BWMin).setMaxEvaluations(evaluations); + + } + + public AlgorithmBuilder getGHS(int evaluations, DoubleProblem problem) { + return new GHSBuilder(problem).setHMS(HMS).setHMCR(HMCR).setPARMAX(PARMax).setPARMIN(PARMin).setMaxEvaluations(evaluations); + } + + public AlgorithmBuilder getNGHS(int evaluations, DoubleProblem problem) { + return new NGHSBuilder(problem).setHMS(HMS).setPM(PM).setMaxEvaluations(evaluations); + } +} diff --git a/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/parameters/AbstractParametersFactory.java b/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/parameters/AbstractParametersFactory.java index 9e6d948..83e2dbb 100644 --- a/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/parameters/AbstractParametersFactory.java +++ b/jMetal-jmetal-5.2/unicauca-ann/src/main/java/co/edu/unicauca/factory/parameters/AbstractParametersFactory.java @@ -2,7 +2,7 @@ import co.edu.unicauca.problem.AbstractELMEvaluator; -public abstract class AbstractParametersFactory +public abstract class AbstractParametersFactory { /** * Gets the value for a specific parameter diff --git a/jMetal-jmetal-5.2/unicauca-ann/src/resources-parameters/parametersClasification b/jMetal-jmetal-5.2/unicauca-ann/src/resources-parameters/parametersClasification index e11183e..812c4d9 100644 --- a/jMetal-jmetal-5.2/unicauca-ann/src/resources-parameters/parametersClasification +++ b/jMetal-jmetal-5.2/unicauca-ann/src/resources-parameters/parametersClasification @@ -59,4 +59,36 @@ POPULATION;tt;SaDE;10 POPULATION;tt;DEUnicauca;10 POPULATION;tt;SaNSDE;10 POPULATION;tt;DECC_G;10 -POPULATION;tt;MTS;10 \ No newline at end of file +POPULATION;tt;MTS;10 +HMS;tt;HS;10 +HMS;tt;IHS;10 +HMS;tt;GHS;10 +HMS;tt;NGHS;10 +HMCR;tt;HS;0.9 +HMCR;tt;IHS;0.9 +HMCR;tt;GHS;0.9 +PAR;tt;HS;0.4 +BW;tt;HS;0.01 +PARMin;tt;IHS;0.1 +PARMax;tt;IHS;0.8 +PARMin;tt;GHS;0.1 +ParMax;tt;GHS;0.8 +BWMin;tt;IHS;0.1 +BWMax;tt;IHS;0.4 +PM;tt;NGHS;0.01 +HMS;cv;HS;10 +HMS;cv;IHS;10 +HMS;cv;GHS;10 +HMS;cv;NGHS;10 +HMCR;cv;HS;0.9 +HMCR;cv;IHS;0.9 +HMCR;cv;GHS;0.9 +PAR;cv;HS;0.4 +BW;cv;HS;0.01 +PARMin;cv;IHS;0.1 +PARMax;cv;IHS;0.8 +PARMin;cv;GHS;0.1 +ParMax;cv;GHS;0.8 +BWMin;cv;IHS;0.1 +BWMax;cv;IHS;0.4 +PM;cv;NGHS;0.01 \ No newline at end of file diff --git a/jMetal-jmetal-5.2/unicauca-ann/src/resources-parameters/parametersRegresion b/jMetal-jmetal-5.2/unicauca-ann/src/resources-parameters/parametersRegresion index 78940ee..14ed902 100644 --- a/jMetal-jmetal-5.2/unicauca-ann/src/resources-parameters/parametersRegresion +++ b/jMetal-jmetal-5.2/unicauca-ann/src/resources-parameters/parametersRegresion @@ -59,4 +59,36 @@ POPULATION;tt;SaDE;10 POPULATION;tt;DEUnicauca;10 POPULATION;tt;SaNSDE;10 POPULATION;tt;DECC_G;10 -POPULATION;tt;MTS;10 \ No newline at end of file +POPULATION;tt;MTS;10 +HMS;tt;HS;10 +HMS;tt;IHS;10 +HMS;tt;GHS;10 +HMS;tt;NGHS;10 +HMCR;tt;HS;0.9 +HMCR;tt;IHS;0.9 +HMCR;tt;GHS;0.9 +PAR;tt;HS;0.4 +BW;tt;HS;0.01 +PARMin;tt;IHS;0.1 +ParMax;tt;IHS;0.8 +PARMin;tt;GHS;0.1 +PARMax;tt;GHS;0.8 +BWMin;tt;IHS;0.1 +BWMax;tt;IHS;0.4 +PM;tt;NGHS;0.01 +HMS;cv;HS;10 +HMS;cv;IHS;10 +HMS;cv;GHS;10 +HMS;cv;NGHS;10 +HMCR;cv;HS;0.9 +HMCR;cv;IHS;0.9 +HMCR;cv;GHS;0.9 +PAR;cv;HS;0.4 +BW;cv;HS;0.01 +PARMin;cv;IHS;0.1 +PARMax;cv;IHS;0.8 +PARMin;cv;GHS;0.1 +ParMax;cv;GHS;0.8 +BWMin;cv;IHS;0.1 +BWMax;cv;IHS;0.4 +PM;cv;NGHS;0.01