Redesign (final phase)

okozelsk · Sep 2, 2019 · 3ba20cc · 3ba20cc
1 parent 0aa1b55
commit 3ba20cc
Show file tree

Hide file tree

Showing 16 changed files with 611 additions and 1,312 deletions.
diff --git a/Demo/DemoConsoleApp/DemoSettings.xml b/Demo/DemoConsoleApp/DemoSettings.xml
diff --git a/Demo/DemoConsoleApp/Program.cs b/Demo/DemoConsoleApp/Program.cs
@@ -10,7 +10,6 @@ static void Main(string[] args)
         {
             //Research - this is not a part of the demo - it is a free playground
             //(new Research()).Run();
-            SMDemo.RunDemo(new ConsoleLog(), @"DemoSettings.xml");
             //Standard execution of the Demo
             try
             {

diff --git a/Demo/DemoConsoleApp/Research.cs b/Demo/DemoConsoleApp/Research.cs
@@ -34,6 +34,16 @@ public Research()
         public void Run()
         {
             //Activation tests
+            double fadingSum = 0;
+            for(int i = 0; i < 1000; i++)
+            {
+                fadingSum *= (1d - 0.1);
+                fadingSum += 1d;
+                Console.WriteLine(fadingSum);
+            }
+
+            Console.ReadLine();
+
 
             IActivationFunction testAF = ActivationFactory.Create(new SimpleIFSettings(refractoryPeriods:0), new Random(0));
             TestActivation(testAF, 100, 3.5, 10, 70);

diff --git a/RCNet/Neural/Network/FF/FeedForwardNetwork.cs b/RCNet/Neural/Network/FF/FeedForwardNetwork.cs
@@ -389,12 +389,8 @@ public Layer(int numOfNeurons, IActivationFunction activation)
                 {
                     throw new ArgumentOutOfRangeException("numOfNeurons", $"Invalid parameter value: {numOfNeurons}");
                 }
-                if (activation == null)
-                {
-                    throw new ArgumentException("activation", "Activation can't be null");
-                }
                 //Setup
-                Activation = activation;
+                Activation = activation ?? throw new ArgumentException("activation", "Activation can't be null");
                 NumOfLayerNeurons = numOfNeurons;
                 NumOfInputNodes = -1;
                 WeightsStartFlatIdx = 0;
@@ -430,11 +426,13 @@ internal void FinalizeStructure(int numOfInputNodes, int neuronsFlatStartIdx, in
             /// </summary>
             internal Layer DeepClone()
             {
-                Layer clone = new Layer(NumOfLayerNeurons, Activation);
-                clone.NumOfInputNodes = NumOfInputNodes;
-                clone.WeightsStartFlatIdx = WeightsStartFlatIdx;
-                clone.BiasesStartFlatIdx = BiasesStartFlatIdx;
-                clone.NeuronsStartFlatIdx = NeuronsStartFlatIdx;
+                Layer clone = new Layer(NumOfLayerNeurons, Activation)
+                {
+                    NumOfInputNodes = NumOfInputNodes,
+                    WeightsStartFlatIdx = WeightsStartFlatIdx,
+                    BiasesStartFlatIdx = BiasesStartFlatIdx,
+                    NeuronsStartFlatIdx = NeuronsStartFlatIdx
+                };
                 return clone;
             }
 

diff --git a/RCNet/Neural/Network/SM/Neuron/FiringRate.cs b/RCNet/Neural/Network/SM/Neuron/FiringRate.cs