From 4b366754716fc4b5d0148de03ee8d9710df1bfdb Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sun, 12 Jul 2015 05:53:45 +0000
Subject: [PATCH] Merge branch 'master' of github.com:pjreddie/darknet

---
 src/utils.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/utils.h b/src/utils.h
index 4c6b2a9..5e6c507 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -26,7 +26,7 @@
 void scale_array(float *a, int n, float s);
 void translate_array(float *a, int n, float s);
 int max_index(float *a, int n);
-float constrain(float a, float max);
+float constrain(float min, float max, float a);
 float mse_array(float *a, int n);
 float rand_normal();
 float rand_uniform();
@@ -36,5 +36,10 @@
 float mag_array(float *a, int n);
 float **one_hot_encode(float *a, int n, int k);
 float sec(clock_t clocks);
+int find_int_arg(int argc, char **argv, char *arg, int def);
+float find_float_arg(int argc, char **argv, char *arg, float def);
+int find_arg(int argc, char* argv[], char *arg);
+char *find_char_arg(int argc, char **argv, char *arg, char *def);
+
 #endif
 

--
Gitblit v1.10.0