From 701f4fab63b3f6826ae6095ce32b9b99b3ece203 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 16 Apr 2018 14:58:08 +0000
Subject: [PATCH] Compile fix
---
src/utils.c | 123 ++++++++++++++++++++++++++++++++++------
1 files changed, 103 insertions(+), 20 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index 41893fc..615d836 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -3,12 +3,43 @@
#include <string.h>
#include <math.h>
#include <assert.h>
-#include <unistd.h>
#include <float.h>
#include <limits.h>
-
+#ifdef WIN32
+#include "unistd.h"
+#include "gettimeofday.h"
+#else
+#include <unistd.h>
+#include <sys/time.h>
+#endif
#include "utils.h"
+#pragma warning(disable: 4996)
+
+double what_time_is_it_now()
+{
+ struct timeval time;
+ if (gettimeofday(&time, NULL)) {
+ return 0;
+ }
+ return (double)time.tv_sec + (double)time.tv_usec * .000001;
+}
+
+int *read_map(char *filename)
+{
+ int n = 0;
+ int *map = 0;
+ char *str;
+ FILE *file = fopen(filename, "r");
+ if(!file) file_error(filename);
+ while((str=fgetl(file))){
+ ++n;
+ map = realloc(map, n*sizeof(int));
+ map[n-1] = atoi(str);
+ }
+ return map;
+}
+
void sorta_shuffle(void *arr, size_t n, size_t size, size_t sections)
{
size_t i;
@@ -16,7 +47,7 @@
size_t start = n*i/sections;
size_t end = n*(i+1)/sections;
size_t num = end-start;
- shuffle(arr+(start*size), num, size);
+ shuffle((char*)arr+(start*size), num, size);
}
}
@@ -26,9 +57,9 @@
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);
+ memcpy(swp, (char*)arr+(j*size), size);
+ memcpy((char*)arr+(j*size), (char*)arr+(i*size), size);
+ memcpy((char*)arr+(i*size), swp, size);
}
}
@@ -106,6 +137,7 @@
{
c = next+1;
}
+ if(!next) while ((next = strchr(c, '\\'))) { c = next + 1; }
c = copy_string(c);
next = strchr(c, '.');
if (next) *next = 0;
@@ -135,23 +167,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)
@@ -216,7 +245,7 @@
size_t offset = 0;
for(i = 0; i < len; ++i){
char c = s[i];
- if(c==' '||c=='\t'||c=='\n') ++offset;
+ if(c==' '||c=='\t'||c=='\n'||c =='\r') ++offset;
else s[i-offset] = c;
}
s[len-offset] = '\0';
@@ -268,7 +297,8 @@
fgets(&line[curr], readsize, fp);
curr = strlen(line);
}
- if(line[curr-1] == '\n') line[curr-1] = '\0';
+ if(line[curr-2] == 0x0d) line[curr-2] = 0x00;
+ if(line[curr-1] == 0x0a) line[curr-1] = 0x00;
return line;
}
@@ -414,6 +444,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;
@@ -519,6 +556,15 @@
return max_i;
}
+int int_index(int *a, int val, int n)
+{
+ int i;
+ for (i = 0; i < n; ++i) {
+ if (a[i] == val) return i;
+ }
+ return -1;
+}
+
int rand_int(int min, int max)
{
if (max < min){
@@ -583,6 +629,14 @@
max = swap;
}
return ((float)rand()/RAND_MAX * (max - min)) + min;
+ //return (random_float() * (max - min)) + min;
+}
+
+float rand_scale(float s)
+{
+ float scale = rand_uniform_strong(1, s);
+ if(random_gen()%2) return scale;
+ return 1./scale;
}
float **one_hot_encode(float *a, int n, int k)
@@ -597,3 +651,32 @@
return t;
}
+unsigned int random_gen()
+{
+ unsigned int rnd = 0;
+#ifdef WIN32
+ rand_s(&rnd);
+#else
+ rnd = rand();
+#endif
+ return rnd;
+}
+
+float random_float()
+{
+#ifdef WIN32
+ return ((float)random_gen() / (float)UINT_MAX);
+#else
+ return ((float)random_gen() / (float)RAND_MAX);
+#endif
+}
+
+float rand_uniform_strong(float min, float max)
+{
+ if (max < min) {
+ float swap = min;
+ min = max;
+ max = swap;
+ }
+ return (random_float() * (max - min)) + min;
+}
\ No newline at end of file
--
Gitblit v1.10.0