More code style tweaks

Author: Sergio0694

NeuralNetwork.NET/APIs/DatasetLoader.cs

@@ -63,12 +63,12 @@ public static class DatasetLoader
         [PublicAPI]
         [Pure, NotNull]
         [CollectionAccess(CollectionAccessType.Read)]
-        public static ITrainingDataset Training<TPixel>([NotNull] IEnumerable<(String X, float[] Y)> data, int size, ImageNormalizationMode normalization, [NotNull, ItemNotNull] params Action<IImageProcessingContext<TPixel>>[] modifiers)
+        public static ITrainingDataset Training<TPixel>([NotNull] IEnumerable<(string X, float[] Y)> data, int size, ImageNormalizationMode normalization, [NotNull, ItemNotNull] params Action<IImageProcessingContext<TPixel>>[] modifiers)
             where TPixel : struct, IPixel<TPixel>
         {
             return BatchesCollection.From(modifiers.Length > 0 
                 ? data.SelectMany(xy => modifiers.Select<Action<IImageProcessingContext<TPixel>>, Func<(float[], float[])>>(f => () => (ImageLoader.Load(xy.X, normalization, f), xy.Y))) 
-                : data.Select<(String X, float[] Y), Func<(float[], float[])>>(xy => () => (ImageLoader.Load<TPixel>(xy.X, normalization, null), xy.Y)), size);
+                : data.Select<(string X, float[] Y), Func<(float[], float[])>>(xy => () => (ImageLoader.Load<TPixel>(xy.X, normalization, null), xy.Y)), size);
         }
 
         /// <summary>
@@ -83,12 +83,12 @@ public static ITrainingDataset Training<TPixel>([NotNull] IEnumerable<(String X,
         [PublicAPI]
         [Pure, NotNull]
         [CollectionAccess(CollectionAccessType.Read)]
-        public static ITrainingDataset Training<TPixel>([NotNull] IEnumerable<(String X, Func<float[]> Y)> data, int size, ImageNormalizationMode normalization, [NotNull, ItemNotNull] params Action<IImageProcessingContext<TPixel>>[] modifiers)
+        public static ITrainingDataset Training<TPixel>([NotNull] IEnumerable<(string X, Func<float[]> Y)> data, int size, ImageNormalizationMode normalization, [NotNull, ItemNotNull] params Action<IImageProcessingContext<TPixel>>[] modifiers)
             where TPixel : struct, IPixel<TPixel>
         {
             return BatchesCollection.From(modifiers.Length > 0 
                 ? data.SelectMany(xy => modifiers.Select<Action<IImageProcessingContext<TPixel>>, Func<(float[], float[])>>(f => () => (ImageLoader.Load(xy.X, normalization, f), xy.Y()))) 
-                : data.Select<(String X, Func<float[]> Y), Func<(float[], float[])>>(xy => () => (ImageLoader.Load<TPixel>(xy.X, normalization, null), xy.Y())), size);
+                : data.Select<(string X, Func<float[]> Y), Func<(float[], float[])>>(xy => () => (ImageLoader.Load<TPixel>(xy.X, normalization, null), xy.Y())), size);
         }
 
         #endregion
@@ -144,13 +144,13 @@ public static IValidationDataset Validation([NotNull, ItemNotNull] IEnumerable<F
         [Pure, NotNull]
         [CollectionAccess(CollectionAccessType.Read)]
         public static IValidationDataset Validation<TPixel>(
-            [NotNull] IEnumerable<(String X, float[] Y)> data, float tolerance = 1e-2f, int epochs = 5, 
+            [NotNull] IEnumerable<(string X, float[] Y)> data, float tolerance = 1e-2f, int epochs = 5, 
             ImageNormalizationMode normalization = ImageNormalizationMode.Sigmoid, [NotNull, ItemNotNull] params Action<IImageProcessingContext<TPixel>>[] modifiers)
             where TPixel : struct, IPixel<TPixel>
         {
             return Validation((modifiers.Length > 0
                 ? data.SelectMany(xy => modifiers.Select<Action<IImageProcessingContext<TPixel>>, Func<(float[], float[])>>(f => () => (ImageLoader.Load(xy.X, normalization, f), xy.Y)))
-                : data.Select<(String X, float[] Y), Func<(float[], float[])>>(xy => () => (ImageLoader.Load<TPixel>(xy.X, normalization, null), xy.Y))).AsParallel(), tolerance, epochs);
+                : data.Select<(string X, float[] Y), Func<(float[], float[])>>(xy => () => (ImageLoader.Load<TPixel>(xy.X, normalization, null), xy.Y))).AsParallel(), tolerance, epochs);
         }
 
         /// <summary>
@@ -167,13 +167,13 @@ public static IValidationDataset Validation<TPixel>(
         [Pure, NotNull]
         [CollectionAccess(CollectionAccessType.Read)]
         public static IValidationDataset Validation<TPixel>(
-            [NotNull] IEnumerable<(String X, Func<float[]> Y)> data, float tolerance = 1e-2f, int epochs = 5, 
+            [NotNull] IEnumerable<(string X, Func<float[]> Y)> data, float tolerance = 1e-2f, int epochs = 5, 
             ImageNormalizationMode normalization = ImageNormalizationMode.Sigmoid, [NotNull, ItemNotNull] params Action<IImageProcessingContext<TPixel>>[] modifiers)
             where TPixel : struct, IPixel<TPixel>
         {
             return Validation((modifiers.Length > 0
                 ? data.SelectMany(xy => modifiers.Select<Action<IImageProcessingContext<TPixel>>, Func<(float[], float[])>>(f => () => (ImageLoader.Load(xy.X, normalization, f), xy.Y())))
-                : data.Select<(String X, Func<float[]> Y), Func<(float[], float[])>>(xy => () => (ImageLoader.Load<TPixel>(xy.X, normalization, null), xy.Y()))).AsParallel(), tolerance, epochs);
+                : data.Select<(string X, Func<float[]> Y), Func<(float[], float[])>>(xy => () => (ImageLoader.Load<TPixel>(xy.X, normalization, null), xy.Y()))).AsParallel(), tolerance, epochs);
         }
 
         #endregion
@@ -225,13 +225,13 @@ public static ITestDataset Test([NotNull, ItemNotNull] IEnumerable<Func<(float[]
         [Pure, NotNull]
         [CollectionAccess(CollectionAccessType.Read)]
         public static ITestDataset Test<TPixel>(
-            [NotNull] IEnumerable<(String X, float[] Y)> data, [CanBeNull] Action<TrainingProgressEventArgs> progress = null
+            [NotNull] IEnumerable<(string X, float[] Y)> data, [CanBeNull] Action<TrainingProgressEventArgs> progress = null
             , ImageNormalizationMode normalization = ImageNormalizationMode.Sigmoid, [NotNull, ItemNotNull] params Action<IImageProcessingContext<TPixel>>[] modifiers)
             where TPixel : struct, IPixel<TPixel>
         {
             return Test((modifiers.Length > 0
                 ? data.SelectMany(xy => modifiers.Select<Action<IImageProcessingContext<TPixel>>, Func<(float[], float[])>>(f => () => (ImageLoader.Load(xy.X, normalization, f), xy.Y)))
-                : data.Select<(String X, float[] Y), Func<(float[], float[])>>(xy => () => (ImageLoader.Load<TPixel>(xy.X, normalization, null), xy.Y))).AsParallel(), progress);
+                : data.Select<(string X, float[] Y), Func<(float[], float[])>>(xy => () => (ImageLoader.Load<TPixel>(xy.X, normalization, null), xy.Y))).AsParallel(), progress);
         }
 
         /// <summary>
@@ -247,13 +247,13 @@ public static ITestDataset Test<TPixel>(
         [Pure, NotNull]
         [CollectionAccess(CollectionAccessType.Read)]
         public static ITestDataset Test<TPixel>(
-            [NotNull] IEnumerable<(String X, Func<float[]> Y)> data, [CanBeNull] Action<TrainingProgressEventArgs> progress = null, 
+            [NotNull] IEnumerable<(string X, Func<float[]> Y)> data, [CanBeNull] Action<TrainingProgressEventArgs> progress = null, 
             ImageNormalizationMode normalization = ImageNormalizationMode.Sigmoid, [NotNull, ItemNotNull] params Action<IImageProcessingContext<TPixel>>[] modifiers)
             where TPixel : struct, IPixel<TPixel>
         {
             return Test((modifiers.Length > 0
                 ? data.SelectMany(xy => modifiers.Select<Action<IImageProcessingContext<TPixel>>, Func<(float[], float[])>>(f => () => (ImageLoader.Load(xy.X, normalization, f), xy.Y())))
-                : data.Select<(String X, Func<float[]> Y), Func<(float[], float[])>>(xy => () => (ImageLoader.Load<TPixel>(xy.X, normalization, null), xy.Y()))).AsParallel(), progress);
+                : data.Select<(string X, Func<float[]> Y), Func<(float[], float[])>>(xy => () => (ImageLoader.Load<TPixel>(xy.X, normalization, null), xy.Y()))).AsParallel(), progress);
         }
 
         #endregion

NeuralNetwork.NET/APIs/Datasets/Cifar10.cs

@@ -31,12 +31,12 @@ public static class Cifar10
         // A single 32*32 image
         private const int ImageSize = 1024;
 
-        private const String DatasetURL = "https://www.cs.toronto.edu/~kriz/cifar-10-binary.tar.gz";
+        private const string DatasetURL = "https://www.cs.toronto.edu/~kriz/cifar-10-binary.tar.gz";
 
         [NotNull, ItemNotNull]
-        private static readonly IReadOnlyList<String> TrainingBinFilenames = Enumerable.Range(1, 5).Select(i => $"data_batch_{i}.bin").ToArray();
+        private static readonly IReadOnlyList<string> TrainingBinFilenames = Enumerable.Range(1, 5).Select(i => $"data_batch_{i}.bin").ToArray();
 
-        private const String TestBinFilename = "test_batch.bin";
+        private const string TestBinFilename = "test_batch.bin";
 
         #endregion
 
@@ -50,7 +50,7 @@ public static class Cifar10
         [Pure, ItemCanBeNull]
         public static async Task<ITrainingDataset> GetTrainingDatasetAsync(int size, [CanBeNull] IProgress<HttpProgress> callback = null, CancellationToken token = default)
         {
-            IReadOnlyDictionary<String, Func<Stream>> map = await DatasetsDownloader.GetArchiveAsync(DatasetURL, callback, token);
+            IReadOnlyDictionary<string, Func<Stream>> map = await DatasetsDownloader.GetArchiveAsync(DatasetURL, callback, token);
             if (map == null) return null;
             IReadOnlyList<(float[], float[])>[] data = new IReadOnlyList<(float[], float[])>[TrainingBinFilenames.Count];
             Parallel.For(0, TrainingBinFilenames.Count, i => data[i] = ParseSamples(map[TrainingBinFilenames[i]], TrainingSamplesInBinFiles)).AssertCompleted();
@@ -67,7 +67,7 @@ public static async Task<ITrainingDataset> GetTrainingDatasetAsync(int size, [Ca
         [Pure, ItemCanBeNull]
         public static async Task<ITestDataset> GetTestDatasetAsync([CanBeNull] Action<TrainingProgressEventArgs> progress = null, [CanBeNull] IProgress<HttpProgress> callback = null, CancellationToken token = default)
         {
-            IReadOnlyDictionary<String, Func<Stream>> map = await DatasetsDownloader.GetArchiveAsync(DatasetURL, callback, token);
+            IReadOnlyDictionary<string, Func<Stream>> map = await DatasetsDownloader.GetArchiveAsync(DatasetURL, callback, token);
             if (map == null) return null;
             IReadOnlyList<(float[], float[])> data = ParseSamples(map[TestBinFilename], TrainingSamplesInBinFiles);
             return DatasetLoader.Test(data, progress);
@@ -81,7 +81,7 @@ public static async Task<ITestDataset> GetTestDatasetAsync([CanBeNull] Action<Tr
         [PublicAPI]
         public static async Task<bool> ExportDatasetAsync([NotNull] DirectoryInfo directory, CancellationToken token = default)
         {
-            IReadOnlyDictionary<String, Func<Stream>> map = await DatasetsDownloader.GetArchiveAsync(DatasetURL, null, token);
+            IReadOnlyDictionary<string, Func<Stream>> map = await DatasetsDownloader.GetArchiveAsync(DatasetURL, null, token);
             if (map == null) return false;
             if (!directory.Exists) directory.Create();
             ParallelLoopResult result = Parallel.ForEach(TrainingBinFilenames.Concat(new[] { TestBinFilename }), (name, state) =>
@@ -137,7 +137,7 @@ public static async Task<bool> ExportDatasetAsync([NotNull] DirectoryInfo direct
         /// <param name="source">The source filename and a <see cref="Func{TResult}"/> that returns the <see cref="Stream"/> to read</param>
         /// <param name="count">The number of samples to parse</param>
         /// <param name="token">A token for the operation</param>
-        private static unsafe void ExportSamples([NotNull] DirectoryInfo folder, (String Name, Func<Stream> Factory) source, int count, CancellationToken token)
+        private static unsafe void ExportSamples([NotNull] DirectoryInfo folder, (string Name, Func<Stream> Factory) source, int count, CancellationToken token)
         {
             using (Stream stream = source.Factory())
             {

NeuralNetwork.NET/APIs/Datasets/Cifar100.cs

@@ -37,11 +37,11 @@ public static class Cifar100
 
         private const int FineLabels = 100;
 
-        private const String DatasetURL = "https://www.cs.toronto.edu/~kriz/cifar-100-binary.tar.gz";
+        private const string DatasetURL = "https://www.cs.toronto.edu/~kriz/cifar-100-binary.tar.gz";
 
-        private const String TrainingBinFilename = "train.bin";
+        private const string TrainingBinFilename = "train.bin";
 
-        private const String TestBinFilename = "test.bin";
+        private const string TestBinFilename = "test.bin";
 
         #endregion
 
@@ -56,7 +56,7 @@ public static class Cifar100
         [Pure, ItemCanBeNull]
         public static async Task<ITrainingDataset> GetTrainingDatasetAsync(int size, Cifar100ClassificationMode mode = Cifar100ClassificationMode.Fine, [CanBeNull] IProgress<HttpProgress> callback = null, CancellationToken token = default)
         {
-            IReadOnlyDictionary<String, Func<Stream>> map = await DatasetsDownloader.GetArchiveAsync(DatasetURL, callback, token);
+            IReadOnlyDictionary<string, Func<Stream>> map = await DatasetsDownloader.GetArchiveAsync(DatasetURL, callback, token);
             if (map == null) return null;
             IReadOnlyList<(float[], float[])> data = ParseSamples(map[TrainingBinFilename], TrainingSamplesInBinFile, mode);
             return DatasetLoader.Training(data, size);
@@ -75,7 +75,7 @@ public static async Task<ITestDataset> GetTestDatasetAsync(
             [CanBeNull] Action<TrainingProgressEventArgs> progress = null, Cifar100ClassificationMode mode = Cifar100ClassificationMode.Fine, 
             [CanBeNull] IProgress<HttpProgress> callback = null, CancellationToken token = default)
         {
-            IReadOnlyDictionary<String, Func<Stream>> map = await DatasetsDownloader.GetArchiveAsync(DatasetURL, callback, token);
+            IReadOnlyDictionary<string, Func<Stream>> map = await DatasetsDownloader.GetArchiveAsync(DatasetURL, callback, token);
             if (map == null) return null;
             IReadOnlyList<(float[], float[])> data = ParseSamples(map[TestBinFilename], TestSamplesInBinFile, mode);
             return DatasetLoader.Test(data, progress);
@@ -89,10 +89,10 @@ public static async Task<ITestDataset> GetTestDatasetAsync(
         [PublicAPI]
         public static async Task<bool> ExportDatasetAsync([NotNull] DirectoryInfo directory, CancellationToken token = default)
         {
-            IReadOnlyDictionary<String, Func<Stream>> map = await DatasetsDownloader.GetArchiveAsync(DatasetURL, null, token);
+            IReadOnlyDictionary<string, Func<Stream>> map = await DatasetsDownloader.GetArchiveAsync(DatasetURL, null, token);
             if (map == null) return false;
             if (!directory.Exists) directory.Create();
-            ParallelLoopResult result = Parallel.ForEach(new (String Name, int Count)[]
+            ParallelLoopResult result = Parallel.ForEach(new (string Name, int Count)[]
             {
                 (TrainingBinFilename, TrainingSamplesInBinFile),
                 (TestBinFilename, TestSamplesInBinFile)
@@ -173,7 +173,7 @@ public static async Task<bool> ExportDatasetAsync([NotNull] DirectoryInfo direct
         /// <param name="source">The source filename and a <see cref="Func{TResult}"/> that returns the <see cref="Stream"/> to read</param>
         /// <param name="count">The number of samples to parse</param>
         /// <param name="token">A token for the operation</param>
-        private static unsafe void ExportSamples([NotNull] DirectoryInfo folder, (String Name, Func<Stream> Factory) source, int count, CancellationToken token)
+        private static unsafe void ExportSamples([NotNull] DirectoryInfo folder, (string Name, Func<Stream> Factory) source, int count, CancellationToken token)
         {
             using (Stream stream = source.Factory())
             {

NeuralNetwork.NET/APIs/Datasets/Mnist.cs

@@ -29,15 +29,15 @@ public static class Mnist
 
         private const int SampleSize = 784;
 
-        private const String MnistHttpRootPath = "http://yann.lecun.com/exdb/mnist/";
+        private const string MnistHttpRootPath = "http://yann.lecun.com/exdb/mnist/";
 
-        private const String TrainingSetValuesFilename = "train-images-idx3-ubyte.gz";
+        private const string TrainingSetValuesFilename = "train-images-idx3-ubyte.gz";
 
-        private const String TrainingSetLabelsFilename = "train-labels-idx1-ubyte.gz";
+        private const string TrainingSetLabelsFilename = "train-labels-idx1-ubyte.gz";
 
-        private const String TestSetValuesFilename = "t10k-images-idx3-ubyte.gz";
+        private const string TestSetValuesFilename = "t10k-images-idx3-ubyte.gz";
 
-        private const String TestSetLabelsFilename = "t10k-labels-idx1-ubyte.gz";
+        private const string TestSetLabelsFilename = "t10k-labels-idx1-ubyte.gz";
 
         #endregion
 
@@ -94,7 +94,7 @@ public static async Task<bool> ExportDatasetAsync([NotNull] DirectoryInfo direct
                 DatasetsDownloader.GetFileAsync($"{MnistHttpRootPath}{TestSetLabelsFilename}", null, token));
             if (factories.Any(s => s == null) || token.IsCancellationRequested) return false;
             if (!directory.Exists) directory.Create();
-            ParallelLoopResult result = Parallel.ForEach(new (String Name, Func<Stream> X, Func<Stream> Y, int Count)[]
+            ParallelLoopResult result = Parallel.ForEach(new (string Name, Func<Stream> X, Func<Stream> Y, int Count)[]
             {
                 (TrainingSetValuesFilename, factories[0], factories[1], TrainingSamples),
                 (TestSetValuesFilename, factories[2], factories[3], TestSamples)
@@ -153,7 +153,7 @@ private static unsafe (float[,], float[,]) ParseSamples((Func<Stream> X, Func<St
         /// <param name="source">A pair of factories for the input <see cref="Stream"/> instances to read</param>
         /// <param name="count">The number of samples to parse</param>
         /// <param name="token">A token for the operation</param>
-        private static unsafe void ExportSamples([NotNull] DirectoryInfo folder, (String Name, Func<Stream> X, Func<Stream> Y) source, int count, CancellationToken token)
+        private static unsafe void ExportSamples([NotNull] DirectoryInfo folder, (string Name, Func<Stream> X, Func<Stream> Y) source, int count, CancellationToken token)
         {
             using (Stream inputs = source.X(), labels = source.Y())
             using (GZipStream

NeuralNetwork.NET/APIs/Interfaces/INeuralNetwork.cs

@@ -122,7 +122,7 @@ public interface INeuralNetwork : IEquatable<INeuralNetwork>, IClonable<INeuralN
         /// Serializes the network metadata as a JSON string
         /// </summary>
         [Pure, NotNull]
-        String SerializeMetadataAsJson();
+        string SerializeMetadataAsJson();
 
         /// <summary>
         /// Saves the network to the target file

NeuralNetwork.NET/APIs/Results/TrainingSessionResult.cs

@@ -44,7 +44,7 @@ public sealed class TrainingSessionResult
         /// Serializes the current instance as a JSON string with all the current training info
         /// </summary>
         [Pure, NotNull]
-        public String SerializeAsJson() => JsonConvert.SerializeObject(this, Formatting.Indented, new StringEnumConverter());
+        public string SerializeAsJson() => JsonConvert.SerializeObject(this, Formatting.Indented, new StringEnumConverter());
 
         // Internal constructor
         internal TrainingSessionResult(

NeuralNetwork.NET/Exceptions/ComputationGraphBuildException.cs

@@ -8,6 +8,6 @@ namespace NeuralNetworkNET.Exceptions
     /// </summary>
     public sealed class ComputationGraphBuildException : ArgumentException
     {
-        internal ComputationGraphBuildException([NotNull] String message) : base(message) { }
+        internal ComputationGraphBuildException([NotNull] string message) : base(message) { }
     }
 }

NeuralNetwork.NET/Exceptions/NetworkBuildException.cs

@@ -8,8 +8,8 @@ namespace NeuralNetworkNET.Exceptions
     /// </summary>
     public sealed class NetworkBuildException : ArgumentException
     {
-        internal NetworkBuildException([NotNull] String message) : base(message) { }
+        internal NetworkBuildException([NotNull] string message) : base(message) { }
 
-        internal NetworkBuildException([NotNull] String message, [NotNull] String param) : base(message, param) { }
+        internal NetworkBuildException([NotNull] string message, [NotNull] string param) : base(message, param) { }
     }
 }