From 7f89d81e6f8a5ce82d42c3b852b5219edaa4b86c Mon Sep 17 00:00:00 2001 From: Eduardo Pedroni Date: Wed, 7 May 2014 18:38:27 +0100 Subject: Removed reflection for now, added fitness orientation support --- .classpath | 4 - doc/allclasses-frame.html | 2 +- doc/allclasses-noframe.html | 2 +- doc/index-files/index-12.html | 4 +- doc/index-files/index-17.html | 2 +- doc/index-files/index-3.html | 6 +- doc/index-files/index-7.html | 2 +- doc/jcgp/backend/population/Chromosome.html | 12 +- doc/jcgp/backend/population/Input.html | 4 +- doc/jcgp/backend/population/MutableElement.html | 30 ++-- doc/jcgp/backend/population/Node.html | 24 +-- doc/jcgp/backend/population/Output.html | 18 +-- .../backend/population/class-use/Connection.html | 2 +- .../population/class-use/MutableElement.html | 38 ++--- doc/jcgp/backend/population/package-frame.html | 2 +- doc/jcgp/backend/population/package-summary.html | 4 +- doc/jcgp/backend/population/package-tree.html | 6 +- doc/jcgp/backend/population/package-use.html | 4 +- doc/overview-tree.html | 6 +- res/README | 2 +- src/jcgp/JCGP.java | 171 ++++----------------- src/jcgp/backend/modules/mutator/PointMutator.java | 6 +- src/jcgp/backend/modules/problem/BestFitness.java | 18 +++ .../modules/problem/DigitalCircuitProblem.java | 14 +- src/jcgp/backend/modules/problem/Problem.java | 2 +- .../modules/problem/SymbolicRegressionProblem.java | 16 +- .../backend/modules/problem/TestCaseProblem.java | 19 +++ src/jcgp/backend/parsers/ChromosomeParser.java | 1 - src/jcgp/backend/population/Chromosome.java | 4 +- src/jcgp/backend/population/Mutable.java | 53 +++++++ src/jcgp/backend/population/MutableElement.java | 53 ------- src/jcgp/backend/population/Node.java | 6 +- src/jcgp/backend/population/Output.java | 6 +- src/jcgp/backend/tests/ChromosomeTests.java | 6 +- 34 files changed, 223 insertions(+), 326 deletions(-) create mode 100644 src/jcgp/backend/modules/problem/BestFitness.java create mode 100644 src/jcgp/backend/population/Mutable.java delete mode 100644 src/jcgp/backend/population/MutableElement.java diff --git a/.classpath b/.classpath index 591a691..3e0fb27 100644 --- a/.classpath +++ b/.classpath @@ -3,9 +3,5 @@ - - - - diff --git a/doc/allclasses-frame.html b/doc/allclasses-frame.html index c791e91..4d8b0d4 100644 --- a/doc/allclasses-frame.html +++ b/doc/allclasses-frame.html @@ -69,7 +69,7 @@
  • ModifiableResources
  • Module
  • MuPlusLambda
  • -
  • MutableElement
  • +
  • Mutable
  • Mutator
  • Node
  • Output
  • diff --git a/doc/allclasses-noframe.html b/doc/allclasses-noframe.html index 8f35f98..c5c077a 100644 --- a/doc/allclasses-noframe.html +++ b/doc/allclasses-noframe.html @@ -69,7 +69,7 @@
  • ModifiableResources
  • Module
  • MuPlusLambda
  • -
  • MutableElement
  • +
  • Mutable
  • Mutator
  • Node
  • Output
  • diff --git a/doc/index-files/index-12.html b/doc/index-files/index-12.html index d69ad68..267c417 100644 --- a/doc/index-files/index-12.html +++ b/doc/index-files/index-12.html @@ -117,9 +117,9 @@
    Creates a new instance of MuPlusLambda.
    -
    MutableElement - Interface in jcgp.backend.population
    +
    Mutable - Interface in jcgp.backend.population
    -
    MutableElement declares the expected behaviour of any +
    Mutable declares the expected behaviour of any part of a chromosome that is mutable, more specifically nodes or outputs.
    diff --git a/doc/index-files/index-17.html b/doc/index-files/index-17.html index d078f88..b609fb2 100644 --- a/doc/index-files/index-17.html +++ b/doc/index-files/index-17.html @@ -110,7 +110,7 @@
     
    setColumns(int) - Method in class jcgp.backend.resources.ModifiableResources
     
    -
    setConnection(int, Connection) - Method in interface jcgp.backend.population.MutableElement
    +
    setConnection(int, Connection) - Method in interface jcgp.backend.population.Mutable
    This method sets the indexed connection to the specified new connection.
    diff --git a/doc/index-files/index-3.html b/doc/index-files/index-3.html index 2833121..7b7d4d2 100644 --- a/doc/index-files/index-3.html +++ b/doc/index-files/index-3.html @@ -141,7 +141,7 @@
    Creates a deep copy of the specified chromosome in the this instance.
    -
    copyOf(MutableElement) - Method in interface jcgp.backend.population.MutableElement
    +
    copyOf(Mutable) - Method in interface jcgp.backend.population.Mutable
    Asserts if the specified element is a copy of the elements this is called on.
    @@ -162,9 +162,9 @@ not necessarily true since it is possible that a == c.
    -
    copyOf(MutableElement) - Method in class jcgp.backend.population.Node
    +
    copyOf(Mutable) - Method in class jcgp.backend.population.Node
     
    -
    copyOf(MutableElement) - Method in class jcgp.backend.population.Output
    +
    copyOf(Mutable) - Method in class jcgp.backend.population.Output
     
    Cosine() - Constructor for class jcgp.backend.function.SymbolicRegressionFunctions.Cosine
     
    diff --git a/doc/index-files/index-7.html b/doc/index-files/index-7.html index f92083f..30395b3 100644 --- a/doc/index-files/index-7.html +++ b/doc/index-files/index-7.html @@ -408,7 +408,7 @@
    Gets the next random integer using the experiment's random number generator.
    -
    getRandomMutableElement() - Method in class jcgp.backend.population.Chromosome
    +
    getRandomMutable() - Method in class jcgp.backend.population.Chromosome
    This method is useful for mutating chromosomes.
    diff --git a/doc/jcgp/backend/population/Chromosome.html b/doc/jcgp/backend/population/Chromosome.html index ffcb6f8..75ec3c1 100644 --- a/doc/jcgp/backend/population/Chromosome.html +++ b/doc/jcgp/backend/population/Chromosome.html @@ -274,8 +274,8 @@ implements java.lang.Comparable< -MutableElement -getRandomMutableElement() +Mutable +getRandomMutable()
    This method is useful for mutating chromosomes.
    @@ -509,15 +509,15 @@ implements java.lang.Comparable< +
    • -

      getRandomMutableElement

      -
      public MutableElement getRandomMutableElement()
      +

      getRandomMutable

      +
      public Mutable getRandomMutable()
      This method is useful for mutating chromosomes. It returns any - random MutableElement out of the chromosome with equal + random Mutable out of the chromosome with equal probability.
      Returns:
      diff --git a/doc/jcgp/backend/population/Input.html b/doc/jcgp/backend/population/Input.html index 1ac3b97..f78663e 100644 --- a/doc/jcgp/backend/population/Input.html +++ b/doc/jcgp/backend/population/Input.html @@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";