Delete the MergeConfiguration dropout property

Author: simone-cangialosi

src/main/kotlin/com/kotlinnlp/simplednn/core/layers/models/merge/mergeconfig/AffineMerge.kt

@@ -11,19 +11,16 @@ import com.kotlinnlp.simplednn.core.functionalities.activations.ActivationFuncti
 import com.kotlinnlp.simplednn.core.layers.LayerType
 
 /**
- * A data class that defines the configuration of an Affine layer.
+ * The Affine merge layer configuration.
  *
  * @property outputSize the size of the merged output
  * @property activationFunction the output activation function
- * @property dropout the probability of dropout
  */
 class AffineMerge(
   outputSize: Int,
-  activationFunction: ActivationFunction? = null,
-  dropout: Double = 0.0
-) : OpenOutputMerge(
+  activationFunction: ActivationFunction? = null
+) : VariableOutputMergeConfig(
   type = LayerType.Connection.Affine,
-  dropout = dropout,
   outputSize = outputSize,
   activationFunction = activationFunction
 )

src/main/kotlin/com/kotlinnlp/simplednn/core/layers/models/merge/mergeconfig/AvgMerge.kt

@@ -10,8 +10,6 @@ package com.kotlinnlp.simplednn.core.layers.models.merge.mergeconfig
 import com.kotlinnlp.simplednn.core.layers.LayerType
 
 /**
- * A data class that defines the configuration of an Avg layer.
- *
- * @property dropout the probability of dropout
+ * The Avg merge layer configuration.
  */
-class AvgMerge(dropout: Double = 0.0) : MergeConfiguration(type = LayerType.Connection.Avg, dropout = dropout)
+class AvgMerge : MergeConfiguration(type = LayerType.Connection.Avg)

src/main/kotlin/com/kotlinnlp/simplednn/core/layers/models/merge/mergeconfig/BiaffineMerge.kt

@@ -11,19 +11,16 @@ import com.kotlinnlp.simplednn.core.functionalities.activations.ActivationFuncti
 import com.kotlinnlp.simplednn.core.layers.LayerType
 
 /**
- * A data class that defines the configuration of a Biaffine layer.
+ * The Biaffine merge layer configuration.
  *
  * @property outputSize the size of the merged output
  * @property activationFunction the output activation function
- * @property dropout the probability of dropout
  */
 class BiaffineMerge(
   outputSize: Int,
-  activationFunction: ActivationFunction? = null,
-  dropout: Double = 0.0
-) : OpenOutputMerge(
+  activationFunction: ActivationFunction? = null
+) : VariableOutputMergeConfig(
   type = LayerType.Connection.Biaffine,
-  dropout = dropout,
   outputSize = outputSize,
   activationFunction = activationFunction
 )

src/main/kotlin/com/kotlinnlp/simplednn/core/layers/models/merge/mergeconfig/ConcatFeedforwardMerge.kt

@@ -11,19 +11,16 @@ import com.kotlinnlp.simplednn.core.functionalities.activations.ActivationFuncti
 import com.kotlinnlp.simplednn.core.layers.LayerType
 
 /**
- * A data class that defines the configuration of a Concat layer followed by a feed-forward layer.
+ * The ConcatFeedforward merge layer configuration.
  *
  * @property outputSize the size of the merged output
  * @property activationFunction the output activation function
- * @property dropout the probability of dropout
  */
 class ConcatFeedforwardMerge(
   outputSize: Int,
-  activationFunction: ActivationFunction? = null,
-  dropout: Double = 0.0
-) : OpenOutputMerge(
+  activationFunction: ActivationFunction? = null
+) : VariableOutputMergeConfig(
   type = LayerType.Connection.ConcatFeedforward,
-  dropout = dropout,
   outputSize = outputSize,
   activationFunction = activationFunction
 )

src/main/kotlin/com/kotlinnlp/simplednn/core/layers/models/merge/mergeconfig/ConcatMerge.kt

@@ -10,8 +10,6 @@ package com.kotlinnlp.simplednn.core.layers.models.merge.mergeconfig
 import com.kotlinnlp.simplednn.core.layers.LayerType
 
 /**
- * A data class that defines the configuration of a Concat layer.
- *
- * @property dropout the probability of dropout
+ * The Concat merge layer configuration.
  */
-class ConcatMerge(dropout: Double = 0.0) : MergeConfiguration(type = LayerType.Connection.Concat, dropout = dropout)
+class ConcatMerge : MergeConfiguration(type = LayerType.Connection.Concat)

src/main/kotlin/com/kotlinnlp/simplednn/core/layers/models/merge/mergeconfig/MergeConfiguration.kt

@@ -10,15 +10,14 @@ package com.kotlinnlp.simplednn.core.layers.models.merge.mergeconfig
 import com.kotlinnlp.simplednn.core.layers.LayerType
 
 /**
- * A class that defines the configuration of a Merge layer.
+ * The configuration of a merge layer.
  *
- * @property type the connection type of the output Merge layer
- * @property dropout the probability of dropout
+ * @property type the connection type
  */
-abstract class MergeConfiguration(val type: LayerType.Connection, val dropout: Double) {
+abstract class MergeConfiguration(val type: LayerType.Connection) {
 
   /**
-   * Check connection type.
+   * Check the connection type.
    */
   init {
     require(this.type.property == LayerType.Property.Merge)

src/main/kotlin/com/kotlinnlp/simplednn/core/layers/models/merge/mergeconfig/ProductMerge.kt

@@ -10,8 +10,6 @@ package com.kotlinnlp.simplednn.core.layers.models.merge.mergeconfig
 import com.kotlinnlp.simplednn.core.layers.LayerType
 
 /**
- * A data class that defines the configuration of a Product layer.
- *
- * @property dropout the probability of dropout
+ * The Product merge layer configuration.
  */
-class ProductMerge(dropout: Double = 0.0) : MergeConfiguration(type = LayerType.Connection.Product, dropout = dropout)
+class ProductMerge : MergeConfiguration(type = LayerType.Connection.Product)

src/main/kotlin/com/kotlinnlp/simplednn/core/layers/models/merge/mergeconfig/SumMerge.kt

@@ -10,8 +10,6 @@ package com.kotlinnlp.simplednn.core.layers.models.merge.mergeconfig
 import com.kotlinnlp.simplednn.core.layers.LayerType
 
 /**
- * A data class that defines the configuration of a Sum layer.
- *
- * @property dropout the probability of dropout
+ * The Sum merge layer configuration.
  */
-class SumMerge(dropout: Double = 0.0) : MergeConfiguration(type = LayerType.Connection.Sum, dropout = dropout)
+class SumMerge : MergeConfiguration(type = LayerType.Connection.Sum)

src/main/kotlin/com/kotlinnlp/simplednn/core/layers/models/merge/mergeconfig/OpenOutputMerge.kt src/main/kotlin/com/kotlinnlp/simplednn/core/layers/models/merge/mergeconfig/VariableOutputMergeConfig.kt

@@ -11,16 +11,14 @@ import com.kotlinnlp.simplednn.core.functionalities.activations.ActivationFuncti
 import com.kotlinnlp.simplednn.core.layers.LayerType
 
 /**
- * A class that defines the configuration of the Merge layer has a configurable output size and activation.
+ * The configuration of a merge layer with a variable output size and and an optional activation function.
  *
- * @property type the connection type of the output Merge layer
- * @property dropout the probability of dropout
+ * @property type the connection type
  * @property outputSize the size of the merged output
  * @property activationFunction the output activation function
  */
-abstract class OpenOutputMerge(
+abstract class VariableOutputMergeConfig(
   type: LayerType.Connection,
-  dropout: Double,
   val outputSize: Int,
   val activationFunction: ActivationFunction?
-) : MergeConfiguration(type = type, dropout = dropout)
+) : MergeConfiguration(type)

src/main/kotlin/com/kotlinnlp/simplednn/deeplearning/attention/pointernetwork/PointerNetworkModel.kt

@@ -69,7 +69,7 @@ class PointerNetworkModel(
       sizes = listOf(this.inputSize, this.vectorSize)),
     LayerInterface(
       size = this.mergeOutputSize,
-      activationFunction = (mergeConfig as? OpenOutputMerge)?.activationFunction,
+      activationFunction = (mergeConfig as? VariableOutputMergeConfig)?.activationFunction,
       connectionType = mergeConfig.type),
     weightsInitializer = weightsInitializer,
     biasesInitializer = biasesInitializer)