IGNITE-7877: Improve code style in GA part this closes #3695
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b97b1eec Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b97b1eec Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b97b1eec Branch: refs/heads/ignite-8159 Commit: b97b1eec43be60c020adb142503e59735d8e07a2 Parents: 6c92d4d Author: Turik Campbell <ad...@techbysample.com> Authored: Mon Apr 9 00:52:10 2018 +0300 Committer: YuriBabak <y.ch...@gmail.com> Committed: Mon Apr 9 00:52:10 2018 +0300 ---------------------------------------------------------------------- .../ignite/examples/ml/genetic/change/Coin.java | 7 ++-- .../OptimizeMakeChangeFitnessFunction.java | 3 +- .../change/OptimizeMakeChangeGAExample.java | 8 ++++- .../OptimizeMakeChangeTerminateCriteria.java | 3 +- .../helloworld/HelloWorldFitnessFunction.java | 3 +- .../genetic/helloworld/HelloWorldGAExample.java | 9 ++++- .../helloworld/HelloWorldTerminateCriteria.java | 3 +- .../ignite/examples/ml/genetic/movie/Movie.java | 4 +-- .../ml/genetic/movie/MovieFitnessFunction.java | 3 +- .../ml/genetic/movie/MovieGAExample.java | 4 ++- .../genetic/movie/MovieTerminateCriteria.java | 4 +-- .../apache/ignite/ml/genetic/Chromosome.java | 8 ++--- .../apache/ignite/ml/genetic/CrossOverJob.java | 5 ++- .../apache/ignite/ml/genetic/CrossOverTask.java | 3 +- .../apache/ignite/ml/genetic/FitnessJob.java | 6 ++-- .../apache/ignite/ml/genetic/FitnessTask.java | 6 ++-- .../org/apache/ignite/ml/genetic/GAGrid.java | 38 ++++++++------------ .../java/org/apache/ignite/ml/genetic/Gene.java | 6 ++-- .../ignite/ml/genetic/IFitnessFunction.java | 2 -- .../org/apache/ignite/ml/genetic/MutateJob.java | 10 ++---- .../apache/ignite/ml/genetic/MutateTask.java | 19 +++++----- .../ignite/ml/genetic/TruncateSelectionJob.java | 11 ++---- .../ml/genetic/TruncateSelectionTask.java | 17 +++------ .../ml/genetic/cache/GeneCacheConfig.java | 2 -- .../ml/genetic/cache/PopulationCacheConfig.java | 2 -- .../ml/genetic/functions/GAGridFunction.java | 9 ++--- .../genetic/parameter/ChromosomeCriteria.java | 7 ++-- .../ml/genetic/parameter/GAConfiguration.java | 6 ++-- .../ml/genetic/parameter/GAGridConstants.java | 4 +-- .../ignite/ml/genetic/utils/GAGridUtils.java | 10 ++---- .../ml/genetic/GAGridCalculateFitnessTest.java | 6 +++- .../genetic/GAGridInitializePopulationTest.java | 7 ++-- 32 files changed, 101 insertions(+), 134 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/Coin.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/Coin.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/Coin.java index 90f6e8f..4944a6b 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/Coin.java +++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/Coin.java @@ -23,7 +23,7 @@ import java.io.Serializable; * POJO to model a coin */ public class Coin implements Serializable { - + /** Define Coin Type */ public static enum CoinType { PENNY, QUARTER, NICKEL, DIME } @@ -33,6 +33,7 @@ public class Coin implements Serializable { /** number of coins */ private int numberOfCoins = 0; + /** CoinType */ private CoinType coinType = null; /** @@ -80,8 +81,8 @@ public class Coin implements Serializable { this.coinType = coinType; } - @Override - public String toString() { + /** {@inheritDoc} */ + @Override public String toString() { return "Coin [numberOfCoins=" + numberOfCoins + ", coinType=" + coinType + "]"; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeFitnessFunction.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeFitnessFunction.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeFitnessFunction.java index faa113b..a7c248a 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeFitnessFunction.java +++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeFitnessFunction.java @@ -31,9 +31,8 @@ import org.apache.ignite.ml.genetic.IFitnessFunction; * * an individual solution relative to other solutions. <br/> */ - public class OptimizeMakeChangeFitnessFunction implements IFitnessFunction { - + /** target amount */ int targetAmount = 0; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeGAExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeGAExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeGAExample.java index 000424f..6b832de 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeGAExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeGAExample.java @@ -48,14 +48,20 @@ import org.apache.ignite.ml.genetic.parameter.GAGridConstants; * 'ignite.{sh|bat} examples/config/example-ignite.xml'}.</p> <p> Alternatively you can run ExampleNodeStartup in * another JVM which will start node with {@code examples/config/example-ignite.xml} configuration.</p> */ - public class OptimizeMakeChangeGAExample { + /** Ignite instance */ private static Ignite ignite = null; + + /** GAGrid */ private static GAGrid gaGrid = null; + + /** GAConfiguration */ private static GAConfiguration gaConfig = null; + /** amount of change */ private static String sAmountChange = null; + /** Ignite logger */ private static IgniteLogger logger = null; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java index 79601fe..a4ea263 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java +++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/change/OptimizeMakeChangeTerminateCriteria.java @@ -31,8 +31,9 @@ import org.apache.ignite.ml.genetic.utils.GAGridUtils; * Terminate Condition implementation for OptimizeMakeChangeGATest <br/> */ public class OptimizeMakeChangeTerminateCriteria implements ITerminateCriteria { - + /** Ignite logger */ private IgniteLogger igniteLogger = null; + /** Ignite instance */ private Ignite ignite = null; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldFitnessFunction.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldFitnessFunction.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldFitnessFunction.java index f5f1ee3..85c00e9 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldFitnessFunction.java +++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldFitnessFunction.java @@ -39,9 +39,8 @@ import org.apache.ignite.ml.genetic.IFitnessFunction; * * we achieve a fitness score of '11', as 'HELLO WORLD' contains '11' characters. */ - public class HelloWorldFitnessFunction implements IFitnessFunction { - + /** Optimal target solution */ private String targetString = "HELLO WORLD"; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldGAExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldGAExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldGAExample.java index 70b00d8..78374d2 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldGAExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldGAExample.java @@ -44,12 +44,19 @@ import org.apache.ignite.ml.genetic.parameter.GAConfiguration; * 'ignite.{sh|bat} examples/config/example-ignite.xml'}.</p> <p> Alternatively you can run ExampleNodeStartup in * another JVM which will start node with {@code examples/config/example-ignite.xml} configuration.</p> */ - public class HelloWorldGAExample { + /** Ignite instance */ private static Ignite ignite = null; + /** GAGrid */ private static GAGrid gaGrid = null; + /** GAConfiguration */ private static GAConfiguration gaConfig = null; + /** + * Executes example. + * + * @param args Command line arguments, none required. + */ public static void main(String args[]) { System.setProperty("IGNITE_QUIET", "false"); http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldTerminateCriteria.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldTerminateCriteria.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldTerminateCriteria.java index a0d6f93..24bb5e0 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldTerminateCriteria.java +++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/helloworld/HelloWorldTerminateCriteria.java @@ -33,8 +33,9 @@ import org.apache.ignite.ml.genetic.utils.GAGridUtils; * Class terminates Genetic algorithm when fitnessScore > 10 */ public class HelloWorldTerminateCriteria implements ITerminateCriteria { - + /** Ignite logger */ private IgniteLogger igniteLogger = null; + /** Ignite instance */ private Ignite ignite = null; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/Movie.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/Movie.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/Movie.java index fd4afda..38d27ff2 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/Movie.java +++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/Movie.java @@ -22,7 +22,6 @@ import java.util.List; /** * POJO to model a movie. */ - public class Movie { /** name of movie */ private String name; @@ -125,7 +124,8 @@ public class Movie { this.rating = rating; } - public String toString() { + /** {@inheritDoc} */ + @Override public String toString() { return "Movie [name=" + name + ", genre=" + genre + ", rating=" + rating + ", imdbRating=" + imdbRating + ", year=" + year + "]"; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieFitnessFunction.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieFitnessFunction.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieFitnessFunction.java index 9690d69..20e04ce 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieFitnessFunction.java +++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieFitnessFunction.java @@ -45,9 +45,8 @@ import org.apache.ignite.ml.genetic.IFitnessFunction; * * fitness score. */ - public class MovieFitnessFunction implements IFitnessFunction { - + /** genes */ private List<String> genres = null; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieGAExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieGAExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieGAExample.java index f14cb83..e601081 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieGAExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieGAExample.java @@ -45,10 +45,12 @@ import org.apache.ignite.ml.genetic.parameter.GAGridConstants; * 'ignite.{sh|bat} examples/config/example-ignite.xml'}.</p> <p> Alternatively you can run ExampleNodeStartup in * another JVM which will start node with {@code examples/config/example-ignite.xml} configuration.</p> */ - public class MovieGAExample { + /** Ignite instance */ private static Ignite ignite = null; + /** GAGrid */ private static GAGrid gaGrid = null; + /** GAConfiguration */ private static GAConfiguration gaConfig = null; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java index 904c66d..747d514 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java +++ b/examples/src/main/java/org/apache/ignite/examples/ml/genetic/movie/MovieTerminateCriteria.java @@ -32,10 +32,10 @@ import org.apache.ignite.ml.genetic.utils.GAGridUtils; * * Class terminates Genetic algorithm when fitnessScore > 32 <br/> */ - public class MovieTerminateCriteria implements ITerminateCriteria { - + /** Ignite logger */ private IgniteLogger igniteLogger = null; + /** Ignite instance */ private Ignite ignite = null; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Chromosome.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Chromosome.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Chromosome.java index 03e949f..ed78e85 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Chromosome.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Chromosome.java @@ -32,9 +32,10 @@ import org.apache.ignite.cache.query.annotations.QuerySqlField; * </p> */ public class Chromosome { - + /** primary key of Chromosome */ private static final AtomicLong ID_GEN = new AtomicLong(); + /** fitness score */ @QuerySqlField(index = true) private double fitnessScore = -1; @@ -46,7 +47,6 @@ public class Chromosome { private long[] genes; /** - * * @param genes Primary keys of Genes */ public Chromosome(long[] genes) { @@ -99,8 +99,8 @@ public class Chromosome { return id; } - @Override - public String toString() { + /** {@inheritDoc} */ + @Override public String toString() { return "Chromosome [fitnessScore=" + fitnessScore + ", id=" + id + ", genes=" + Arrays.toString(genes) + "]"; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverJob.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverJob.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverJob.java index 74f81b8..35f4a78 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverJob.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverJob.java @@ -18,7 +18,6 @@ package org.apache.ignite.ml.genetic; import java.util.Arrays; -import java.util.List; import java.util.Random; import org.apache.ignite.Ignite; @@ -49,10 +48,11 @@ import org.apache.ignite.ml.genetic.parameter.GAGridConstants; * </p> */ public class CrossOverJob extends ComputeJobAdapter { - + /** Ignite resource */ @IgniteInstanceResource private Ignite ignite = null; + /** Ignite logger */ @LoggerResource private IgniteLogger log = null; @@ -84,7 +84,6 @@ public class CrossOverJob extends ComputeJobAdapter { * @param genekeys Original gene Keys for a chromosome * @return New Gene keys */ - private long[] crossOver(long[] newKeySwapArrayForChrome, int updateIdx, long[] genekeys) { long[] newGeneKeys = genekeys.clone(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverTask.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverTask.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverTask.java index 377ec3d..5d342da 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverTask.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/CrossOverTask.java @@ -46,7 +46,7 @@ import org.apache.ignite.ml.genetic.parameter.GAGridConstants; * </p> */ public class CrossOverTask extends ComputeTaskAdapter<List<Long>, Boolean> { - + /** Ignite instance */ @IgniteInstanceResource private Ignite ignite = null; @@ -117,7 +117,6 @@ public class CrossOverTask extends ComputeTaskAdapter<List<Long>, Boolean> { * @param map Nodes where jobs will be sent * @return A map of ComputeJob/ClusterNode's */ - private Map<ComputeJob, ClusterNode> setupCrossOver(ClusterNode clusterNode, List<Long> keys, Map<ComputeJob, ClusterNode> map) { // Calculate number of Jobs = keys / 2 http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessJob.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessJob.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessJob.java index 064846e..182b7dc 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessJob.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessJob.java @@ -24,7 +24,6 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; -import org.apache.ignite.compute.ComputeExecutionRejectedException; import org.apache.ignite.compute.ComputeJobAdapter; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.resources.LoggerResource; @@ -36,15 +35,16 @@ import org.apache.ignite.ml.genetic.parameter.GAGridConstants; * Responsible for performing fitness evaluation on an individual chromosome */ public class FitnessJob extends ComputeJobAdapter { - /** * Chromosome primary Key */ private Long key; + /** Ignite instance */ @IgniteInstanceResource private Ignite ignite = null; + /** Ignite logger */ @LoggerResource private IgniteLogger log = null; @@ -77,7 +77,7 @@ public class FitnessJob extends ComputeJobAdapter { long[] geneKeys = chromosome.getGenes(); - List<Gene> genes = new ArrayList(); + List<Gene> genes = new ArrayList<Gene>(); for (int i = 0; i < geneKeys.length; i++) { long aKey = geneKeys[i]; http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessTask.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessTask.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessTask.java index 58b69fa..4403be4 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessTask.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/FitnessTask.java @@ -17,8 +17,6 @@ package org.apache.ignite.ml.genetic; -import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -40,11 +38,11 @@ import org.apache.ignite.ml.genetic.parameter.GAGridConstants; * Responsible for fitness operation */ public class FitnessTask extends ComputeTaskAdapter<List<Long>, Boolean> { - + /** Ignite instance */ @IgniteInstanceResource private Ignite ignite = null; - /** GAConfiguration **/ + /** GAConfiguration */ private GAConfiguration config = null; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/GAGrid.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/GAGrid.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/GAGrid.java index 56895f7..2f67054 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/GAGrid.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/GAGrid.java @@ -34,7 +34,6 @@ import org.apache.ignite.ml.genetic.cache.GeneCacheConfig; import org.apache.ignite.ml.genetic.cache.PopulationCacheConfig; import org.apache.ignite.ml.genetic.parameter.GAConfiguration; import org.apache.ignite.ml.genetic.parameter.GAGridConstants; -import org.apache.ignite.ml.genetic.utils.GAGridUtils; /** * Central class responsible for orchestrating distributive Genetic Algorithm. @@ -42,7 +41,7 @@ import org.apache.ignite.ml.genetic.utils.GAGridUtils; * This class accepts a GAConfigriation and Ignite instance. */ public class GAGrid { - + /** Ignite logger */ IgniteLogger igniteLogger = null; /** GAConfiguraton */ private GAConfiguration config = null; @@ -53,7 +52,7 @@ public class GAGrid { /** Gene cache */ private IgniteCache<Long, Gene> geneCache = null; /** population keys */ - private List<Long> populationKeys = new ArrayList(); + private List<Long> populationKeys = new ArrayList<Long>(); /** * @param config GAConfiguration @@ -79,7 +78,6 @@ public class GAGrid { * * @return Average fitness score */ - private Double calculateAverageFitness() { double avgFitnessScore = 0; @@ -104,7 +102,7 @@ public class GAGrid { * @param chromosomeKeys List of chromosome primary keys */ private void calculateFitness(List<Long> chromosomeKeys) { - Boolean boolValue = this.ignite.compute().execute(new FitnessTask(this.config), chromosomeKeys); + this.ignite.compute().execute(new FitnessTask(this.config), chromosomeKeys); } /** @@ -122,9 +120,9 @@ public class GAGrid { int numberOfCopies = selectedKeys.size() / truncateCount; Boolean boolValue = this.ignite.compute() - .execute(new TruncateSelectionTask(this.config, fittestKeys, numberOfCopies), selectedKeys); + .execute(new TruncateSelectionTask(fittestKeys, numberOfCopies), selectedKeys); - return Boolean.TRUE; + return boolValue; } @@ -136,7 +134,7 @@ public class GAGrid { */ private Chromosome createChromosome(int numberOfGenes) { long[] genes = new long[numberOfGenes]; - List<Long> keys = new ArrayList(); + List<Long> keys = new ArrayList<Long>(); int k = 0; while (k < numberOfGenes) { long key = selectGene(k); @@ -157,7 +155,7 @@ public class GAGrid { * @param leastFitKeys List of primary keys for Chromsomes that are considered 'least fit' */ private void crossover(List<Long> leastFitKeys) { - Boolean boolValue = this.ignite.compute().execute(new CrossOverTask(this.config), leastFitKeys); + this.ignite.compute().execute(new CrossOverTask(this.config), leastFitKeys); } /** @@ -186,8 +184,6 @@ public class GAGrid { fittestChomosome = populationCache.get(keys.get(0)); - List<Gene> genes = GAGridUtils.getGenesForChromosome(ignite, fittestChomosome); - // while NOT terminateCondition met while (!(config.getTerminateCriteria().isTerminationConditionMet(fittestChomosome, averageFitnessScore, generationCount))) { @@ -227,13 +223,12 @@ public class GAGrid { * @return List of primary keys for chromosomes. */ private List<Long> getChromosomesByFittest() { - List<Long> orderChromKeysByFittest = new ArrayList(); + List<Long> orderChromKeysByFittest = new ArrayList<Long>(); String orderDirection = "desc"; - if(config.isHigherFitnessValueFitter()==false) - { - orderDirection = "asc"; - } + if (!config.isHigherFitnessValueFitter()) + orderDirection = "asc"; + String fittestSQL = "select _key from Chromosome order by fitnessScore " + orderDirection; // Execute query to retrieve keys for ALL Chromosomes by fittnessScore @@ -312,7 +307,7 @@ public class GAGrid { * @param leastFitKeys List of primary keys for Chromosomes that are considered 'least fit'. */ private void mutation(List<Long> leastFitKeys) { - Boolean boolValue = this.ignite.compute().execute(new MutateTask(this.config), leastFitKeys); + this.ignite.compute().execute(new MutateTask(this.config), leastFitKeys); } /** @@ -348,7 +343,6 @@ public class GAGrid { * @param keys * @return List of keys */ - private List<Long> selectByTruncation(List<Long> keys) { double truncatePercentage = this.config.getTruncateRate(); @@ -364,12 +358,10 @@ public class GAGrid { * @return Primary key of respective Gene chosen */ private long selectGene(int k) { - if (config.getChromosomeCriteria() == null) { + if (config.getChromosomeCriteria() == null) return (selectAnyGene()); - } - else { + else return (selectGeneByChromsomeCriteria(k)); - } } /** @@ -431,7 +423,7 @@ public class GAGrid { List<Long> fittestKeys = getFittestKeysForTruncation(chromosomeKeys); - Boolean boolValue = copyFitterChromosomesToPopulation(fittestKeys, selectedKeys); + copyFitterChromosomesToPopulation(fittestKeys, selectedKeys); // copy more fit keys to rest of population break; http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Gene.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Gene.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Gene.java index e793547..d585330 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Gene.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/Gene.java @@ -35,7 +35,7 @@ import org.apache.ignite.cache.query.annotations.QuerySqlField; * </p> */ public class Gene { - + /** primary key of Gene */ private static final AtomicLong ID_GEN = new AtomicLong(); /** Id (indexed). */ @@ -78,8 +78,8 @@ public class Gene { return id; } - @Override - public String toString() { + /** {@inheritDoc} */ + @Override public String toString() { return "Gene [id=" + id + ", value=" + value + "]"; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/IFitnessFunction.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/IFitnessFunction.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/IFitnessFunction.java index ef031ec..fa84946 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/IFitnessFunction.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/IFitnessFunction.java @@ -28,9 +28,7 @@ import java.util.List; * * </p> */ - public interface IFitnessFunction { - /** * @param genes Genes within an individual Chromosome * @return Fitness score http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateJob.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateJob.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateJob.java index ed3f0d9..b03e7ca 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateJob.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateJob.java @@ -17,11 +17,7 @@ package org.apache.ignite.ml.genetic; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; -import java.util.Map; - import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; @@ -35,13 +31,13 @@ import org.apache.ignite.ml.genetic.parameter.GAGridConstants; * Responsible for applying mutation on respective Chromosome based on mutation Rate */ public class MutateJob extends ComputeJobAdapter { - /** primary key of Chromosome to mutate **/ private Long key; /** primary keys of genes to be used in mutation **/ private List<Long> mutatedGeneKeys; + /** Ignite instance */ @IgniteInstanceResource private Ignite ignite = null; @@ -65,7 +61,6 @@ public class MutateJob extends ComputeJobAdapter { * @return Boolean value */ public Boolean execute() throws IgniteException { - // TODO Auto-generated method stub IgniteCache<Long, Chromosome> populationCache = ignite.cache(GAGridConstants.POPULATION_CACHE); @@ -75,9 +70,8 @@ public class MutateJob extends ComputeJobAdapter { for (int k = 0; k < this.mutatedGeneKeys.size(); k++) { // Mutate gene based on MutatonRate - if (this.mutationRate > Math.random()) { + if (this.mutationRate > Math.random()) geneKeys[k] = this.mutatedGeneKeys.get(k); - } } chromosome.setGenes(geneKeys); http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateTask.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateTask.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateTask.java index c72a73a..3a7b0c5 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateTask.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/MutateTask.java @@ -48,10 +48,11 @@ import org.apache.ignite.ml.genetic.parameter.GAGridConstants; * chromosomes reside.<br/> */ public class MutateTask extends ComputeTaskAdapter<List<Long>, Boolean> { - + /** Ignite instance */ @IgniteInstanceResource private Ignite ignite = null; + /** GAConfiguration */ private GAConfiguration config = null; /** @@ -67,14 +68,12 @@ public class MutateTask extends ComputeTaskAdapter<List<Long>, Boolean> { * @return Gene primary keys */ private List<Long> getMutatedGenes() { - List<Long> mutatedGenes = new ArrayList(); + List<Long> mutatedGenes = new ArrayList<Long>(); config.getChromosomeLength(); - for (int i = 0; i < config.getChromosomeLength(); i++) { - // Gene gene=config.getGenePool().get(selectRandomIndex(config.getGenePool().size())); + for (int i = 0; i < config.getChromosomeLength(); i++) mutatedGenes.add(selectGene(i)); - } - + return mutatedGenes; } @@ -139,12 +138,10 @@ public class MutateTask extends ComputeTaskAdapter<List<Long>, Boolean> { * @return Primary key of Gene */ private long selectGene(int k) { - if (config.getChromosomeCriteria() == null) { + if (config.getChromosomeCriteria() == null) return (selectAnyGene()); - } - else { + else return (selectGeneByChromsomeCriteria(k)); - } } /** @@ -154,7 +151,7 @@ public class MutateTask extends ComputeTaskAdapter<List<Long>, Boolean> { * @return Primary key of Gene */ private long selectGeneByChromsomeCriteria(int k) { - List<Gene> genes = new ArrayList(); + List<Gene> genes = new ArrayList<Gene>(); StringBuffer sbSqlClause = new StringBuffer("_val like '"); sbSqlClause.append("%"); http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionJob.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionJob.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionJob.java index 4404e5c..1317b0e 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionJob.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionJob.java @@ -17,11 +17,7 @@ package org.apache.ignite.ml.genetic; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; -import java.util.Map; - import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; @@ -35,13 +31,13 @@ import org.apache.ignite.ml.genetic.parameter.GAGridConstants; * Responsible for performing truncate selection */ public class TruncateSelectionJob extends ComputeJobAdapter { - /** primary key of Chromosome to mutate */ private Long key; /** primary keys of genes to be used in mutation */ private List<Long> mutatedGeneKeys; + /** Ignite instance */ @IgniteInstanceResource private Ignite ignite = null; @@ -60,7 +56,6 @@ public class TruncateSelectionJob extends ComputeJobAdapter { * @return Boolean value */ public Boolean execute() throws IgniteException { - // TODO Auto-generated method stub IgniteCache<Long, Chromosome> populationCache = ignite.cache(GAGridConstants.POPULATION_CACHE); @@ -69,9 +64,7 @@ public class TruncateSelectionJob extends ComputeJobAdapter { long[] geneKeys = chromosome.getGenes(); for (int k = 0; k < this.mutatedGeneKeys.size(); k++) { - { - geneKeys[k] = this.mutatedGeneKeys.get(k); - } + geneKeys[k] = this.mutatedGeneKeys.get(k); } chromosome.setGenes(geneKeys); http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionTask.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionTask.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionTask.java index 7a5817f..ee7d260 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionTask.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/TruncateSelectionTask.java @@ -18,7 +18,6 @@ package org.apache.ignite.ml.genetic; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -37,22 +36,16 @@ import org.apache.ignite.compute.ComputeJobResult; import org.apache.ignite.compute.ComputeJobResultPolicy; import org.apache.ignite.compute.ComputeTaskAdapter; import org.apache.ignite.resources.IgniteInstanceResource; - -import org.apache.ignite.ml.genetic.parameter.GAConfiguration; import org.apache.ignite.ml.genetic.parameter.GAGridConstants; /** * Responsible for performing truncate selection. */ - public class TruncateSelectionTask extends ComputeTaskAdapter<List<Long>, Boolean> { - + /** Ignite resource */ @IgniteInstanceResource private Ignite ignite = null; - /** GAConfiguraiton */ - private GAConfiguration config = null; - /** fittest keys */ private List<Long> fittestKeys = null; @@ -64,8 +57,7 @@ public class TruncateSelectionTask extends ComputeTaskAdapter<List<Long>, Boolea * @param fittestKeys List of long * @param numberOfCopies Number of Copies */ - public TruncateSelectionTask(GAConfiguration config, List<Long> fittestKeys, int numberOfCopies) { - this.config = config; + public TruncateSelectionTask(List<Long> fittestKeys, int numberOfCopies) { this.fittestKeys = fittestKeys; this.numberOfCopies = numberOfCopies; } @@ -103,13 +95,13 @@ public class TruncateSelectionTask extends ComputeTaskAdapter<List<Long>, Boolea * @return List of lists containing keys */ private List<List<Long>> getEnhancedPopulation() { - List<List<Long>> list = new ArrayList(); + List<List<Long>> list = new ArrayList<List<Long>>(); for (Long key : fittestKeys) { Chromosome copy = getChromosome(key); for (int i = 0; i < numberOfCopies; i++) { long[] thegenes = copy.getGenes(); - List<Long> geneList = new ArrayList(); + List<Long> geneList = new ArrayList<Long>(); for (int k = 0; k < copy.getGenes().length; k++) { geneList.add(thegenes[k]); } @@ -150,7 +142,6 @@ public class TruncateSelectionTask extends ComputeTaskAdapter<List<Long>, Boolea * @return Boolean value */ public Boolean reduce(List<ComputeJobResult> list) throws IgniteException { - // TODO Auto-generated method stub return Boolean.TRUE; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/cache/GeneCacheConfig.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/cache/GeneCacheConfig.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/cache/GeneCacheConfig.java index 1976941..c5302ee 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/cache/GeneCacheConfig.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/cache/GeneCacheConfig.java @@ -30,9 +30,7 @@ import org.apache.ignite.ml.genetic.parameter.GAGridConstants; * * cache maintains full population of genes. */ - public class GeneCacheConfig { - /** * @return Cache Configuration */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/cache/PopulationCacheConfig.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/cache/PopulationCacheConfig.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/cache/PopulationCacheConfig.java index bc7fcd6..cae7c1a 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/cache/PopulationCacheConfig.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/cache/PopulationCacheConfig.java @@ -30,9 +30,7 @@ import org.apache.ignite.ml.genetic.parameter.GAGridConstants; * * cache population of chromosomes (ie: potential solutions) */ - public class PopulationCacheConfig { - /** * @return Cache Configuration */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/functions/GAGridFunction.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/functions/GAGridFunction.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/functions/GAGridFunction.java index 3848b68..b3e4fed 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/functions/GAGridFunction.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/functions/GAGridFunction.java @@ -35,15 +35,10 @@ import org.apache.ignite.ml.genetic.utils.GAGridUtils; * Responsible for providing custom SQL functions to retrieve optimization results */ public class GAGridFunction { - - /** GAConfiguration **/ - private GAConfiguration config = null; - - /** + /** * @param config GA Configuration */ - public GAGridFunction(GAConfiguration config) { - this.config = config; + public GAGridFunction() { } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/ChromosomeCriteria.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/ChromosomeCriteria.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/ChromosomeCriteria.java index ffffd43..bc4b839 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/ChromosomeCriteria.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/ChromosomeCriteria.java @@ -25,16 +25,15 @@ import java.util.List; * Responsible for describing the characteristics of an individual Chromosome. */ public class ChromosomeCriteria { - /** List of criteria for a Chromosome */ - private List<String> criteria = new ArrayList(); + private List<String> criteria = new ArrayList<String>(); /** * Retrieve criteria * * @return List of strings */ - public List getCriteria() { + public List<String> getCriteria() { return criteria; } @@ -43,7 +42,7 @@ public class ChromosomeCriteria { * * @param criteria List of criteria to be applied for a Chromosome ;Use format "name=value", ie: "coinType=QUARTER" */ - public void setCriteria(List criteria) { + public void setCriteria(List<String> criteria) { this.criteria = criteria; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAConfiguration.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAConfiguration.java index c66044e..70c7ad9 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAConfiguration.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAConfiguration.java @@ -39,7 +39,7 @@ import org.apache.ignite.ml.genetic.IFitnessFunction; * </p> */ public class GAConfiguration { - + /** Selection method */ private GAGridConstants.SELECTION_METHOD selectionMethod = null; /** Criteria used to describe a chromosome */ @@ -76,7 +76,7 @@ public class GAConfiguration { private int populationSize = 500; /** Gene pool is the sum of ALL genes utilized to create chromsomes */ - private List<Gene> genePool = new ArrayList(); + private List<Gene> genePool = new ArrayList<Gene>(); /** Number of genes within a chromosome */ private int chromosomeLength = 0; @@ -297,7 +297,7 @@ public class GAConfiguration { /** * Retreive the termination criteria * - * @return Termination Criteria + * @return Termination Criteria */ public ITerminateCriteria getTerminateCriteria() { return terminateCriteria; http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAGridConstants.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAGridConstants.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAGridConstants.java index 41be973..9a5bd66 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAGridConstants.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/parameter/GAGridConstants.java @@ -21,7 +21,6 @@ package org.apache.ignite.ml.genetic.parameter; * GAGridConstants */ public interface GAGridConstants { - /** populationCache constant */ public static final String POPULATION_CACHE = "populationCache"; @@ -31,7 +30,6 @@ public interface GAGridConstants { /** Selection Method type **/ public static enum SELECTION_METHOD { SELECTON_METHOD_ELETISM, SELECTION_METHOD_TRUNCATION - } + }; - ; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java index d951ea3..326cdda 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/utils/GAGridUtils.java @@ -26,20 +26,17 @@ import javax.cache.Cache.Entry; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.query.QueryCursor; -import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.SqlQuery; import org.apache.ignite.ml.genetic.Chromosome; import org.apache.ignite.ml.genetic.Gene; import org.apache.ignite.ml.genetic.cache.PopulationCacheConfig; -import org.apache.ignite.ml.genetic.parameter.GAConfiguration; import org.apache.ignite.ml.genetic.parameter.GAGridConstants; /** * GA Grid Helper routines */ public class GAGridUtils { - /** * Retrieve chromosomes * @@ -48,7 +45,7 @@ public class GAGridUtils { * @return List of Chromosomes */ public static List<Chromosome> getChromosomes(Ignite ignite, String query) { - List<Chromosome> chromosomes = new ArrayList(); + List<Chromosome> chromosomes = new ArrayList<Chromosome>(); IgniteCache<Long, Chromosome> populationCache = ignite.getOrCreateCache(PopulationCacheConfig.populationCache()); @@ -68,7 +65,7 @@ public class GAGridUtils { * @return List of Genes */ public static List<Gene> getGenesForChromosome(Ignite ignite, Chromosome chromosome) { - List<Gene> genes = new ArrayList(); + List<Gene> genes = new ArrayList<Gene>(); IgniteCache<Long, Gene> cache = ignite.cache(GAGridConstants.GENE_CACHE); StringBuffer sbSqlClause = new StringBuffer(); sbSqlClause.append("_key IN "); @@ -96,9 +93,8 @@ public class GAGridUtils { * @param chromosome Chromosome * @return List of Genes */ - public static List<Gene> getGenesInOrderForChromosome(Ignite ignite, Chromosome chromosome) { - List<Gene> genes = new ArrayList(); + List<Gene> genes = new ArrayList<Gene>(); IgniteCache<Long, Gene> cache = ignite.cache(GAGridConstants.GENE_CACHE); long[] primaryKeys = chromosome.getGenes(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridCalculateFitnessTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridCalculateFitnessTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridCalculateFitnessTest.java index 16e4dda..5cc6ffe 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridCalculateFitnessTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridCalculateFitnessTest.java @@ -37,9 +37,13 @@ import org.junit.Test; * Calculate Fitness Test */ public class GAGridCalculateFitnessTest { - + /** Ignite instance */ private Ignite ignite = null; + + /** GAGrid **/ private GAGrid gaGrid = null; + + /** GAConfiguraton */ private GAConfiguration gaConfig = null; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b97b1eec/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridInitializePopulationTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridInitializePopulationTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridInitializePopulationTest.java index f4f9ca4..f3023ed 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridInitializePopulationTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/genetic/GAGridInitializePopulationTest.java @@ -36,11 +36,14 @@ import org.junit.Test; /** * Initialize Gene and Chromosome Test */ - public class GAGridInitializePopulationTest { - + /** Ignite instance */ private Ignite ignite = null; + + /** GAGrid **/ private GAGrid gaGrid = null; + + /** GAConfiguraton */ private GAConfiguration gaConfig = null; @Before