From db0397cfaaf488364e3d2e1669dfefae2ee6ea73 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 14 Dec 2015 19:57:10 +0000
Subject: [PATCH] shortcut layers, msr networks

---
 src/activations.c |   55 +++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/activations.c b/src/activations.c
index 48dce87..5a62ef5 100644
--- a/src/activations.c
+++ b/src/activations.c
@@ -8,16 +8,24 @@
 char *get_activation_string(ACTIVATION a)
 {
     switch(a){
-        case SIGMOID:
-            return "sigmoid";
+        case LOGISTIC:
+            return "logistic";
         case RELU:
             return "relu";
+        case ELU:
+            return "elu";
+        case RELIE:
+            return "relie";
         case RAMP:
             return "ramp";
         case LINEAR:
             return "linear";
         case TANH:
             return "tanh";
+        case PLSE:
+            return "plse";
+        case LEAKY:
+            return "leaky";
         default:
             break;
     }
@@ -26,41 +34,40 @@
 
 ACTIVATION get_activation(char *s)
 {
-    if (strcmp(s, "sigmoid")==0) return SIGMOID;
+    if (strcmp(s, "logistic")==0) return LOGISTIC;
     if (strcmp(s, "relu")==0) return RELU;
+    if (strcmp(s, "elu")==0) return ELU;
+    if (strcmp(s, "relie")==0) return RELIE;
+    if (strcmp(s, "plse")==0) return PLSE;
     if (strcmp(s, "linear")==0) return LINEAR;
     if (strcmp(s, "ramp")==0) return RAMP;
+    if (strcmp(s, "leaky")==0) return LEAKY;
     if (strcmp(s, "tanh")==0) return TANH;
     fprintf(stderr, "Couldn't find activation function %s, going with ReLU\n", s);
     return RELU;
 }
 
-float linear_activate(float x){return x;}
-float sigmoid_activate(float x){return 1./(1. + exp(-x));}
-float relu_activate(float x){return x*(x>0);}
-float ramp_activate(float x){return x*(x>0)+.1*x;}
-float tanh_activate(float x){return (exp(2*x)-1)/(exp(2*x)+1);}
-//float tanh_activate(float x){return x - (x*x*x)/3;}
-
-float linear_gradient(float x){return 1;}
-float sigmoid_gradient(float x){return (1-x)*x;}
-float relu_gradient(float x){return (x>0);}
-float ramp_gradient(float x){return (x>0)+.1;}
-float tanh_gradient(float x){return 1-x*x;}
-
 float activate(float x, ACTIVATION a)
 {
     switch(a){
         case LINEAR:
             return linear_activate(x);
-        case SIGMOID:
-            return sigmoid_activate(x);
+        case LOGISTIC:
+            return logistic_activate(x);
         case RELU:
             return relu_activate(x);
+        case ELU:
+            return elu_activate(x);
+        case RELIE:
+            return relie_activate(x);
         case RAMP:
             return ramp_activate(x);
+        case LEAKY:
+            return leaky_activate(x);
         case TANH:
             return tanh_activate(x);
+        case PLSE:
+            return plse_activate(x);
     }
     return 0;
 }
@@ -78,14 +85,22 @@
     switch(a){
         case LINEAR:
             return linear_gradient(x);
-        case SIGMOID:
-            return sigmoid_gradient(x);
+        case LOGISTIC:
+            return logistic_gradient(x);
         case RELU:
             return relu_gradient(x);
+        case ELU:
+            return elu_gradient(x);
+        case RELIE:
+            return relie_gradient(x);
         case RAMP:
             return ramp_gradient(x);
+        case LEAKY:
+            return leaky_gradient(x);
         case TANH:
             return tanh_gradient(x);
+        case PLSE:
+            return plse_gradient(x);
     }
     return 0;
 }

--
Gitblit v1.10.0