diff --git a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/NeuronIterable.scala b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/NeuronIterable.scala index 80c36364ebbf102ef950b7303b47f454d93d9128..8bd5aba1d1a26ab7d36954a42445c25cd5e16fe2 100644 --- a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/NeuronIterable.scala +++ b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/NeuronIterable.scala @@ -6,6 +6,7 @@ import fr.univ_lille.cristal.emeraude.n2s3.features.io.input.Shape /** * Created by falezp on 23/05/16. */ +@deprecated("Use the correct Neuron and NeuronGroup refs instead", "4/8/2016") abstract class NeuronIterable extends Traversable[NetworkEntityPath] { val shape : Shape def dimensionNumber = shape.dimensionNumber @@ -16,19 +17,8 @@ abstract class NeuronIterable extends Traversable[NetworkEntityPath] { def apply(index : Int*) = get(index) } -abstract class LinearNeuronIterable(neurons : Seq[NetworkEntityPath]) extends NeuronIterable { - val shape : Shape = Shape(neurons.size) - def get(index : Seq[Int]) : NetworkEntityPath = { - assert(index.size == 1) - neurons(index.head) - } - - def getDimension(index : Int*) : NeuronIterable = throw new UnsupportedOperationException - - def firstDimension : Seq[NeuronIterable] = throw new UnsupportedOperationException -} - -case class ShapedNeuronIterable(neurons : Seq[NetworkEntityPath], val shape : Shape) extends NeuronIterable { +@deprecated("Use the correct Neuron and NeuronGroup refs instead", "4/8/2016") +case class ShapedNeuronIterable(neurons : Seq[NetworkEntityPath], shape : Shape) extends NeuronIterable { assert(this.shape.product == neurons.size) diff --git a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/NeuronLayer.scala b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/NeuronLayer.scala index 2dd0dbfe741df986dae499204a05dd26a3a70ff4..be583efb0b0fbb6601a09c0165683915cb0068e6 100644 --- a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/NeuronLayer.scala +++ b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/NeuronLayer.scala @@ -6,10 +6,11 @@ import fr.univ_lille.cristal.emeraude.n2s3.features.io.input.Shape import fr.univ_lille.cristal.emeraude.n2s3.features.learning.{BackPropagationMethod, DefaultBackPropagationMethod} import scala.collection.mutable + /** * Created by falezp on 23/05/16. */ - +@deprecated("Use the correct Neuron and NeuronGroup refs instead", "4/8/2016") class NeuronLayer(container : Option[NetworkEntityPath], neurons : Seq[NetworkEntityPath], shape : Shape) extends ShapedNeuronIterable(neurons, shape) { var backPropagationMethod : BackPropagationMethod = _