Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: RstoxData
Version: 1.10.2-9003
Version: 1.10.2-9004
Date: 2023-11-23
Title: Tools to Read and Manipulate Fisheries Data
Authors@R: c(
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -58,6 +58,7 @@ export(WriteBiotic)
export(WriteICESAcoustic)
export(WriteICESBiotic)
export(WriteICESDatras)
export(WriteICESDatsusc)
export(applyFunctionArgumentHierarchy)
export(backwardCompatibility)
export(convertBioticFile)
50 changes: 14 additions & 36 deletions R/StoxExport.R
Original file line number Diff line number Diff line change
@@ -2173,19 +2173,6 @@ ICESDatsuscOne <- function(
}


WriteICESDatsuscOne <- function(ICESDatsuscData, na = "-9"){
# Convert all tables to string matrix with header and record, and rbind:
ICESDatsuscCSVDatsuscOne<- convertToRecordTypeMatrix(ICESDatsuscData)
# Replace NAs:
if(length(na)) {
ICESDatsuscCSVDatsuscOne <- lapply(ICESDatsuscCSVDatsuscOne, function(x) {x[is.na(x)] <- na; x})
}
# Convert each line of each table to comma separated:
ICESDatsuscCSVDatsuscOne <- lapply(ICESDatsuscCSVDatsuscOne, apply, 1, paste, collapse = ",")
# Join to one vector, to be written to one file:
ICESDatsuscCSVDatsuscOne <- unlist(ICESDatsuscCSVDatsuscOne)
}




@@ -2198,40 +2185,31 @@ WriteICESDatsuscOne <- function(ICESDatsuscData, na = "-9"){
#' @return An object of StoX data type \code{\link{WriteICESDatrasData}}.
#'
#' @export
WriteICESDatras <- function(ICESDatrasData){
WriteICESDatsusc <- function(ICESDatsuscData){

#WriteICESDatrasData <- lapply(
# ICESDatrasData,
# WriteICESDatrasOne,
# na = "-9"
#)

WriteICESDatrasData <- WriteICESDatrasOne(ICESDatrasData, na = "-9")
WriteICESDatsuscData <- WriteICESDatrasOne(ICESDatsuscData, na = "-9")

return(WriteICESDatrasData)
return(WriteICESDatsuscData)
}


WriteICESDatsuscOne <- function(ICESDatsuscDataOne, na = "-9"){

# Convert all tables to string matrix with header and record, and rbind:
ICESDatsuscCSVDataOne <- convertToRecordTypeMatrix(ICESDatsuscDataOne)

# Replace NAs:
# if(length(na)) {
# ICESDatsuscCSVDataOne <- lapply(ICESDatsuscCSVDataOne, function(x) {x[is.na(x)] <- na; x})
# }

#ICESDatrasCSVDataOne <- expandWidth(ICESDatrasCSVDataOne, na = na)

# Stack all matrices:
#ICESDatrasCSVDataOne <- do.call(rbind, ICESDatrasCSVDataOne)

# Convert each line of each table to comma separated:
ICESDatsuscCSVDataOne <- lapply(ICESDatsuscCSVDataOne, apply, 1, paste, collapse = ",")

# Join to one vector, to be written to one file:
ICESDatsuscCSVDataOne <- unlist(ICESDatsuscCSVDataOne)
WriteICESDatsuscOne <- function(ICESDatsuscData, na = "-9"){
# Convert all tables to string matrix with header and record, and rbind:
ICESDatsuscCSVDataOne<- convertToRecordTypeMatrix(ICESDatsuscData)
# Replace NAs:
if(length(na)) {
ICESDatsuscCSVDataOne <- lapply(ICESDatsuscCSVDataOne, function(x) {x[is.na(x)] <- na; x})
}
# Convert each line of each table to comma separated:
ICESDatsuscCSVDataOne <- lapply(ICESDatsuscCSVDataOne, apply, 1, paste, collapse = ",")
# Join to one vector, to be written to one file:
ICESDatsuscCSVDataOne <- unlist(ICESDatsuscCSVDataOne)

return(ICESDatsuscCSVDataOne)
}
Binary file modified inst/extdata/functionArguments.rds
Binary file not shown.
6 changes: 0 additions & 6 deletions man/WriteICESDatras.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions man/WriteICESDatsusc.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.