Subsampling connections fix

Author: ivan-vasilev

nn-core/src/main/java/com/github/neuralnetworks/architecture/ConnectionFactory.java

@@ -69,8 +69,8 @@ public Conv2DConnection conv2d(Layer inputLayer, Layer outputLayer, int inputFea
 	return result;
     }
 
-    public Subsampling2DConnection subsampling2D(Layer inputLayer, Layer outputLayer, int inputFeatureMapColumns, int inputFeatureMapRows, int subsamplingRegionRows, int subsamplingRegionCols, int filters) {
-	return new Subsampling2DConnection(inputLayer, outputLayer, inputFeatureMapColumns, inputFeatureMapRows, subsamplingRegionRows, subsamplingRegionCols, filters);
+    public Subsampling2DConnection subsampling2D(Layer inputLayer, Layer outputLayer, int inputFeatureMapRows, int inputFeatureMapColumns, int subsamplingRegionRows, int subsamplingRegionCols, int filters) {
+	return new Subsampling2DConnection(inputLayer, outputLayer, inputFeatureMapRows, inputFeatureMapColumns, subsamplingRegionRows, subsamplingRegionCols, filters);
     }
 
     public boolean useSharedWeights() {

nn-core/src/main/java/com/github/neuralnetworks/architecture/Subsampling2DConnection.java

@@ -14,10 +14,10 @@ public class Subsampling2DConnection extends ConnectionsImpl {
     protected int outputFeatureMapRows;
     protected int filters;
 
-    public Subsampling2DConnection(Layer inputLayer, Layer outputLayer, int inputFeatureMapColumns, int inputFeatureMapRows, int subsamplingRegionRows, int subsamplingRegionCols, int filters) {
+    public Subsampling2DConnection(Layer inputLayer, Layer outputLayer, int inputFeatureMapRows, int inputFeatureMapColumns, int subsamplingRegionRows, int subsamplingRegionCols, int filters) {
 	super(inputLayer, outputLayer);
-	this.inputFeatureMapColumns = inputFeatureMapColumns;
 	this.inputFeatureMapRows = inputFeatureMapRows;
+	this.inputFeatureMapColumns = inputFeatureMapColumns;
 	this.filters = filters;
 	setDimensions(subsamplingRegionRows, subsamplingRegionCols);
     }

nn-core/src/test/java/com/github/neuralnetworks/test/CNNTest.java

@@ -654,7 +654,7 @@ public void testCNNMLPFF() {
 	ValuesProvider cnnvp = TensorFactory.tensorProvider(cnn, 1, Environment.getInstance().getUseDataSharedMemory());
 	Tensor cnnin = cnnvp.get(cnn.getInputLayer());
 	cnnin.set(0.2f, 0, 0, 0, 0);
-	cnnin.set(0.6f, 0, 0, 1, 0);
+	cnnin.set(0.6f, 0, 1, 0, 0);
 
 	// MLP
 	NeuralNetworkImpl mlp = NNFactory.mlpSigmoid(new int[] { 2, 1 }, false);