@@ -95,6 +95,7 @@ ols_step_best_subset.default <- function(model, max_order = NULL,
9595 }
9696
9797 nam <- setdiff(coeff_names(model ), exclude )
98+ nam <- setdiff(coeff_names(model ), include )
9899 n <- length(nam )
99100 r <- seq_len(n )
100101 combs <- list ()
@@ -118,19 +119,25 @@ ols_step_best_subset.default <- function(model, max_order = NULL,
118119 colas <- unname(unlist(lapply(combs , ncol )))
119120 response <- varnames [1 ]
120121 predicts <- list ()
121- k <- 1
122+
123+ if (is.null(include )) {
124+ k <- 1
125+ } else {
126+ predicts [[1 ]] <- include
127+ k <- 2
128+ }
122129
123130 for (i in seq_len(lc )) {
124131 for (j in seq_len(colas [i ])) {
125- predicts [[k ]] <- nam [combs [[i ]][, j ]]
132+ predicts [[k ]] <- c( include , nam [combs [[i ]][, j ]])
126133 k <- k + 1
127134 }
128135 }
129136
130- if (! is.null(include )) {
131- y <- grep(include , predicts )
132- predicts <- predicts [y ]
133- }
137+ # if(!is.null(include)) {
138+ # y <- grep(include, predicts)
139+ # predicts <- predicts[y]
140+ # }
134141
135142 len_elig <- length(predicts )
136143
@@ -205,6 +212,7 @@ ols_step_best_subset.default <- function(model, max_order = NULL,
205212 class(result ) <- c(" ols_step_best_subset" )
206213
207214 return (result )
215+ # return(list(nam, combs, colas, predicts))
208216
209217}
210218
0 commit comments