X-Git-Url: https://git.auder.net/?p=epclust.git;a=blobdiff_plain;f=epclust%2FR%2Fmain.R;h=ac4ea8ddc40567b72d84c240743fbc38d4e57971;hp=75041a4c6a5cea2bebaccf847c01a41d283d3222;hb=0e2dce80a3fddaca50c96c6c27a8b32468095d6c;hpb=48108c3999d28d973443fa5e78f73a0a9f2bfc07

diff --git a/epclust/R/main.R b/epclust/R/main.R
index 75041a4..ac4ea8d 100644
--- a/epclust/R/main.R
+++ b/epclust/R/main.R
@@ -22,6 +22,7 @@
 #' @param ncores_tasks "MPI" number of parallel tasks (1 to disable: sequential tasks)
 #' @param ncores_clust "OpenMP" number of parallel clusterings in one task
 #' @param random Randomize chunks repartition
+#' @param ... Other arguments to be passed to \code{data} function
 #'
 #' @return A data.frame of the final medoids curves (identifiers + values)
 #'
@@ -37,25 +38,40 @@
 #'   + sampleCurves : wavBootstrap de package wmtsa
 #' cl = epclust(getData, K1=200, K2=15, ntasks=1000, nb_series_per_chunk=5000, WER="mix")
 #' @export
-epclust = function(data, K1, K2, ntasks=1, nb_series_per_chunk=50*K1, min_series_per_chunk=5*K1,
-	wf="haar", WER="end", ncores_tasks=1, ncores_clust=4, random=TRUE)
+epclust = function(series,K1,K2,ntasks=1,nb_series_per_chunk=50*K1,min_series_per_chunk=5*K1,
+	wf="haar",WER="end",ncores_tasks=1,ncores_clust=4,random=TRUE,...)
 {
-	# Check arguments
-	if (!is.data.frame(data) && !is.function(data))
+	# Check/transform arguments
+	bin_dir = "epclust.bin/"
+	dir.create(bin_dir, showWarnings=FALSE, mode="0755")
+	if (!is.function(series))
+	{
+		series_file = paste(bin_dir,"data",sep="")
+		unlink(series_file)
+	}
+	if (is.matrix(series))
+		serialize(series, series_file)
+	else if (!is.function(series))
 	{
 		tryCatch(
 			{
-				if (is.character(data))
-					data_con = file(data, open="r")
-				else if (!isOpen(data))
+				if (is.character(series))
+					series_con = file(series, open="r")
+				else if (!isOpen(series))
 				{
-					open(data)
-					data_con = data
+					open(series)
+					series_con = series
 				}
+				serialize(series_con, series_file)
+				close(series_con)
 			},
-			error=function(e) "data should be a data.frame, a function or a valid connection"
+			error=function(e) "series should be a data.frame, a function or a valid connection"
 		)
 	}
+	if (!is.function(series))
+		series = function(indices) getDataInFile(indices, series_file)
+	getSeries = series
+
 	K1 = toInteger(K1, function(x) x>=2)
 	K2 = toInteger(K2, function(x) x>=2)
 	ntasks = toInteger(ntasks, function(x) x>=1)
@@ -67,21 +83,22 @@ epclust = function(data, K1, K2, ntasks=1, nb_series_per_chunk=50*K1, min_series
 		stop("WER takes values in {'end','mix'}")
 
 	# Serialize all wavelets coefficients (+ IDs) onto a file
-	unlink(".coeffs")
+	coefs_file = paste(bin_dir,"coefs",sep="")
+	unlink(coefs_file)
 	index = 1
 	nb_curves = 0
-	nb_coeffs = NA
 	repeat
 	{
-		coeffs_chunk = computeCoeffs(data, index, nb_series_per_chunk, wf)
-		if (is.null(coeffs_chunk))
+		series = getSeries((index-1)+seq_len(nb_series_per_chunk))
+		if (is.null(series))
 			break
-		writeCoeffs(coeffs_chunk)
+		coeffs_chunk = curvesToCoeffs(series, wf)
+		serialize(coeffs_chunk, coefs_file)
 		index = index + nb_series_per_chunk
 		nb_curves = nb_curves + nrow(coeffs_chunk)
-		if (is.na(nb_coeffs))
-			nb_coeffs = ncol(coeffs_chunk)-1
 	}
+	getCoefs = function(indices) getDataInFile(indices, coefs_file)
+######TODO: if DB, array rank --> ID at first retrieval, when computing coeffs; so:: NO use of IDs !
 
 	if (nb_curves < min_series_per_chunk)
 		stop("Not enough data: less rows than min_series_per_chunk!")
@@ -95,16 +112,17 @@ epclust = function(data, K1, K2, ntasks=1, nb_series_per_chunk=50*K1, min_series
 		upper_bound = ifelse( i<ntasks, min(nb_series_per_task*i,nb_curves), nb_curves )
 		indices[((i-1)*nb_series_per_task+1):upper_bound]
 	})
-	library(parallel, quietly=TRUE)
 	cl_tasks = parallel::makeCluster(ncores_tasks)
 	parallel::clusterExport(cl_tasks,
-		varlist=c("K1","K2","WER","nb_series_per_chunk","ncores_clust"),#TODO: pass also
-						#nb_coeffs...and filename (in a list... ?)
+		varlist=c("getSeries","getCoefs","K1","K2","WER","nb_series_per_chunk","ncores_clust"),
 		envir=environment())
+	#1000*K1 (or K2) indices (or NOTHING--> series on file)
 	indices = parallel::parLapply(cl_tasks, indices_tasks, clusteringTask)
 	parallel::stopCluster(cl_tasks)
 
-	# Run step1+2 step on resulting ranks
-	indices = clusterChunk(indices, K1, K2)
-	return (list("indices"=indices, "medoids"=getSeries(data, indices)))
+	#Now series must be retrieved from synchrones_file, and have no ID
+	getSeries = function(indices, ids) getDataInFile(indices, synchrones_file)
+
+	# Run step2 on resulting indices or series (from file)
+	computeClusters2(indices=if (WER=="end") indices else NULL, K2, to_file=FALSE)
 }