From 0316685077bf82d4dbeadb9e947e3ea16b6ae703 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Sat, 26 Aug 2017 18:53:07 +0000
Subject: [PATCH] Update Readme.md
---
src/utils.c | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index 41e71d0..05ad885 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -3,10 +3,13 @@
#include <string.h>
#include <math.h>
#include <assert.h>
-#include "unistd.h"
#include <float.h>
#include <limits.h>
-
+#ifdef WIN32
+#include "unistd.h"
+#else
+#include <unistd.h>
+#endif
#include "utils.h"
#pragma warning(disable: 4996)
@@ -604,12 +607,13 @@
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(1, s);
- if(rand()%2) return scale;
+ float scale = rand_uniform_strong(1, s);
+ if(random_gen()%2) return scale;
return 1./scale;
}
@@ -625,3 +629,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