Fixing the build, changed imports to not require proxy for metric check

Author: peekxc

.gitattributes

@@ -0,0 +1,4 @@
+* linguist-vendored
+*.R linguist-vendored=false
+*.cpp linguist-vendored=false
+*.h linguist-vendored=false

.gitignore

@@ -45,3 +45,4 @@ rsconnect/
 ## Work 
 work/
 ignore/
+.idea

DESCRIPTION

@@ -2,7 +2,7 @@ Package: Mapper
 Type: Package
 Title: Topological Data Analysis using Mapper
 Version: 0.8.0
-Date: 2018-10-29
+Date: 2018-11-29
 Authors@R: c(person("Matt", "Piekenbrock", email = "[email protected]", role = c("aut", "cre", "cph")), 
              person("Gurjeet","Singh", role = c("ctb","cph")))
 Author: Matt Piekenbrock [aut, cre, ctb],

NAMESPACE

@@ -20,7 +20,6 @@ export(simplex_tree)
 export(union_find)
 import(Rcpp)
 import(methods)
-import(proxy)
 importFrom(Rcpp,Module)
 importFrom(Rcpp,cpp_object_initializer)
 importFrom(Rcpp,evalCpp)

R/mapper.R

@@ -33,7 +33,7 @@
 #'
 #' @seealso \code{\link[stats]{hclust}} \code{\link[Mapper]{cutoff_first_bin}}
 #' @useDynLib Mapper
-#' @import methods proxy
+#' @import methods
 #' @importFrom Rcpp sourceCpp
 #'
 #' @author Matt Piekenbrock, \email{matt.piekenbrock@@gmail.com}

R/mapperRef.R

@@ -116,9 +116,10 @@ MapperRef$set("active", "measure",
     function(value){
       if (missing(value)){ private$.measure }
       else {
-        available_measures <- toupper(proxy::pr_DB$get_entry_names())
-        stopifnot(is.character(value))
-        stopifnot(toupper(value) %in% available_measures)
+        has_proxy <- requireNamespace("proxy", quietly = TRUE)
+        available_measures <- if (has_proxy) proxy::pr_DB$get_entry_names() else c("euclidean", "maximum", "manhattan", "canberra", "binary", "minkowski")
+        stopifnot(is.character(value), toupper(value) %in% toupper(available_measures))
+        dist_f <- ifelse(has_proxy, parallelDist::parallelDist, stats::dist)
         private$.measure <- value
       }
     }