From: Benjamin Auder Date: Thu, 19 Jan 2017 01:34:09 +0000 (+0100) Subject: remove strange file X-Git-Url: https://git.auder.net/variants/current/css/img/scripts/R.css?a=commitdiff_plain;h=42836cc79cbce7f5bdc69bbb9f2e54f1bcb04d4a;p=epclust.git remove strange file --- diff --git "a/\033\033\033:q" "b/\033\033\033:q" deleted file mode 100644 index 269f22e..0000000 --- "a/\033\033\033:q" +++ /dev/null @@ -1,65 +0,0 @@ -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) - {