From 8f1b4e0962857d402f9d017fcbf387ef0eceb7c4 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 01 Sep 2016 23:48:41 +0000
Subject: [PATCH] updates and things
---
src/utils.c | 360 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 328 insertions(+), 32 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index 365faeb..a6cb421 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -2,22 +2,154 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
+#include <assert.h>
+#include <unistd.h>
#include <float.h>
+#include <limits.h>
#include "utils.h"
+void sorta_shuffle(void *arr, size_t n, size_t size, size_t sections)
+{
+ size_t i;
+ for(i = 0; i < sections; ++i){
+ size_t start = n*i/sections;
+ size_t end = n*(i+1)/sections;
+ size_t num = end-start;
+ shuffle(arr+(start*size), num, size);
+ }
+}
+
+void shuffle(void *arr, size_t n, size_t size)
+{
+ size_t i;
+ void *swp = calloc(1, size);
+ for(i = 0; i < n-1; ++i){
+ size_t j = i + rand()/(RAND_MAX / (n-i)+1);
+ memcpy(swp, arr+(j*size), size);
+ memcpy(arr+(j*size), arr+(i*size), size);
+ memcpy(arr+(i*size), swp, size);
+ }
+}
+
+void del_arg(int argc, char **argv, int index)
+{
+ int i;
+ for(i = index; i < argc-1; ++i) argv[i] = argv[i+1];
+ argv[i] = 0;
+}
+
+int find_arg(int argc, char* argv[], char *arg)
+{
+ int i;
+ for(i = 0; i < argc; ++i) {
+ if(!argv[i]) continue;
+ if(0==strcmp(argv[i], arg)) {
+ del_arg(argc, argv, i);
+ return 1;
+ }
+ }
+ return 0;
+}
+
+int find_int_arg(int argc, char **argv, char *arg, int def)
+{
+ int i;
+ for(i = 0; i < argc-1; ++i){
+ if(!argv[i]) continue;
+ if(0==strcmp(argv[i], arg)){
+ def = atoi(argv[i+1]);
+ del_arg(argc, argv, i);
+ del_arg(argc, argv, i);
+ break;
+ }
+ }
+ return def;
+}
+
+float find_float_arg(int argc, char **argv, char *arg, float def)
+{
+ int i;
+ for(i = 0; i < argc-1; ++i){
+ if(!argv[i]) continue;
+ if(0==strcmp(argv[i], arg)){
+ def = atof(argv[i+1]);
+ del_arg(argc, argv, i);
+ del_arg(argc, argv, i);
+ break;
+ }
+ }
+ return def;
+}
+
+char *find_char_arg(int argc, char **argv, char *arg, char *def)
+{
+ int i;
+ for(i = 0; i < argc-1; ++i){
+ if(!argv[i]) continue;
+ if(0==strcmp(argv[i], arg)){
+ def = argv[i+1];
+ del_arg(argc, argv, i);
+ del_arg(argc, argv, i);
+ break;
+ }
+ }
+ return def;
+}
+
+
+char *basecfg(char *cfgfile)
+{
+ char *c = cfgfile;
+ char *next;
+ while((next = strchr(c, '/')))
+ {
+ c = next+1;
+ }
+ c = copy_string(c);
+ next = strchr(c, '.');
+ if (next) *next = 0;
+ return c;
+}
+
+int alphanum_to_int(char c)
+{
+ return (c < 58) ? c - 48 : c-87;
+}
+char int_to_alphanum(int i)
+{
+ if (i == 36) return '.';
+ return (i < 10) ? i + 48 : i + 87;
+}
+
+void pm(int M, int N, float *A)
+{
+ int i,j;
+ for(i =0 ; i < M; ++i){
+ printf("%d ", i+1);
+ for(j = 0; j < 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;
}
@@ -30,11 +162,11 @@
void top_k(float *a, int n, int k, int *index)
{
int i,j;
- for(j = 0; j < k; ++j) index[j] = 0;
+ for(j = 0; j < k; ++j) index[j] = -1;
for(i = 0; i < n; ++i){
int curr = i;
for(j = 0; j < k; ++j){
- if(a[curr] > a[index[j]]){
+ if((index[j] < 0) || a[curr] > a[index[j]]){
int swap = curr;
curr = index[j];
index[j] = swap;
@@ -43,11 +175,11 @@
}
}
-void error(char *s)
+void error(const char *s)
{
perror(s);
- //fprintf(stderr, "Error: %s\n", s);
- exit(0);
+ assert(0);
+ exit(-1);
}
void malloc_error()
@@ -64,8 +196,8 @@
list *split_str(char *s, char delim)
{
- int i;
- int len = strlen(s);
+ size_t i;
+ size_t len = strlen(s);
list *l = make_list();
list_insert(l, s);
for(i = 0; i < len; ++i){
@@ -79,9 +211,9 @@
void strip(char *s)
{
- int i;
- int len = strlen(s);
- int offset = 0;
+ size_t i;
+ size_t len = strlen(s);
+ size_t offset = 0;
for(i = 0; i < len; ++i){
char c = s[i];
if(c==' '||c=='\t'||c=='\n') ++offset;
@@ -92,9 +224,9 @@
void strip_char(char *s, char bad)
{
- int i;
- int len = strlen(s);
- int offset = 0;
+ size_t i;
+ size_t len = strlen(s);
+ size_t offset = 0;
for(i = 0; i < len; ++i){
char c = s[i];
if(c==bad) ++offset;
@@ -103,33 +235,101 @@
s[len-offset] = '\0';
}
+void free_ptrs(void **ptrs, int n)
+{
+ int i;
+ for(i = 0; i < n; ++i) free(ptrs[i]);
+ free(ptrs);
+}
+
char *fgetl(FILE *fp)
{
if(feof(fp)) return 0;
- unsigned long size = 512;
+ size_t size = 512;
char *line = malloc(size*sizeof(char));
if(!fgets(line, size, fp)){
free(line);
return 0;
}
- int curr = strlen(line);
+ size_t curr = strlen(line);
- while(line[curr-1]!='\n'){
- size *= 2;
- line = realloc(line, size*sizeof(char));
- if(!line) {
- printf("%ld\n", size);
- malloc_error();
+ while((line[curr-1] != '\n') && !feof(fp)){
+ if(curr == size-1){
+ size *= 2;
+ line = realloc(line, size*sizeof(char));
+ if(!line) {
+ printf("%ld\n", size);
+ malloc_error();
+ }
}
- fgets(&line[curr], size-curr, fp);
+ size_t readsize = size-curr;
+ if(readsize > INT_MAX) readsize = INT_MAX-1;
+ fgets(&line[curr], readsize, fp);
curr = strlen(line);
}
- line[curr-1] = '\0';
+ if(line[curr-1] == '\n') line[curr-1] = '\0';
return line;
}
+int read_int(int fd)
+{
+ int n = 0;
+ int next = read(fd, &n, sizeof(int));
+ if(next <= 0) return -1;
+ return n;
+}
+
+void write_int(int fd, int n)
+{
+ int next = write(fd, &n, sizeof(int));
+ if(next <= 0) error("read failed");
+}
+
+int read_all_fail(int fd, char *buffer, size_t bytes)
+{
+ size_t n = 0;
+ while(n < bytes){
+ int next = read(fd, buffer + n, bytes-n);
+ if(next <= 0) return 1;
+ n += next;
+ }
+ return 0;
+}
+
+int write_all_fail(int fd, char *buffer, size_t bytes)
+{
+ size_t n = 0;
+ while(n < bytes){
+ size_t next = write(fd, buffer + n, bytes-n);
+ if(next <= 0) return 1;
+ n += next;
+ }
+ return 0;
+}
+
+void read_all(int fd, char *buffer, size_t bytes)
+{
+ size_t n = 0;
+ while(n < bytes){
+ int next = read(fd, buffer + n, bytes-n);
+ if(next <= 0) error("read failed");
+ n += next;
+ }
+}
+
+void write_all(int fd, char *buffer, size_t bytes)
+{
+ size_t n = 0;
+ while(n < bytes){
+ size_t next = write(fd, buffer + n, bytes-n);
+ if(next <= 0) error("write failed");
+ n += next;
+ }
+}
+
+
char *copy_string(char *s)
{
char *copy = malloc(strlen(s)+1);
@@ -199,6 +399,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;
@@ -209,13 +424,36 @@
return variance;
}
-float constrain(float a, float max)
+int constrain_int(int a, int min, int max)
{
- if(a > abs(max)) return abs(max);
- if(a < -abs(max)) return -abs(max);
+ if (a < min) return min;
+ if (a > max) return max;
return a;
}
+float constrain(float min, float max, float a)
+{
+ if (a < min) return min;
+ if (a > max) return max;
+ return a;
+}
+
+float dist_array(float *a, float *b, int n, int sub)
+{
+ int i;
+ float sum = 0;
+ for(i = 0; i < n; i += sub) sum += pow(a[i]-b[i], 2);
+ return sqrt(sum);
+}
+
+float mse_array(float *a, int n)
+{
+ int i;
+ float sum = 0;
+ for(i = 0; i < n; ++i) sum += a[i]*a[i];
+ return sqrt(sum/n);
+}
+
void normalize_array(float *a, int n)
{
int i;
@@ -236,6 +474,16 @@
}
}
+float mag_array(float *a, int n)
+{
+ int i;
+ float sum = 0;
+ for(i = 0; i < n; ++i){
+ sum += a[i]*a[i];
+ }
+ return sqrt(sum);
+}
+
void scale_array(float *a, int n, float s)
{
int i;
@@ -243,6 +491,20 @@
a[i] *= s;
}
}
+
+int sample_array(float *a, int n)
+{
+ float sum = sum_array(a, n);
+ scale_array(a, n, 1./sum);
+ float r = rand_uniform(0, 1);
+ int i;
+ for(i = 0; i < n; ++i){
+ r = r - a[i];
+ if (r <= 0) return i;
+ }
+ return n-1;
+}
+
int max_index(float *a, int n)
{
if(n <= 0) return -1;
@@ -257,8 +519,18 @@
return max_i;
}
+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;
@@ -291,9 +563,33 @@
}
*/
-float rand_uniform()
+size_t rand_size_t()
{
- return (float)rand()/RAND_MAX;
+ return ((size_t)(rand()&0xff) << 56) |
+ ((size_t)(rand()&0xff) << 48) |
+ ((size_t)(rand()&0xff) << 40) |
+ ((size_t)(rand()&0xff) << 32) |
+ ((size_t)(rand()&0xff) << 24) |
+ ((size_t)(rand()&0xff) << 16) |
+ ((size_t)(rand()&0xff) << 8) |
+ ((size_t)(rand()&0xff) << 0);
+}
+
+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)
--
Gitblit v1.10.0