Merge pull request #140 from dd-harp/dev

Output terms, a better way

NAMESPACE

@@ -109,38 +109,6 @@ S3method(check_abiotic,forced)
 S3method(check_abiotic,null)
 S3method(check_civil,forced)
 S3method(check_civil,null)
-S3method(compute_EIR,aqua)
-S3method(compute_EIR,aqua_dde)
-S3method(compute_EIR,cohort)
-S3method(compute_EIR,dde)
-S3method(compute_EIR,human)
-S3method(compute_EIR,mosy)
-S3method(compute_EIR,mosy_dde)
-S3method(compute_EIR,ode)
-S3method(compute_NI,aqua)
-S3method(compute_NI,aqua_dde)
-S3method(compute_NI,cohort)
-S3method(compute_NI,dde)
-S3method(compute_NI,human)
-S3method(compute_NI,mosy)
-S3method(compute_NI,mosy_dde)
-S3method(compute_NI,ode)
-S3method(compute_fqZ,aqua)
-S3method(compute_fqZ,aqua_dde)
-S3method(compute_fqZ,cohort)
-S3method(compute_fqZ,dde)
-S3method(compute_fqZ,human)
-S3method(compute_fqZ,mosy)
-S3method(compute_fqZ,mosy_dde)
-S3method(compute_fqZ,ode)
-S3method(compute_kappa,aqua)
-S3method(compute_kappa,aqua_dde)
-S3method(compute_kappa,cohort)
-S3method(compute_kappa,dde)
-S3method(compute_kappa,human)
-S3method(compute_kappa,mosy)
-S3method(compute_kappa,mosy_dde)
-S3method(compute_kappa,ode)
 S3method(dHdt,numeric)
 S3method(dHdt,static)
 S3method(dLdt,basic)
@@ -316,18 +284,16 @@ export(checkIt)
 export(check_abiotic)
 export(check_civil)
 export(compute_EIR)
-export(compute_EIR_default)
 export(compute_EIR_i)
+export(compute_EIR_ty)
 export(compute_NI)
-export(compute_NI_default)
 export(compute_NI_i)
 export(compute_beta)
 export(compute_fqZ)
-export(compute_fqZ_default)
 export(compute_fqZ_i)
 export(compute_kappa)
-export(compute_kappa_default)
 export(compute_kappa_i)
+export(compute_kappa_ty)
 export(compute_local_frac)
 export(dHdt)
 export(dLdt)