... | ... |
@@ -524,18 +524,6 @@ float m2, unsigned r1, unsigned c1, unsigned r2, unsigned c2) |
524 | 524 |
{ |
525 | 525 |
if (impl()->canUseGibbs(r1, c1, r2, c2)) |
526 | 526 |
{ |
527 |
- // swapping only effects alpha parameters - only effects gibbs |
|
528 |
- // flips the sign of alpha parameters (only su) |
|
529 |
- // flips sign in gibbs mass |
|
530 |
- // can we swap after gibbsMass calculation? |
|
531 |
- /*if ((m1 > m2 && m1 > newMass) || (m2 > m1 && m2 < newMass)) |
|
532 |
- { |
|
533 |
- std::swap(r1, r2); |
|
534 |
- std::swap(c1, c2); |
|
535 |
- std::swap(p1, p2); |
|
536 |
- std::swap(m1, m2); |
|
537 |
- }*/ |
|
538 |
- |
|
539 | 527 |
AlphaParameters alpha = impl()->alphaParameters(r1, c1, r2, c2); |
540 | 528 |
std::pair<float, bool> gMass = gibbsMass(alpha, m1, m2); |
541 | 529 |
if (gMass.second) |
... | ... |
@@ -12,7 +12,7 @@ test_that("Subsetting Data", |
12 | 12 |
names(weights) <- letters[1:5] |
13 | 13 |
params <- new("CogapsParams") |
14 | 14 |
params <- setAnnotationWeights(params, annotation=anno, weights=weights) |
15 |
- result <- GWCoGAPS(testMatrix, params, messages=FALSE) |
|
15 |
+ result <- GWCoGAPS(testMatrix, params, messages=FALSE, seed=123) |
|
16 | 16 |
|
17 | 17 |
getIndex <- function(s) as.numeric(strsplit(s, "_")[[1]][2]) |
18 | 18 |
getIndices <- function(set) unname(sapply(set, getIndex)) |
... | ... |
@@ -21,7 +21,7 @@ test_that("Subsetting Data", |
21 | 21 |
hist <- sapply(getSubsets(result), getHistogram) |
22 | 22 |
freq <- unname(rowSums(hist) / sum(hist)) |
23 | 23 |
|
24 |
- expect_true(all.equal(freq, unname(weights / sum(weights)), tol=0.05)) |
|
24 |
+ expect_true(all.equal(freq, unname(weights / sum(weights)), tol=0.1)) |
|
25 | 25 |
|
26 | 26 |
# running cogaps with given subsets |
27 | 27 |
sets <- list(1:225, 226:450, 451:675, 676:900) |