From 352ae7e65b6a74bcd768aa88b866a44c713284c8 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 26 Oct 2016 15:35:44 +0000
Subject: [PATCH] ADAM
---
src/utils.c | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index 90af5cf..e8128b9 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -135,23 +135,20 @@
printf("\n");
}
-char *find_replace(char *str, char *orig, char *rep)
+void find_replace(char *str, char *orig, char *rep, char *output)
{
- static char buffer[4096];
- static char buffer2[4096];
- static char buffer3[4096];
+ char buffer[4096] = {0};
char *p;
- if(!(p = strstr(str, orig))) // Is 'orig' even in 'str'?
- return str;
+ sprintf(buffer, "%s", str);
+ if(!(p = strstr(buffer, orig))){ // Is 'orig' even in 'str'?
+ sprintf(output, "%s", str);
+ return;
+ }
- strncpy(buffer2, str, p-str); // Copy characters from 'str' start to 'orig' st$
- buffer2[p-str] = '\0';
+ *p = '\0';
- sprintf(buffer3, "%s%s%s", buffer2, rep, p+strlen(orig));
- sprintf(buffer, "%s", buffer3);
-
- return buffer;
+ sprintf(output, "%s%s%s", buffer, rep, p+strlen(orig));
}
float sec(clock_t clocks)
@@ -414,6 +411,13 @@
}
}
+void print_statistics(float *a, int n)
+{
+ float m = mean_array(a, n);
+ float v = variance_array(a, n);
+ printf("MSE: %.6f, Mean: %.6f, Variance: %.6f\n", mse_array(a, n), m, v);
+}
+
float variance_array(float *a, int n)
{
int i;
@@ -521,12 +525,16 @@
int rand_int(int min, int max)
{
+ if (max < min){
+ int s = min;
+ min = max;
+ max = s;
+ }
int r = (rand()%(max - min + 1)) + min;
return r;
}
// From http://en.wikipedia.org/wiki/Box%E2%80%93Muller_transform
-#define TWO_PI 6.2831853071795864769252866
float rand_normal()
{
static int haveSpare = 0;
@@ -573,9 +581,21 @@
float rand_uniform(float min, float max)
{
+ if(max < min){
+ float swap = min;
+ min = max;
+ max = swap;
+ }
return ((float)rand()/RAND_MAX * (max - min)) + min;
}
+float rand_scale(float s)
+{
+ float scale = rand_uniform(1, s);
+ if(rand()%2) return scale;
+ return 1./scale;
+}
+
float **one_hot_encode(float *a, int n, int k)
{
int i;
--
Gitblit v1.10.0