From f047cfff99e00e28c02eb59b6d32386c122f9af6 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sun, 08 Mar 2015 18:31:12 +0000
Subject: [PATCH] renamed sigmoid to logistic
---
src/activations.c | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/src/activations.c b/src/activations.c
index c81d6aa..7da5ce2 100644
--- a/src/activations.c
+++ b/src/activations.c
@@ -2,13 +2,14 @@
#include <math.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
char *get_activation_string(ACTIVATION a)
{
switch(a){
- case SIGMOID:
- return "sigmoid";
+ case LOGISTIC:
+ return "logistic";
case RELU:
return "relu";
case RAMP:
@@ -25,7 +26,7 @@
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, "linear")==0) return LINEAR;
if (strcmp(s, "ramp")==0) return RAMP;
@@ -34,34 +35,53 @@
return RELU;
}
-float activate(float x, ACTIVATION a){
+float activate(float x, ACTIVATION a)
+{
switch(a){
case LINEAR:
- return x;
- case SIGMOID:
- return 1./(1.+exp(-x));
+ return linear_activate(x);
+ case LOGISTIC:
+ return logistic_activate(x);
case RELU:
- return x*(x>0);
+ return relu_activate(x);
case RAMP:
- return x*(x>0) + .1*x;
+ return ramp_activate(x);
case TANH:
- return (exp(2*x)-1)/(exp(2*x)+1);
+ return tanh_activate(x);
}
return 0;
}
-float gradient(float x, ACTIVATION a){
+
+void activate_array(float *x, const int n, const ACTIVATION a)
+{
+ int i;
+ for(i = 0; i < n; ++i){
+ x[i] = activate(x[i], a);
+ }
+}
+
+float gradient(float x, ACTIVATION a)
+{
switch(a){
case LINEAR:
- return 1;
- case SIGMOID:
- return (1.-x)*x;
+ return linear_gradient(x);
+ case LOGISTIC:
+ return logistic_gradient(x);
case RELU:
- return (x>0);
+ return relu_gradient(x);
case RAMP:
- return (x>0) + .1;
+ return ramp_gradient(x);
case TANH:
- return 1-x*x;
+ return tanh_gradient(x);
}
return 0;
}
+void gradient_array(const float *x, const int n, const ACTIVATION a, float *delta)
+{
+ int i;
+ for(i = 0; i < n; ++i){
+ delta[i] *= gradient(x[i], a);
+ }
+}
+
--
Gitblit v1.10.0