more fiddling

R/getGraph.R

@@ -26,6 +26,7 @@ getGraph<- function(sim, neighbourhood,method="old",weightFunction = function(x1
   #sim = list(costSurface=costRaster);neighbourhood="octagon"
   #gdistance method takes more time and less memory. See testAltGraphFns in RoadPaper repo for details.
   resolution=res(sim$costSurface)[1]
+  e = new.env()
   if(method=="gdistance"){
     if(!is.element(neighbourhood, c("rook", "octagon","queen"))) {
       stop("neighbourhood type not recognized")

R/weightFunctions.R

@@ -19,7 +19,7 @@
 #' @param limitCost Value assigned to edges that exceed the grade limit. Set to a high (not NA) value if
 #' @export
 slopePenaltyFn<-function(x1,x2,baseCost = 16178,limit=20,penalty=504,limitCost=NA){
-  if(!exists("resolution")){resolution=1} # Will use value from calling environment if it exists there.
+  if(!exists("e$resolution")){resolution=1}else{resolution=e$resolution} # Will use value from calling environment if it exists there.
   #If one of the nodes is a road or barrier ignore grade penalty
   cond = pmin(x1,x2)>0
   cond[is.na(cond)]=F