Merge pull request #12 from void-intelligence/develop

Closing #11
void-intelligence · May 12, 2020 · bd43b68 · bd43b68
2 parents 1a8be6a + 85856b9
commit bd43b68
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/src/Vortex-Tests/ActivationTests.cs b/src/Vortex-Tests/ActivationTests.cs
@@ -334,23 +334,18 @@ public void SoftmaxPrimeTest()
             a.InRandomize();
             var b = a.Duplicate();
 
-            var res = b.Duplicate();
             var sumExp = 0.0;
 
-            for (var i = 0; i < res.Rows; i++)
-            for (var j = 0; j < res.Columns; j++) sumExp += Math.Exp(b[i, j]);
-
-            for (var i = 0; i < res.Rows; i++)
-            for (var j = 0; j < res.Columns; j++) res[i, j] = Math.Exp(b[i, j]) / sumExp;
-
-            b = res;
+            for (var i = 0; i < b.Rows; i++)
+            for (var j = 0; j < b.Columns; j++) sumExp += Math.Exp(a[i, j]);
 
+            for (var i = 0; i < b.Rows; i++)
+            for (var j = 0; j < b.Columns; j++)
+                b[i, j] = Math.Exp(a[i, j]) / sumExp * (1.0 - Math.Exp(a[i, j]) / sumExp);
+
             var s = new Softmax();
-            a = s.Forward(a);
             a = s.Backward(a);
 
-            b.InMap((x) => Math.Exp(x) / sumExp * (1 - Math.Exp(x) / sumExp));
-
             Assert.IsTrue(a == b, "Softmax Derivative successful");
         }
 

diff --git a/src/Vortex/Activation/Kernels/Softmax.cs b/src/Vortex/Activation/Kernels/Softmax.cs
@@ -26,13 +26,22 @@ public override Matrix Forward(Matrix input)
             for (var i = 0; i < res.Rows; i++)
             for (var j = 0; j < res.Columns; j++) res[i, j] = Exp(input[i, j]) / SumExp;
 
-
             return res;
         }
 
         public override Matrix Backward(Matrix input)
         {
-            return input.Map(Derivative);
+            var res = input.Duplicate();
+            SumExp = 0.0;
+
+            for (var i = 0; i < res.Rows; i++)
+            for (var j = 0; j < res.Columns; j++) SumExp += Exp(input[i, j]);
+
+            for (var i = 0; i < res.Rows; i++)
+            for (var j = 0; j < res.Columns; j++)
+                res[i, j] = Exp(input[i, j]) / SumExp * (1.0 - Exp(input[i, j]) / SumExp);
+
+            return res;
         }
 
         protected override double Activate(double input)
@@ -42,7 +51,7 @@ protected override double Activate(double input)
 
         protected override double Derivative(double input)
         {
-            return Exp(input) / SumExp * (1 - Exp(input) / SumExp);
+            return 0;
         }
 
         public override EActivationType Type()