From ac46d97351fdaf55f7d44a1a6fbba8e5951b12f9 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 14 Mar 2016 06:25:36 +0000
Subject: [PATCH] less printing
---
src/utils.c | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index 3121ef6..398d18a 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -2,6 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
+#include <assert.h>
#include <unistd.h>
#include <float.h>
#include <limits.h>
@@ -127,26 +128,28 @@
for(i =0 ; i < M; ++i){
printf("%d ", i+1);
for(j = 0; j < N; ++j){
- printf("%10.6f, ", A[i*N+j]);
+ printf("%2.4f, ", A[i*N+j]);
}
printf("\n");
}
printf("\n");
}
-
char *find_replace(char *str, char *orig, char *rep)
{
static char buffer[4096];
+ static char buffer2[4096];
+ static char buffer3[4096];
char *p;
if(!(p = strstr(str, orig))) // Is 'orig' even in 'str'?
return str;
- strncpy(buffer, str, p-str); // Copy characters from 'str' start to 'orig' st$
- buffer[p-str] = '\0';
+ strncpy(buffer2, str, p-str); // Copy characters from 'str' start to 'orig' st$
+ buffer2[p-str] = '\0';
- sprintf(buffer+(p-str), "%s%s", rep, p+strlen(orig));
+ sprintf(buffer3, "%s%s%s", buffer2, rep, p+strlen(orig));
+ sprintf(buffer, "%s", buffer3);
return buffer;
}
@@ -175,7 +178,8 @@
void error(const char *s)
{
perror(s);
- exit(0);
+ assert(0);
+ exit(-1);
}
void malloc_error()
@@ -359,6 +363,21 @@
return sum_array(a,n)/n;
}
+void mean_arrays(float **a, int n, int els, float *avg)
+{
+ int i;
+ int j;
+ memset(avg, 0, els*sizeof(float));
+ for(j = 0; j < n; ++j){
+ for(i = 0; i < els; ++i){
+ avg[i] += a[j][i];
+ }
+ }
+ for(i = 0; i < els; ++i){
+ avg[i] /= n;
+ }
+}
+
float variance_array(float *a, int n)
{
int i;
@@ -436,6 +455,12 @@
return max_i;
}
+int rand_int(int min, int max)
+{
+ 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()
@@ -470,9 +495,9 @@
}
*/
-float rand_uniform()
+float rand_uniform(float min, float max)
{
- return (float)rand()/RAND_MAX;
+ return ((float)rand()/RAND_MAX * (max - min)) + min;
}
float **one_hot_encode(float *a, int n, int k)
--
Gitblit v1.10.0