Skip to content
Open
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
8 changes: 8 additions & 0 deletions R/rbridge.R
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@
return(dataset)
}

.readFullDatasetToEnd <- function() {

dataset <- .getInternal("dataset")
dataset <- loadCorrectDataset(dataset)
Comment on lines +48 to +49
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this also do the remainder of

jaspTools/R/dataset.R

Lines 58 to 82 in 8a5cf99

dataset <- loadCorrectDataset(datasetPathOrObject)
# repair any names like "", which cause false positives in findAllColumnNamesAndTypes
# because empty options are often ""
cnms <- colnames(dataset)
if (any(cnms == "")) {
bad <- which(cnms == "")
newCnms <- make.names(cnms)
cnms[bad] <- newCnms[bad]
colnames(dataset) <- cnms
}
# columns <- findAllColumnNamesInOptions(options, colnames(dataset))
temp <- findAllColumnNamesAndTypes(options, colnames(dataset))
variables <- temp[["variables"]]
types <- temp[["types"]]
# remove any duplicated variables for now
nonDuplicatedIdx <- !duplicated(variables)
variables <- variables[nonDuplicatedIdx]
types <- types[nonDuplicatedIdx]
dataset <- convertToTypes(dataset[variables], types, datasetPathOrObject)

Perhaps wrap it in a function to use in both places?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose?

Anyway, my vacation has started, and I wont really have time to look at this until beginning of august


return(dataset)
}

.readDataSetHeaderNative <- function(columns = c(), columns.as.numeric = c(), columns.as.ordinal = c(),
columns.as.factor = c(), all.columns = FALSE) {

Expand Down
Loading