Accept Surv() objects in conindex()

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: survivalsvm
 Type: Package
 Title: Survival Support Vector Analysis
-Version: 0.0.5
-Date: 2018-01-05
+Version: 0.0.6
+Date: 2018-11-30
 Author: Cesaire J. K. Fouodo
 Maintainer: Cesaire Fouodo <fouodo@imbs.uni-luebeck.de>
 Description: Performs support vectors analysis for data sets with survival
@@ -24,6 +24,6 @@ Suggests:
 Depends:
     survival
 License: GPL
-RoxygenNote: 6.0.1
+RoxygenNote: 6.1.0
 URL: https://github.com/imbs-hl/survivalsvm
 BugReports: https://github.com/imbs-hl/survivalsvm/issues

R/perfomances.R

@@ -4,7 +4,7 @@
 #' @param obj [\code{survivalsvmprediction}]\cr
 #' Object of class \code{survivalsvmprediction}.
 #' @param Y [\code{vector}(1)]\cr
-#' A numeric vector of truth survival times obeserved.
+#' A \code{Surv()} object with true survival times observed.
 #'
 #' @export
 #' @return [\code{Integer}]
@@ -17,9 +17,12 @@ conindex <- function(obj, Y){
   if (is.null(obj$predicted)) {
     stop("Error: field 'predicted' not found in 'obj'.")
   }
+  if (!is.Surv(Y)) {
+    stop("Error: Y must be a Surv() object.")
+  }
   X <- obj$predicted
-  if (length(X) != length(Y)) {
-    stop("Error: lengths do not macht.")
+  if (length(X) != nrow(Y)) {
+    stop("Error: lengths do not match.")
   }
   ci = Hmisc::rcorr.cens(x = X, S = Y)
   return(ci["C Index"])