From ebd313721e5eb4130bbdddba4ba928f28f88908f Mon Sep 17 00:00:00 2001
From: Aaron <aaronquinlan@gmail.com>
Date: Fri, 20 Jul 2012 20:50:10 -0400
Subject: [PATCH] slightly better randomization
---
src/randomBed/randomBed.cpp | 2 +-
src/shuffleBed/shuffleBed.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/randomBed/randomBed.cpp b/src/randomBed/randomBed.cpp
index 72f50352..8eb7a13a 100644
--- a/src/randomBed/randomBed.cpp
+++ b/src/randomBed/randomBed.cpp
@@ -58,7 +58,7 @@ void BedRandom::Generate()
// we need to combine two consective calls to rand()
// because RAND_MAX is 2^31 (2147483648), whereas
// mammalian genomes are obviously much larger.
- uint32_t randStart = ((rand() << 31) | rand()) % genomeSize;
+ uint32_t randStart = ((((long) rand()) << 31) | rand()) % genomeSize;
// use the above randomStart (e.g., for human 0..3.1billion)
// to identify the chrom and start on that chrom.
pair<string, int> location = _genome->projectOnGenome(randStart);
diff --git a/src/shuffleBed/shuffleBed.cpp b/src/shuffleBed/shuffleBed.cpp
index 5d72af4d..8a307498 100644
--- a/src/shuffleBed/shuffleBed.cpp
+++ b/src/shuffleBed/shuffleBed.cpp
@@ -250,7 +250,7 @@ void BedShuffle::ChooseLocus(BED &bedEntry) {
// we need to combine two consective calls to rand()
// because RAND_MAX is 2^31 (2147483648), whereas
// mammalian genomes are obviously much larger.
- uint32_t randStart = ((rand() << 31) | rand()) % _genomeSize;
+ uint32_t randStart = ((((long) rand()) << 31) | rand()) % _genomeSize;
// use the above randomStart (e.g., for human 0..3.1billion)
// to identify the chrom and start on that chrom.
pair<string, int> location = _genome->projectOnGenome(randStart);
@@ -298,7 +298,7 @@ void BedShuffle::ChoosePairedLocus(BEDPE &b) {
CHRPOS chromSize;
do
{
- uint32_t randStart = ((rand() << 31) | rand()) % _genomeSize;
+ uint32_t randStart = ((((long) rand()) << 31) | rand()) % _genomeSize;
pair<string, int> location = _genome->projectOnGenome(randStart);
b.chrom1 = location.first;
b.chrom2 = location.first;
@@ -317,8 +317,8 @@ void BedShuffle::ChoosePairedLocus(BEDPE &b) {
CHRPOS chromSize1, chromSize2;
do
{
- uint32_t rand1Start = ((rand() << 31) | rand()) % _genomeSize;
- uint32_t rand2Start = ((rand() << 31) | rand()) % _genomeSize;
+ uint32_t rand1Start = ((((long) rand()) << 31) | rand()) % _genomeSize;
+ uint32_t rand2Start = ((((long) rand()) << 31) | rand()) % _genomeSize;
pair<string, int> location1 = _genome->projectOnGenome(rand1Start);
pair<string, int> location2 = _genome->projectOnGenome(rand2Start);
--
GitLab