From 65bd7506a22f58e425d5de32cd58b70efad2b2ab Mon Sep 17 00:00:00 2001 From: Benjamin Auder Date: Thu, 19 Jan 2017 02:08:10 +0100 Subject: [PATCH] separate TODO and wrapper example --- "\033\033\033:q" | 65 ++++++++++++++++++++++++++++++++++++++++++++ TODO | 22 ++++++--------- old_C_code/wrapper.R | 18 ++++++++++++ 3 files changed, 92 insertions(+), 13 deletions(-) create mode 100644 "\033\033\033:q" diff --git "a/\033\033\033:q" "b/\033\033\033:q" new file mode 100644 index 0000000..269f22e --- /dev/null +++ "b/\033\033\033:q" @@ -0,0 +1,65 @@ +diff --git a/TODO b/TODO +index 9fd325a..cd454f2 100644 +--- a/TODO ++++ b/TODO +@@ -18,25 +18,21 @@ A faire: + - finir les experiences (sur nb de classes, nb de curves / chunk, nb de procs) + et sur d'autres architectures +  +- +- +- +- + dans old_C_code/build : + cmake ../stage1/src + make +  + dans data/, lancer R puis : + source("../old_C_code/wrapper.R") +-serialize("../old_C_code/build", "2009.csv","2009.bin") +- +- +- +- ppam_exe("build",np,"pathTo2010.bin","nbSeriesPerChunk nbClusters 1 2") +- C = getMedoids("build", "ppamResult.xml", "ppamFinalSeries.bin") +- quelques_series = deserialize("pathTo2010.bin", rangs...) +- #plot C ... et quelques_series ... +- getDistor("buid", "ppamResult.xml", "pathTo2010.bin") ++serialize("../old_C_code/build", "2009.csv","2009.bin",1) ++library(parallel) ++np = detectCores() ++nbSeriesPerChunk = 3000 ++nbClusters = 20 ++ppam_exe("../old_C_code/build",np,"2009.bin",nbSeriesPerChunk,nbClusters) ++C = getMedoids("../old_C_code/build", "ppamResult.xml", "ppamFinalSeries.bin") ++first100series = deserialize("../old_C_code/build", "2009.bin", "2009.csv.part", "1-100") ++distor = getDistor("../old_C_code/build", "ppamResult.xml", "2009.bin") +  + - interface matrice -> binaire + OK +diff --git a/old_C_code/wrapper.R b/old_C_code/wrapper.R +index ee15a79..d6d05e1 100644 +--- a/old_C_code/wrapper.R ++++ b/old_C_code/wrapper.R +@@ -1,3 +1,21 @@ ++#Exemple : ++# ++#dans old_C_code/build : ++#cmake ../stage1/src ++#make ++# ++#dans data/, lancer R puis : ++#source("../old_C_code/wrapper.R") ++#serialize("../old_C_code/build", "2009.csv","2009.bin",1) ++#library(parallel) ++#np = detectCores() ++#nbSeriesPerChunk = 3000 ++#nbClusters = 20 ++#ppam_exe("../old_C_code/build",np,"2009.bin",nbSeriesPerChunk,nbClusters) ++#C = getMedoids("../old_C_code/build", "ppamResult.xml", "ppamFinalSeries.bin") ++#first100series = deserialize("../old_C_code/build", "2009.bin", "2009.csv.part", "1-100") ++#distor = getDistor("../old_C_code/build", "ppamResult.xml", "2009.bin") ++ + ppam_exe = function(path=".", np=parallel::detectCores(), data=NULL, + nbSeriesPerChunk, nbClusters, randomize=1, p_dissims=2) + { diff --git a/TODO b/TODO index 9fd325a..cd454f2 100644 --- a/TODO +++ b/TODO @@ -18,25 +18,21 @@ A faire: - finir les experiences (sur nb de classes, nb de curves / chunk, nb de procs) et sur d'autres architectures - - - - dans old_C_code/build : cmake ../stage1/src make dans data/, lancer R puis : source("../old_C_code/wrapper.R") -serialize("../old_C_code/build", "2009.csv","2009.bin") - - - - ppam_exe("build",np,"pathTo2010.bin","nbSeriesPerChunk nbClusters 1 2") - C = getMedoids("build", "ppamResult.xml", "ppamFinalSeries.bin") - quelques_series = deserialize("pathTo2010.bin", rangs...) - #plot C ... et quelques_series ... - getDistor("buid", "ppamResult.xml", "pathTo2010.bin") +serialize("../old_C_code/build", "2009.csv","2009.bin",1) +library(parallel) +np = detectCores() +nbSeriesPerChunk = 3000 +nbClusters = 20 +ppam_exe("../old_C_code/build",np,"2009.bin",nbSeriesPerChunk,nbClusters) +C = getMedoids("../old_C_code/build", "ppamResult.xml", "ppamFinalSeries.bin") +first100series = deserialize("../old_C_code/build", "2009.bin", "2009.csv.part", "1-100") +distor = getDistor("../old_C_code/build", "ppamResult.xml", "2009.bin") - interface matrice -> binaire OK diff --git a/old_C_code/wrapper.R b/old_C_code/wrapper.R index ee15a79..d6d05e1 100644 --- a/old_C_code/wrapper.R +++ b/old_C_code/wrapper.R @@ -1,3 +1,21 @@ +#Exemple : +# +#dans old_C_code/build : +#cmake ../stage1/src +#make +# +#dans data/, lancer R puis : +#source("../old_C_code/wrapper.R") +#serialize("../old_C_code/build", "2009.csv","2009.bin",1) +#library(parallel) +#np = detectCores() +#nbSeriesPerChunk = 3000 +#nbClusters = 20 +#ppam_exe("../old_C_code/build",np,"2009.bin",nbSeriesPerChunk,nbClusters) +#C = getMedoids("../old_C_code/build", "ppamResult.xml", "ppamFinalSeries.bin") +#first100series = deserialize("../old_C_code/build", "2009.bin", "2009.csv.part", "1-100") +#distor = getDistor("../old_C_code/build", "ppamResult.xml", "2009.bin") + ppam_exe = function(path=".", np=parallel::detectCores(), data=NULL, nbSeriesPerChunk, nbClusters, randomize=1, p_dissims=2) { -- 2.44.0