-
Notifications
You must be signed in to change notification settings - Fork 101
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Gary Pamparà <gpampara@gmail.com>
- Loading branch information
Showing
10 changed files
with
178 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| package cilib | ||
| package de | ||
|
|
||
| import spire.math._ | ||
| import spire.algebra._ | ||
| import spire.implicits._ | ||
|
|
||
| import scalaz._ | ||
| import Scalaz._ | ||
| import monocle._ | ||
| import Monocle._ | ||
|
|
||
| object DE { | ||
|
|
||
| def de[A:Numeric:Rng]( | ||
| p_r: Double, | ||
| p_m: Double, | ||
| targetSelection: List[Individual[A]] => RVar[Individual[A]] | ||
| //y: N, | ||
| //z: Int | ||
| ): List[Individual[A]] => Individual[A] => Step[A,Individual[A]] = | ||
| collection => x => for { | ||
| evaluated <- Entity.eval((a: Position[A]) => a)(x) | ||
| trial <- Step.pointR(basicMutation(Numeric[A].fromDouble(p_m), targetSelection, collection, x)) | ||
| pivots <- Step.pointR(bin(p_r, evaluated)) | ||
| offspring = crossover(x, trial, pivots) | ||
| evaluatedOffspring <- Entity.eval((a: Position[A]) => a)(offspring) | ||
| fittest <- better(evaluated, evaluatedOffspring) | ||
| } yield fittest | ||
|
|
||
|
|
||
| // Duplicated from PSO..... | ||
| def better[A](a: Individual[A], b: Individual[A]): Step[A,Individual[A]] = | ||
| Step.withCompare(comp => RVar.point(Comparison.compare(a, b).apply(comp))) | ||
|
|
||
|
|
||
| def basicMutation[A:Rng]( | ||
| p_m: A, | ||
| selection: List[Individual[A]] => RVar[Individual[A]], | ||
| collection: List[Individual[A]], | ||
| x: Individual[A]): RVar[Position[A]] = { | ||
| def createPairs[Z](acc: List[(Z, Z)], xs: List[Z]): List[(Z, Z)] = | ||
| xs match { | ||
| case Nil => acc | ||
| case a :: b :: xss => createPairs((a, b) :: acc, xss) | ||
| case _ => sys.error("ugg") | ||
| } | ||
|
|
||
| val target: RVar[Individual[A]] = selection(collection) | ||
| val filtered = target.map(t => collection.filterNot(a => List(t,x).contains(a))) | ||
| val pairs: RVar[List[Position[A]]] = | ||
| filtered.flatMap(RVar.shuffle) | ||
| .map(a => createPairs(List.empty[(Individual[A],Individual[A])], a.take(2)) | ||
| .map(z => z._1.pos - z._2.pos)) | ||
|
|
||
| for { | ||
| t <- target | ||
| p <- pairs | ||
| } yield p.foldLeft(t.pos)((a,c) => a + (p_m *: c)) | ||
| } | ||
|
|
||
|
|
||
| def crossover[A](target: Individual[A], trial: Position[A], pivots: NonEmptyList[Boolean]) = | ||
| target.copy( | ||
| pos = { | ||
| target.pos.zip(trial).zip(Position(pivots, trial.boundary)).map { case ((a,b), p) => // Position apply function :( | ||
| if (p) b else a | ||
| } | ||
| }) | ||
|
|
||
|
|
||
| // This is not a nice implementation ??? -> it feels far too low level and inelegant | ||
| def bin[A:Rng]( | ||
| p_r: Double, | ||
| parent: Individual[A] | ||
| ): RVar[NonEmptyList[Boolean]] = | ||
| for { | ||
| j <- Dist.uniformInt(spire.math.Interval(0, parent.pos.pos.size - 1)) | ||
| l <- parent.pos.pos.toList.traverse(_ => Dist.stdUniform.map(_ < p_r)) | ||
| } yield { | ||
| val t: List[Boolean] = l.applyOptional(index(j)).set(true) | ||
| NonEmptyList(t.head, t.tail: _*) | ||
| } | ||
|
|
||
| // def exp[A:Rng]( | ||
| // p_r: Double, | ||
| // parent: Individual[A] | ||
| // ): RVar[List[Boolean]] = | ||
| // for { | ||
| // start <- Dist.uniformInt(0, parent.pos.pos.size - 1) | ||
| // length = parent.pos.pos.size - 1 | ||
| // circular = Stream.continually((0 to length).toList).drop(start).take(length) | ||
| // list <- | ||
|
|
||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package cilib | ||
|
|
||
| package object de { | ||
|
|
||
| type Individual[A] = Entity[Unit, A] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| sbt.version=0.13.13 | ||
| sbt.version=0.13.15 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters