works; next add StSP to developer branch

done!
dpc10ster · Dec 2, 2023 · 2e178fe · 2e178fe
1 parent d4f57e5
commit 2e178fe
Show file tree

Hide file tree

Showing 8 changed files with 532 additions and 554 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,7 +1,7 @@
 # Generated by roxygen2: do not edit by hand
 
+export(DFReadSP)
 export(DfExtractDataset)
-export(DfReadDataFile)
 export(StSP)
 importFrom(Rcpp,evalCpp)
 importFrom(readxl,excel_sheets)

diff --git a/R/DfReadDataFile.R b/R/DfReadDataFile.R
diff --git a/R/StSP.R b/R/StSP.R
diff --git a/RJafroc.Rproj b/RJafroc.Rproj
@@ -14,7 +14,6 @@ LaTeX: pdfLaTeX
 
 BuildType: Package
 PackageUseDevtools: Yes
-PackageCleanBeforeInstall: No
 PackageInstallArgs: --no-multiarch --with-keep.source
 PackageCheckArgs: --no-build-vignettes --run-donttest
 PackageRoxygenize: rd,collate,namespace,vignette
diff --git a/inst/ZP/ZheminPan.R b/inst/ZP/ZheminPan.R
@@ -2,7 +2,7 @@ library(RJafroc)
 
 fileName <- system.file(
   "extdata", "/toyFiles/ROC/rocSpAZP.xlsx", package = "RJafroc", mustWork = TRUE)
-dsSp <- DfReadDataFile(fileName)
+dsSp <- DFReadSP(fileName)
 
 StSP(dsSp, FOM = "Wilcoxon")
 

diff --git a/man/DfReadDataFile.Rd → man/DFReadSP.Rd b/man/DfReadDataFile.Rd → man/DFReadSP.Rd
diff --git a/man/RJafroc-package.Rd b/man/RJafroc-package.Rd
@@ -292,15 +292,15 @@
              
     \item \code{descriptions$fileName}: a \code{character} variable containing the file
         name of the source data for this dataset. This is generated automatically
-        by the \link{DfReadDataFile} function used to read the file. For a simulalated
+        by the DfReadDataFile function used to read the file. For a simulalated
         dataset it is set to "NA" (i.e., a character vector, not the variable \code{NA}). 
     
     \item \code{descriptions$type}: a \code{character} variable describing the data type: 
         "\code{ROC}", "\code{LROC}", "\code{ROI}" or "\code{FROC}".
     
     \item \code{descriptions$name}: a \code{character} variable containing the name of 
         the dataset: e.g., "dataset02" or "dataset05". This is generated automatically
-        by the \link{DfReadDataFile} function used to read the file.
+        by the DfReadDataFile function used to read the file.
     
     \item \code{descriptions$truthTableStr}: a \code{c(I, J, L, maxLL+1)} object. For
         normal cases elements \code{c(I, J, L, 1)} are filled with 1s if the corresponding 
@@ -325,13 +325,6 @@
   }
 }  
 
-\section{Df: Datafile Related Functions}{
-  \itemize{    
-        \item \code{\link{DfReadDataFile}}: Read a general data file.
-  }
-}
-
-
 \section{Significance Testing Functions}{
   \itemize{    
         \item \code{\link{StSP}}: Perform OR significance testing.

diff --git a/man/StSP.Rd b/man/StSP.Rd