From dbf00c1975201ee9dff91dee29353c4be1d905d6 Mon Sep 17 00:00:00 2001 From: guille <guillermopolito@gmail.com> Date: Thu, 27 Oct 2016 16:33:47 +0200 Subject: [PATCH] Added Scaladocs to Spike. Merged files Spike, ShapelessSpike and WeightedSpike --- .../n2s3/core/actors/ShapelessSpike.scala | 6 ------ .../emeraude/n2s3/core/actors/Spike.scala | 16 +++++++++++++--- .../n2s3/core/actors/WeightedSpike.scala | 6 ------ 3 files changed, 13 insertions(+), 15 deletions(-) delete mode 100644 n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/actors/ShapelessSpike.scala delete mode 100644 n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/actors/WeightedSpike.scala diff --git a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/actors/ShapelessSpike.scala b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/actors/ShapelessSpike.scala deleted file mode 100644 index 25c8207e..00000000 --- a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/actors/ShapelessSpike.scala +++ /dev/null @@ -1,6 +0,0 @@ -package fr.univ_lille.cristal.emeraude.n2s3.core.actors - -/** - * Created by guille on 10/14/16. - */ -object ShapelessSpike extends Spike diff --git a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/actors/Spike.scala b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/actors/Spike.scala index 4eeeda37..12397c12 100644 --- a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/actors/Spike.scala +++ b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/actors/Spike.scala @@ -2,7 +2,17 @@ package fr.univ_lille.cristal.emeraude.n2s3.core.actors import fr.univ_lille.cristal.emeraude.n2s3.support.actors.Message -/*********************************************************************************************** - * Basic class for all spike message type - **********************************************************************************************/ +/** + * Basic class for all spike message type + */ abstract class Spike extends Message + +/** + * Spike with no extra information + */ +object ShapelessSpike extends Spike + +/** + * Spike containing a weight + */ +case class WeightedSpike(weight : Float) extends Spike diff --git a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/actors/WeightedSpike.scala b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/actors/WeightedSpike.scala deleted file mode 100644 index 529574fa..00000000 --- a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/actors/WeightedSpike.scala +++ /dev/null @@ -1,6 +0,0 @@ -package fr.univ_lille.cristal.emeraude.n2s3.core.actors - -/** - * Created by guille on 10/14/16. - */ -case class WeightedSpike(val weight : Float) extends Spike -- GitLab