Skip to content

Commit

Permalink
normalize registration paths
Browse files Browse the repository at this point in the history
* this is to fix a problem on Windows with mixed separators
* see natverse/nat#292
* note that test baselines need to be adjusted
  • Loading branch information
jefferis committed Apr 13, 2016
1 parent 1198b15 commit 4e3a354
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions R/transformation.R
Expand Up @@ -95,7 +95,7 @@ find_reg<-function(regname, regdirs=getOption('nat.templatebrains.regdirs'), mus
} else {
for(regdir in regdirs){
reg <- file.path(regdir,regname)
if(file.exists(reg)) return(reg)
if(file.exists(reg)) return(normalizePath(reg))
}
}
if(mustWork) stop("Unable to find registration: ", regname, ' in folders: ',
Expand Down Expand Up @@ -232,7 +232,7 @@ shortest_bridging_seq <-
if (y)
attr(x,'swapped') = y;x
},
E(g)[epath]$path, E(g)[epath]$swapped,
normalizePath(E(g)[epath]$path), E(g)[epath]$swapped,
USE.NAMES = F, SIMPLIFY = F)
simplify_bridging_sequence(seq)
}
Expand Down

0 comments on commit 4e3a354

Please sign in to comment.