Skip to content

Commit 3ede5dc

Browse files
committed
remove unused 'random_pair' code
1 parent 2bfa1bd commit 3ede5dc

File tree

1 file changed

+0
-30
lines changed

1 file changed

+0
-30
lines changed

src/inventory.h

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -129,36 +129,6 @@ class inventory_t {
129129
while (draw-- > 0) k++;
130130
return *k;
131131
};
132-
//! choose a random pair of balls, one from each deme.
133-
//! the demes can be the same.
134-
void random_pair (ball_t** ballI, ball_t** ballJ, name_t i = 0, name_t j = 0) const {
135-
if (i != j) {
136-
*ballI = random_ball(i);
137-
*ballJ = random_ball(j);
138-
} else {
139-
name_t n = _inven[i].size();
140-
assert(n > 1);
141-
name_t d1 = random_integer(n-1);
142-
name_t d2 = random_integer(n);
143-
bool toggle = false;
144-
if (d1 >= d2) {
145-
toggle = true;
146-
d1++;
147-
n = d1; d1 = d2; d2 = n;
148-
}
149-
ball_it k = _inven[i].begin();
150-
while (d1 > 0) {
151-
d1--; d2--; k++;
152-
}
153-
if (toggle) *ballJ = *k;
154-
else *ballI = *k;
155-
while (d2 > 0) {
156-
d2--; k++;
157-
}
158-
if (toggle) *ballI = *k;
159-
else *ballJ = *k;
160-
}
161-
};
162132
//! choose a random set of `n` balls from deme `i`
163133
pocket_t* random_balls (name_t i = 0, int n = 1) const {
164134
pocket_t *p = new pocket_t();

0 commit comments

Comments
 (0)