Set default smats for nblast() as characters, not objects

jdmanton · jdmanton · commit d7b91a2d2893 · 2014-09-19T12:12:53.000+01:00
This removes a complaint about there being no visible binding for the smats during R CMD check on CRAN (hopefully...)
diff --git a/R/neuriteblast.r b/R/neuriteblast.r
@@ -104,8 +104,8 @@ nblast <- function(query, target=getOption("nat.default.neuronlist"),
     if(is.null(smat)) {
       smat=getOption("nat.nblast.defaultsmat")
       if(is.null(smat)) {
-        if(UseAlpha) smat=smat_alpha.fcwb
-        else smat=smat.fcwb
+        if(UseAlpha) smat="smat_alpha.fcwb"
+        else smat="smat.fcwb"
       }
     }
     if(is.character(smat)) smat=get(smat)

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,8 @@ nblast <- function(query, target=getOption("nat.default.neuronlist"),`
`104`	`104`	`if(is.null(smat)) {`
`105`	`105`	`smat=getOption("nat.nblast.defaultsmat")`
`106`	`106`	`if(is.null(smat)) {`
`107`		`- if(UseAlpha) smat=smat_alpha.fcwb`
`108`		`- else smat=smat.fcwb`
	`107`	`+ if(UseAlpha) smat="smat_alpha.fcwb"`
	`108`	`+ else smat="smat.fcwb"`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`if(is.character(smat)) smat=get(smat)`