From a99050f0c8cb0315fa31e3d1fa3e38594fe5e40a Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 08 Dec 2014 04:16:21 +0000
Subject: [PATCH] Some fixes to momentum
---
src/utils.c | 95 +++++++++++++++++++++++++++++++++--------------
1 files changed, 67 insertions(+), 28 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index 1afe048..e100069 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,17 +1,55 @@
-#include "utils.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
+#include <float.h>
+
+#include "utils.h"
+
+char *find_replace(char *str, char *orig, char *rep)
+{
+ static char buffer[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';
+
+ sprintf(buffer+(p-str), "%s%s", rep, p+strlen(orig));
+
+ return buffer;
+}
float sec(clock_t clocks)
{
return (float)clocks/CLOCKS_PER_SEC;
}
+void top_k(float *a, int n, int k, int *index)
+{
+ int i,j;
+ float thresh = FLT_MAX;
+ for(i = 0; i < k; ++i){
+ float max = -FLT_MAX;
+ int max_i = -1;
+ for(j = 0; j < n; ++j){
+ float val = a[j];
+ if(val > max && val < thresh){
+ max = val;
+ max_i = j;
+ }
+ }
+ index[i] = max_i;
+ thresh = max;
+ }
+}
+
void error(char *s)
{
- fprintf(stderr, "Error: %s\n", s);
+ perror(s);
+ //fprintf(stderr, "Error: %s\n", s);
exit(0);
}
@@ -79,7 +117,7 @@
}
int curr = strlen(line);
-
+
while(line[curr-1]!='\n'){
size *= 2;
line = realloc(line, size*sizeof(char));
@@ -121,34 +159,34 @@
int count_fields(char *line)
{
- int count = 0;
- int done = 0;
+ int count = 0;
+ int done = 0;
char *c;
- for(c = line; !done; ++c){
- done = (*c == '\0');
- if(*c == ',' || done) ++count;
- }
- return count;
+ for(c = line; !done; ++c){
+ done = (*c == '\0');
+ if(*c == ',' || done) ++count;
+ }
+ return count;
}
float *parse_fields(char *line, int n)
{
- float *field = calloc(n, sizeof(float));
- char *c, *p, *end;
- int count = 0;
- int done = 0;
- for(c = line, p = line; !done; ++c){
- done = (*c == '\0');
- if(*c == ',' || done){
- *c = '\0';
- field[count] = strtod(p, &end);
- if(p == c) field[count] = nan("");
- if(end != c && (end != c-1 || *end != '\r')) field[count] = nan(""); //DOS file formats!
- p = c+1;
- ++count;
- }
- }
- return field;
+ float *field = calloc(n, sizeof(float));
+ char *c, *p, *end;
+ int count = 0;
+ int done = 0;
+ for(c = line, p = line; !done; ++c){
+ done = (*c == '\0');
+ if(*c == ',' || done){
+ *c = '\0';
+ field[count] = strtod(p, &end);
+ if(p == c) field[count] = nan("");
+ if(end != c && (end != c-1 || *end != '\r')) field[count] = nan(""); //DOS file formats!
+ p = c+1;
+ ++count;
+ }
+ }
+ return field;
}
float sum_array(float *a, int n)
@@ -224,10 +262,11 @@
float rand_normal()
{
+ int n = 12;
int i;
float sum= 0;
- for(i = 0; i < 12; ++i) sum += (float)rand()/RAND_MAX;
- return sum-6.;
+ for(i = 0; i < n; ++i) sum += (float)rand()/RAND_MAX;
+ return sum-n/2.;
}
float rand_uniform()
{
--
Gitblit v1.10.0