removing dead wood

DESCRIPTION

@@ -18,7 +18,7 @@ Suggests:
     testthat (>= 2.1.0),
     magrittr,
     covr
-RoxygenNote: 6.1.1
+RoxygenNote: 7.0.2
 Encoding: UTF-8
 Collate: 
     'MipRules.R'
@@ -30,7 +30,6 @@ Collate:
     'errorlocate-package.r'
     'errorlocation.R'
     'expr_manip.R'
-    'expr_simplify.R'
     'linear.R'
     'locate-errors.R'
     'mip_lpsolve.R'

R/utils.R

@@ -22,33 +22,33 @@ to_exprs <- function(x, ...){
   )
 }
 
-
-get_variables_num <- function(x){
-  var_num <- sapply(to_miprules(x), function(mr){
-    names(mr$type)[mr$type == "double"]
-  })
-  unique(unlist(var_num))
-}
-
-get_variables_cat <- function(x){
-  var_cat <- sapply(to_miprules(x), function(mr){
-    nms <- names(mr$type)
-    nms[mr$type == "binary" & grepl(":", nms)]
-  })
-  var_cat <- unique(unlist(var_cat))
-  if (length(var_cat) == 0){
-    return(
-      data.frame( bin_variable = character(0)
-                , variable     = character(0)
-                , value        = character(0)
-                , stringsAsFactors = FALSE
-      )
-    )
-  }
-
-  data.frame( bin_variable = var_cat
-            , variable     = sub(":.*$", "", var_cat)
-            , value        = sub("^.*:", "", var_cat)
-            , stringsAsFactors = FALSE
-            )
-}
+#
+# get_variables_num <- function(x){
+#   var_num <- sapply(to_miprules(x), function(mr){
+#     names(mr$type)[mr$type == "double"]
+#   })
+#   unique(unlist(var_num))
+# }
+#
+# get_variables_cat <- function(x){
+#   var_cat <- sapply(to_miprules(x), function(mr){
+#     nms <- names(mr$type)
+#     nms[mr$type == "binary" & grepl(":", nms)]
+#   })
+#   var_cat <- unique(unlist(var_cat))
+#   if (length(var_cat) == 0){
+#     return(
+#       data.frame( bin_variable = character(0)
+#                 , variable     = character(0)
+#                 , value        = character(0)
+#                 , stringsAsFactors = FALSE
+#       )
+#     )
+#   }
+#
+#   data.frame( bin_variable = var_cat
+#             , variable     = sub(":.*$", "", var_cat)
+#             , value        = sub("^.*:", "", var_cat)
+#             , stringsAsFactors = FALSE
+#             )
+# }

R/values.R

@@ -17,12 +17,3 @@ substitute_values <- function(x, values=list()){
   }
   vals[!is_logical]
 }
-
-
-#' substitute an existing language object
-#'
-#' @param x expression or language object!
-#' @param values list of values
-substitute_ <- function(x, values=list()){
-  eval(substitute(substitute(x, values), list(x=x)))
-}