From d825e2d48122c3207a3e2e4e8e9be0fbfd7e92b6 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Fri, 11 Mar 2016 16:26:28 -0500
Subject: [PATCH] core: Remove random functions

I no longer need these now that the queue is using the glib
g_random_int_range() function.

Implements #32: Remove custom RNG code
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
---
 core/queue.c          |  1 -
 core/random.c         | 21 --------------------
 include/core/random.h | 36 ----------------------------------
 tests/core/.gitignore |  1 -
 tests/core/Sconscript |  1 -
 tests/core/queue.c    |  1 -
 tests/core/random.c   | 45 -------------------------------------------
 7 files changed, 106 deletions(-)
 delete mode 100644 core/random.c
 delete mode 100644 include/core/random.h
 delete mode 100644 tests/core/random.c

diff --git a/core/queue.c b/core/queue.c
index 0a1b4afb..94b29b98 100644
--- a/core/queue.c
+++ b/core/queue.c
@@ -2,7 +2,6 @@
  * Copyright 2013 (c) Anna Schumaker.
  */
 #include <core/queue.h>
-#include <core/random.h>
 #include <core/string.h>
 #include <stdlib.h>
 
diff --git a/core/random.c b/core/random.c
deleted file mode 100644
index b6db9056..00000000
--- a/core/random.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2014 (c) Anna Schumaker
- */
-#ifdef CONFIG_TESTING
-
-#include <core/random.h>
-
-static unsigned int _random_value = 0;
-
-
-void _seed_random(unsigned int n)
-{
-	_random_value = n;
-}
-
-unsigned int _pick_random()
-{
-	return ++_random_value;
-}
-
-#endif /* CONFIG_TESTING */
diff --git a/include/core/random.h b/include/core/random.h
deleted file mode 100644
index c64eda74..00000000
--- a/include/core/random.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2014 (c) Anna Schumaker
- */
-#ifndef OCARINA_CORE_RANDOM_H
-#define OCARINA_CORE_RANDOM_H
-
-#ifdef CONFIG_TESTING
-
-void _seed_random(unsigned int);
-unsigned int _pick_random();
-
-#else /* CONFIG_TESTING */
-
-#include <stdlib.h>
-static inline void _seed_random(unsigned int n) { srand(time(NULL) + n); }
-static inline unsigned int _pick_random() { return rand(); }
-
-#endif /* CONFIG_TESTING */
-
-
-
-/* Seed the random number generator. */
-static inline void random_seed(unsigned int n)
-{
-	_seed_random(n);
-}
-
-/*  Returns a random number X, where min <= value <= max. */
-static inline unsigned int random_range(unsigned int min, unsigned int max)
-{
-	if (min >= max)
-		return min;
-	return min + (_pick_random() % (max - min));
-}
-
-#endif /* OCARINA_CORE_RANDOM_H */
diff --git a/tests/core/.gitignore b/tests/core/.gitignore
index f037f280..0510fa40 100644
--- a/tests/core/.gitignore
+++ b/tests/core/.gitignore
@@ -1,6 +1,5 @@
 version
 string
-random
 file
 date
 idle
diff --git a/tests/core/Sconscript b/tests/core/Sconscript
index b3457d56..17ae4fbc 100644
--- a/tests/core/Sconscript
+++ b/tests/core/Sconscript
@@ -26,7 +26,6 @@ Export("core_objs", "CoreTest")
 
 res += [ CoreTest("version")    ]
 res += [ CoreTest("string")     ]
-res += [ CoreTest("random")     ]
 res += [ CoreTest("file")       ]
 res += [ CoreTest("date")       ]
 res += [ CoreTest("idle")       ]
diff --git a/tests/core/queue.c b/tests/core/queue.c
index dbcb2eef..e80972f8 100644
--- a/tests/core/queue.c
+++ b/tests/core/queue.c
@@ -3,7 +3,6 @@
  */
 #include <core/filter.h>
 #include <core/queue.h>
-#include <core/random.h>
 #include <core/tags/tags.h>
 #include <tests/test.h>
 
diff --git a/tests/core/random.c b/tests/core/random.c
deleted file mode 100644
index fae7d0b4..00000000
--- a/tests/core/random.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2014 (c) Anna Schumaker.
- */
-#include <core/random.h>
-#include <core/string.h>
-#include <tests/test.h>
-
-
-static void test_rng(unsigned int seed)
-{
-	random_seed(seed);
-
-	for (unsigned int i = 0; i <= 10; i++) {
-		if (i <= seed)
-			test_equal(random_range(seed, i), seed);
-		else
-			test_equal(random_range(seed, i), seed + (i % (i - seed)));
-	}
-}
-
-
-static void test_rng_0() { test_rng(0); }
-static void test_rng_1() { test_rng(1); }
-static void test_rng_2() { test_rng(2); }
-static void test_rng_3() { test_rng(3); }
-static void test_rng_4() { test_rng(4); }
-static void test_rng_5() { test_rng(5); }
-static void test_rng_6() { test_rng(6); }
-static void test_rng_7() { test_rng(7); }
-static void test_rng_8() { test_rng(8); }
-static void test_rng_9() { test_rng(9); }
-
-
-DECLARE_UNIT_TESTS(
-	UNIT_TEST("Random Number Generator (seed = 0)", test_rng_0),
-	UNIT_TEST("Random Number Generator (seed = 1)", test_rng_1),
-	UNIT_TEST("Random Number Generator (seed = 2)", test_rng_2),
-	UNIT_TEST("Random Number Generator (seed = 3)", test_rng_3),
-	UNIT_TEST("Random Number Generator (seed = 4)", test_rng_4),
-	UNIT_TEST("Random Number Generator (seed = 5)", test_rng_5),
-	UNIT_TEST("Random Number Generator (seed = 6)", test_rng_6),
-	UNIT_TEST("Random Number Generator (seed = 7)", test_rng_7),
-	UNIT_TEST("Random Number Generator (seed = 8)", test_rng_8),
-	UNIT_TEST("Random Number Generator (seed = 9)", test_rng_9),
-);