Skip to content

Commit 06940be

Browse files
committed
continue Durbin factors
1 parent cd46e51 commit 06940be

File tree

2 files changed

+28
-2
lines changed

2 files changed

+28
-2
lines changed

R/spBreg.R

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,8 +1329,12 @@ spBreg_sac <- function(formula, data = list(), listw, listw2=NULL, na.action,
13291329
lambda2 = lambda + cc2*rnorm(1)
13301330
}
13311331
}
1332-
i1 = max(which(detval21 <= (lambda2 + gsize2)))
1333-
i2 = max(which(detval21 <= (lambda2 - gsize2)))
1332+
i1 <- which(detval21 <= (lambda2 + gsize2))
1333+
if (length(i1) == 0L) i1 <- -Inf
1334+
else i1 = max(i1)
1335+
i2 <- which(detval21 <= (lambda2 - gsize2))
1336+
if (length(i2) == 0L) i2 <- -Inf
1337+
else i2 = max(i2)
13341338
index = round((i1+i2)/2)
13351339
if (!is.finite(index)) index = 1 #Fixed this
13361340
detm = detval22[index]

inst/tinytest/test_Durbin_factor.R

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ expect_warning(COL.lag1a <- spBreg_lag(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL
8383
expect_warning(COL.lag2a <- spBreg_lag(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD))
8484
expect_silent(COL.lag3a <- spBreg_lag(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL))
8585
Sys.setenv("SPATIALREG_CREATE_DURBIN"="")
86+
expect_true(isTRUE(all.equal(attr(COL.lag0, "dvars"), attr(COL.lag0a, "dvars"))))
87+
expect_true(isTRUE(all.equal(attr(COL.lag1, "dvars"), attr(COL.lag1a, "dvars"))))
88+
expect_true(isTRUE(all.equal(attr(COL.lag2, "dvars"), attr(COL.lag2a, "dvars"))))
89+
expect_true(isTRUE(all.equal(attr(COL.lag3, "dvars"), attr(COL.lag3a, "dvars"))))
8690
expect_warning(COL.err0 <- spBreg_err(f, data=COL.OLD, lw, Durbin=TRUE))
8791
expect_warning(COL.err1 <- spBreg_err(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD*fEW))
8892
expect_warning(COL.err2 <- spBreg_err(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD))
@@ -93,4 +97,22 @@ expect_warning(COL.err1a <- spBreg_err(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL
9397
expect_warning(COL.err2a <- spBreg_err(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD))
9498
expect_silent(COL.err3a <- spBreg_err(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL))
9599
Sys.setenv("SPATIALREG_CREATE_DURBIN"="")
100+
expect_true(isTRUE(all.equal(attr(COL.err0, "dvars"), attr(COL.err0a, "dvars"))))
101+
expect_true(isTRUE(all.equal(attr(COL.err1, "dvars"), attr(COL.err1a, "dvars"))))
102+
expect_true(isTRUE(all.equal(attr(COL.err2, "dvars"), attr(COL.err2a, "dvars"))))
103+
expect_true(isTRUE(all.equal(attr(COL.err3, "dvars"), attr(COL.err3a, "dvars"))))
104+
expect_warning(COL.sac0 <- spBreg_sac(f, data=COL.OLD, lw, Durbin=TRUE))
105+
expect_warning(COL.sac1 <- spBreg_sac(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD*fEW))
106+
expect_warning(COL.sac2 <- spBreg_sac(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD))
107+
expect_silent(COL.sac3 <- spBreg_sac(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL))
108+
Sys.setenv("SPATIALREG_CREATE_DURBIN"="0")
109+
expect_warning(COL.sac0a <- spBreg_sac(f, data=COL.OLD, lw, Durbin=TRUE))
110+
expect_warning(COL.sac1a <- spBreg_sac(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD*fEW))
111+
expect_warning(COL.sac2a <- spBreg_sac(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL + fDISCBD))
112+
expect_silent(COL.sac3a <- spBreg_sac(f, data=COL.OLD, lw, Durbin=~ INC + HOVAL))
113+
Sys.setenv("SPATIALREG_CREATE_DURBIN"="")
114+
expect_true(isTRUE(all.equal(attr(COL.sac0, "dvars"), attr(COL.sac0a, "dvars"))))
115+
expect_true(isTRUE(all.equal(attr(COL.sac1, "dvars"), attr(COL.sac1a, "dvars"))))
116+
expect_true(isTRUE(all.equal(attr(COL.sac2, "dvars"), attr(COL.sac2a, "dvars"))))
117+
expect_true(isTRUE(all.equal(attr(COL.sac3, "dvars"), attr(COL.sac3a, "dvars"))))
96118

0 commit comments

Comments
 (0)