diff --git a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/connection/types/FullConnection.scala b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/connection/types/FullConnection.scala index 45eae4916d1bb11f22e1512e6a9b2dbd5574eb1e..b4ffce30cb6fe7a71b9d22ea70d59e3ab96ca51e 100644 --- a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/connection/types/FullConnection.scala +++ b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/connection/types/FullConnection.scala @@ -5,7 +5,7 @@ import fr.univ_lille.cristal.emeraude.n2s3.features.builder.{NeuronGroupRef, Neu import fr.univ_lille.cristal.emeraude.n2s3.features.builder.connection.{Connection, ConnectionPolicy} /** - * Created by falezp on 23/05/16. + * Connects all entities inside a [[NeuronGroupRef]] to all entities inside another [[NeuronGroupRef]] */ class FullConnection(neuronConnectionConstructor : Option[() => NeuronConnection]) extends ConnectionPolicy { diff --git a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/connection/types/FullExceptSelfConnection.scala b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/connection/types/FullExceptSelfConnection.scala index 97ef7f9b914898a8485289bf30f9497f7245c976..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/connection/types/FullExceptSelfConnection.scala +++ b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/connection/types/FullExceptSelfConnection.scala @@ -1,33 +0,0 @@ -package fr.univ_lille.cristal.emeraude.n2s3.features.builder.connection.types - -import fr.univ_lille.cristal.emeraude.n2s3.features.builder.{NeuronGroupRef, NeuronIterable, NeuronRef} -import fr.univ_lille.cristal.emeraude.n2s3.features.builder.connection.{Connection, ConnectionPolicy} - -/** - * Created by falezp on 23/05/16. - */ -class FullExceptSelfConnection extends ConnectionPolicy { - - def generate(from : NeuronIterable, to : NeuronIterable) = { - assert(from.size == to.size) - for { - (in, in_index) <- from.toSeq.zipWithIndex - (out, out_index) <- to.toSeq.zipWithIndex - if in_index != out_index - } yield Connection(in, out) - } - - override def generate(from: NeuronGroupRef, to: NeuronGroupRef): Traversable[Connection] = { - assert(from.neuronPaths.size == to.neuronPaths.size) - for { - in <- from.neurons - out <- to.neurons - if this.connects(in, out) - } yield Connection(in.actorPath.get, out.actorPath.get) - } - - /** ****************************************************************************************************************** - * Testing - * *****************************************************************************************************************/ - override def connects(aNeuron: NeuronRef, anotherNeuron: NeuronRef): Boolean = aNeuron.index != anotherNeuron.index -} \ No newline at end of file diff --git a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/connection/types/WinnerTakeAllConnection.scala b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/connection/types/WinnerTakeAllConnection.scala index 121d7789185810658ae8f7fd11d9bdd32bb5bd72..e012c3cbffbad5a9d13910b857f73492d5aaf11d 100644 --- a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/connection/types/WinnerTakeAllConnection.scala +++ b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/connection/types/WinnerTakeAllConnection.scala @@ -11,12 +11,12 @@ class WinnerTakeAllConnection(inhibitoryConnection : () => NeuronConnection) ext def generate(from : NeuronIterable, to : NeuronIterable) = { new OneToOneConnection().generate(from, to)++ - new FullExceptSelfConnection().generate(to, from).map(co => Connection(co.from, co.to, Some(inhibitoryConnection()))) + new FullConnection().generate(to, from).map(co => Connection(co.from, co.to, Some(inhibitoryConnection()))) } override def generate(from: NeuronGroupRef, to: NeuronGroupRef): Traversable[Connection] = { new OneToOneConnection().generate(from, to)++ - new FullExceptSelfConnection().generate(to, from).map(co => Connection(co.from, co.to, Some(inhibitoryConnection()))) + new FullConnection().generate(to, from).map(co => Connection(co.from, co.to, Some(inhibitoryConnection()))) } /** ******************************************************************************************************************