From b8eb8b0a4016232c8da95c26501ac60ea9491901 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 02 Sep 2016 00:26:12 +0000
Subject: [PATCH] Merge branch 'master' of github.com:pjreddie/darknet
---
src/utils.c | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index 90af5cf..a6cb421 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -521,12 +521,16 @@
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;
@@ -573,9 +577,21 @@
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)
{
int i;
--
Gitblit v1.10.0