Removed if checks for isGeneric

flr · Dec 2, 2024 · 0712ca8 · 0712ca8
1 parent 2a1f8a4
commit 0712ca8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/R/SepVPA.R b/R/SepVPA.R
@@ -56,7 +56,6 @@ FLSepVPA.control <- function(sep.age="missing",sep.sel="missing",sep.nyr="missin
 } # }}}
 
 ## SepVPA   {{{
-if (!isGeneric("SepVPA"))
 	setGeneric("SepVPA", function(stock, ...)
 		standardGeneric("SepVPA"))
 
@@ -156,6 +155,8 @@ setMethod("SepVPA", signature(stock="FLStock"),
 
 # assess(FLSepVPA.control)    {{{
 # assess(new('FLSepVPA.control'), FLStock())
+	setGeneric("assess", function(control, ...)
+		standardGeneric("assess"))
 setMethod("assess", signature(control="FLSepVPA.control"),
     function(control, ...){
 

diff --git a/R/VPA.R b/R/VPA.R
@@ -12,12 +12,9 @@
 setClass('FLVPA', representation('FLAssess'))
 
 ## VPA  {{{
-if (!isGeneric("VPA")) {
 	setGeneric("VPA", function(stock, ...){
-		value  <-  standardGeneric("VPA")
-		value
+		standardGeneric("VPA")
 	})
-}
 setMethod("VPA",signature(stock="FLStock"),
   function(stock, fratio="missing", fit.plusgroup=TRUE, desc="",...) {
 

diff --git a/R/accessors.R b/R/accessors.R
@@ -24,7 +24,6 @@ setMethod('harvest', signature(object='FLAssess', catch='missing'),
     }
 )
 
-if(!isGeneric('index.name'))
     setGeneric('index.name', function(object, ...) standardGeneric('index.name'))
 
 setMethod('index.name', signature(object='FLAssess'),
@@ -33,7 +32,6 @@ setMethod('index.name', signature(object='FLAssess'),
     }
 )
 
-if(!isGeneric('index.range'))
     setGeneric('index.range', function(object, ...) standardGeneric('index.range'))
 
 setMethod('index.range', signature(object='FLAssess'),
@@ -48,7 +46,6 @@ setMethod('index', signature(object='FLAssess'),
     }
 )
 
-if(!isGeneric('index.res'))
     setGeneric('index.res', function(object, ...) standardGeneric('index.res'))
 
 setMethod('index.res', signature(object='FLAssess'),
@@ -57,7 +54,6 @@ setMethod('index.res', signature(object='FLAssess'),
     }
 )
 
-if(!isGeneric('index.hat'))
     setGeneric('index.hat', function(object, ...) standardGeneric('index.hat'))
 
 setMethod('index.hat', signature(object='FLAssess'),
@@ -66,7 +62,6 @@ setMethod('index.hat', signature(object='FLAssess'),
     }
 )
 
-if(!isGeneric('index.var'))
     setGeneric('index.var', function(object, ...) standardGeneric('index.var'))
 
 setMethod('index.var', signature(object='FLAssess'),
@@ -94,7 +89,6 @@ function(object,value){
   if(validObject(object)) object else stop("")
 })
 
-if(!isGeneric('index.name<-'))
   setGeneric('index.name<-', function(object, ..., value) standardGeneric('index.name<-'))
 
 setMethod('index.name<-', signature(object='FLAssess', value = 'character'),
@@ -103,7 +97,6 @@ function(object,value){
     if(validObject(object)) object else stop("")
 })
 
-if(!isGeneric('index.range<-'))
   setGeneric('index.range<-', function(object, ..., value)
     standardGeneric('index.range<-'))
 
@@ -113,7 +106,6 @@ function(object,value){
     if(validObject(object)) object else stop("")
 })
 
-if(!isGeneric('index<-'))
   setGeneric('index<-', function(object, ..., value)
     standardGeneric('index<-'))
 
@@ -123,7 +115,6 @@ function(object,value){
     if(validObject(object)) object else stop("")
 })
 
-if(!isGeneric('index.res<-'))
     setGeneric('index.res<-', function(object, ..., value) standardGeneric('index.res<-'))
 
 setMethod('index.res<-', signature(object='FLAssess', value = 'FLQuants'),
@@ -132,7 +123,6 @@ function(object,value){
     if(validObject(object)) object else stop("")
 })
 
-if(!isGeneric('index.hat<-'))
     setGeneric('index.hat<-', function(object, ..., value) standardGeneric('index.hat<-'))
 
 setMethod('index.hat<-', signature(object='FLAssess', value = 'FLQuants'),
@@ -141,7 +131,6 @@ function(object,value){
     if(validObject(object)) object else stop("")
 })
 
-if(!isGeneric('index.var<-'))
     setGeneric('index.var<-', function(object, ..., value) standardGeneric('index.var<-'))
 
 setMethod('index.var<-', signature(object='FLAssess', value = 'FLQuants'),

diff --git a/R/handyfuncs.R b/R/handyfuncs.R
@@ -7,6 +7,9 @@ if (!isGeneric("Z"))
 
 
 # Z(stock=FLStock)  {{{
+	setGeneric("Z", function(stock, ...){
+		standardGeneric("Z")
+	})
 setMethod("Z", signature(stock="FLStock"),
        function(stock, ...){
          if(all(is.na(harvest(stock))))