merge conflicts fix

examples/mnist/main.cpp

@@ -23,43 +23,28 @@ int main()
 
         // Data set
 
-        //Random image data set 
-<<<<<<< HEAD
-        const Index samples_number = 10;
-=======
+        //Random image data set
+
         const Index samples_number = 3;
->>>>>>> d708ae72d027590cb19e8252e20216188803a48e
+
         const Index image_height = 4;
         const Index image_width = 4;
         const Index channels = 3;
         const Index targets = 2;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
+
         ImageDataSet image_data_set(samples_number, {image_height, image_width, channels}, {targets});
 /*
         image_data_set.set_data_random();
 
         image_data_set.set(DataSet::SampleUse::Training);
 /*
         //ImageDataSet image_data_set(0,{0,0,0},{0});
-=======
-        //ImageDataSet image_data_set(samples_number, {image_height, image_width, channels}, {targets});
-=======
-        ImageDataSet image_data_set(samples_number, {image_height, image_width, channels}, {targets});
->>>>>>> d708ae72d027590cb19e8252e20216188803a48e
 
         image_data_set.set_image_data_random();
 
         image_data_set.set(DataSet::SampleUse::Training);
 
-<<<<<<< HEAD
-        ImageDataSet image_data_set(0,{0,0,0},{0});
->>>>>>> 84ed8fe4fc319da8d5ad24db545c67fe6af6741a
-=======
-        //ImageDataSet image_data_set(0,{0,0,0},{0});
->>>>>>> d708ae72d027590cb19e8252e20216188803a48e
-
         //image_data_set.set_data_path("data");
         //image_data_set.set_data_path("C:/mnist/train");
         //image_data_set.set_data_path("C:/binary_mnist");

opennn/convolutional_layer.cpp

@@ -336,10 +336,10 @@ void ConvolutionalLayer::back_propagate(const vector<pair<type*, dimensions>>& i
         // Synaptic weights derivatives
 
         TensorMap<Tensor<type, 4>> kernel_synaptic_weights_derivatives(
-            synaptic_weights_derivatives_data + kernel_index * kernel_synaptic_weights_number, 
-            1, 
-            kernel_height, 
-            kernel_width, 
+            synaptic_weights_derivatives_data + kernel_index * kernel_synaptic_weights_number,
+            1,
+            kernel_height,
+            kernel_width,
             kernel_channels);
 
         kernel_synaptic_weights_derivatives = inputs.convolve(kernel_convolutions_derivatives, convolutions_dimensions_3d);

opennn/convolutional_layer.h

@@ -233,6 +233,7 @@ struct ConvolutionalLayerBackPropagation : LayerBackPropagation
 
    Tensor<type, 1> bias_derivatives;
    Tensor<type, 4> synaptic_weight_derivatives;
+
    Tensor<type, 4> rotated_synaptic_weights;
 
 };