X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=TODO;h=cd454f21189bebff085bdbcad0d368c9c560be4d;hb=65bd7506a22f58e425d5de32cd58b70efad2b2ab;hp=9fd325a736836bf28f28e9601199a07ccc429d6e;hpb=14cb6cf8266c0e1299f16a4b2352f54dbae26f44;p=epclust.git

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