New random distributions and small enhancements

okozelsk · Sep 7, 2019 · 286d03b · 286d03b
1 parent c60dfa5
commit 286d03b
Show file tree

Hide file tree

Showing 23 changed files with 1,348 additions and 600 deletions.
diff --git a/Demo/DemoConsoleApp/DemoSettings.xml b/Demo/DemoConsoleApp/DemoSettings.xml
diff --git a/Demo/DemoConsoleApp/Research.cs b/Demo/DemoConsoleApp/Research.cs
@@ -23,16 +23,56 @@ namespace RCNet.DemoConsoleApp
     class Research
     {
         //Attributes
+        private Random _rand;
 
         //Constructor
         public Research()
         {
+            _rand = new Random();
             return;
         }
 
         //Methods
         public void Run()
         {
+            BasicStat sampleStat = new BasicStat();
+
+            //Pulse generator test
+            sampleStat.Reset();
+            PulseGeneratorSettings modSettings = new PulseGeneratorSettings(1, 1.5, PulseGeneratorSettings.TimingMode.Poisson);
+            IGenerator generator = new PulseGenerator(modSettings);
+
+            int steps = 10000;
+            double period = 0;
+            for (int i = 0; i < steps; i++)
+            {
+                ++period;
+                double sample = generator.Next();
+                //Console.WriteLine(sample);
+                if(sample != 0)
+                {
+                    sampleStat.AddSampleValue(period);
+                    period = 0;
+                }
+            }
+            Console.WriteLine($"Mean: {sampleStat.ArithAvg} StdDev: {sampleStat.StdDev} Min: {sampleStat.Min} Max: {sampleStat.Max}");
+            Console.ReadLine();
+
+
+
+            //Random distributions test
+            BasicStat rStat = new BasicStat();
+            for(int i = 0; i < 200; i++)
+            {
+                double r = _rand.NextFilterredGaussianDouble(0.5, 1, -0.5, 1);
+                rStat.AddSampleValue(r);
+                Console.WriteLine(r);
+            }
+            Console.WriteLine($"Mean: {rStat.ArithAvg} StdDev: {rStat.StdDev} Min: {rStat.Min} Max: {rStat.Max}");
+            Console.ReadLine();
+
+
+
             //Activation tests
             double fadingSum = 0;
             for(int i = 0; i < 1000; i++)
@@ -144,22 +184,6 @@ public void Run()
 
 
 
-            //TimeSeriesGenerator.SaveTimeSeriesToCsvFile("MackeyGlass_big.csv", "Value", TimeSeriesGenerator.GenMackeyGlassTimeSeries(16000), CultureInfo.InvariantCulture);
-            MackeyGlassGeneratorSettings modSettings = new MackeyGlassGeneratorSettings(18, 0.1, 0.2);
-            IGenerator generator = new MackeyGlassGenerator(modSettings);
-
-            int steps = 100;
-            for (int i = 0; i < steps; i++)
-            {
-                Console.WriteLine(generator.Next());
-            }
-            Console.ReadLine();
-            generator.Reset();
-            for (int i = 0; i < steps; i++)
-            {
-                Console.WriteLine(generator.Next());
-            }
-            Console.ReadLine();
 
             ///*
             SimpleIFSettings settings = new SimpleIFSettings(new RandomValueSettings(15, 15),
@@ -179,10 +203,10 @@ private void TestActivation(IActivationFunction af, int simLength, double constC
             Random rand = new Random();
             for (int i = 1; i <= simLength; i++)
             {
-                double signal = 0;
+                double signal;
                 if (i >= from && i < from + count)
                 {
-                    double input = double.IsNaN(constCurrent) ? rand.NextDouble(0, 1, false, RandomClassExtensions.DistributionType.Uniform) : constCurrent;
+                    double input = double.IsNaN(constCurrent) ? rand.NextDouble() : constCurrent;
                     signal = af.Compute(input);
                 }
                 else

diff --git a/Demo/DemoConsoleApp/TimeSeriesGenerator.cs b/Demo/DemoConsoleApp/TimeSeriesGenerator.cs
@@ -40,7 +40,7 @@ public static List<double> GenTimeSeries(IGenerator generator, int length)
         /// <returns>A collection of random values</returns>
         public static List<double> GenRandomTimeSeries(int length, int seek = -1)
         {
-            RandomValueSettings settings = new RandomValueSettings(0, 1, false, Extensions.RandomClassExtensions.DistributionType.Uniform);
+            RandomValueSettings settings = new RandomValueSettings(0, 1, false);
             RandomGenerator generator = new RandomGenerator(settings, seek);
             return GenTimeSeries(generator, length);
         }

diff --git a/RCNet/Docs/Imgs/Components.png b/RCNet/Docs/Imgs/Components.png
diff --git a/RCNet/Extensions/ArrayClassExtensions.cs → RCNet/Extensions/ArrayExtensions.cs b/RCNet/Extensions/ArrayClassExtensions.cs → RCNet/Extensions/ArrayExtensions.cs
@@ -7,7 +7,7 @@ namespace RCNet.Extensions
     /// <summary>
     /// Useful extensions of Array class
     /// </summary>
-    public static class ArrayClassExtensions
+    public static class ArrayExtensions
     {
         /// <summary>
         /// Shifts all array elements to the right and sets the first element value to newValue
@@ -189,7 +189,7 @@ public static void ShuffledIndices(this int[] array, Random rand)
             return;
         }
 
-    }//ArrayClassExtensions
+    }//ArrayExtensions
 
 }//Namespace
 
diff --git a/RCNet/Extensions/DoubleClassExtensions.cs → RCNet/Extensions/DoubleExtensions.cs b/RCNet/Extensions/DoubleClassExtensions.cs → RCNet/Extensions/DoubleExtensions.cs
@@ -6,7 +6,7 @@ namespace RCNet.Extensions
     /// <summary>
     /// Useful extensions of Double class.
     /// </summary>
-    public static class DoubleClassExtensions
+    public static class DoubleExtensions
     {
         /// <summary>
         /// Checks if this is computable double value.
@@ -64,6 +64,6 @@ public static double Power(this double x, uint exponent)
             }
         }
 
-    }//DoubleClassExtensions
+    }//DoubleExtensions
 
 }//Namespace
diff --git a/RCNet/Extensions/RNGCryptoServiceProviderClassExtension.cs b/RCNet/Extensions/RNGCryptoServiceProviderClassExtension.cs