\e\e\e:q - RSS feed" href="/images/pieces/bundles/framework/css/body.css?p=epclust.git;a=rss;f=%1B%1B%1B:q" type="application/rss+xml" /> \e\e\e:q - RSS feed (no merges)" href="/images/pieces/bundles/framework/css/body.css?p=epclust.git;a=rss;f=%1B%1B%1B:q;opt=--no-merges" type="application/rss+xml" /> \e\e\e:q - Atom feed" href="/images/pieces/bundles/framework/css/body.css?p=epclust.git;a=atom;f=%1B%1B%1B:q" type="application/atom+xml" /> \e\e\e:q - Atom feed (no merges)" href="/images/pieces/bundles/framework/css/body.css?p=epclust.git;a=atom;f=%1B%1B%1B:q;opt=--no-merges" type="application/atom+xml" />
Commit | Line | Data |
---|---|---|
65bd7506 BA |
1 | \e[1mdiff --git a/TODO b/TODO\e[m |
2 | \e[1mindex 9fd325a..cd454f2 100644\e[m | |
3 | \e[1m--- a/TODO\e[m | |
4 | \e[1m+++ b/TODO\e[m | |
5 | \e[36m@@ -18,25 +18,21 @@\e[m \e[mA faire:\e[m | |
6 | - finir les experiences (sur nb de classes, nb de curves / chunk, nb de procs)\e[m | |
7 | et sur d'autres architectures\e[m | |
8 | \e[m | |
9 | \e[31m-\e[m | |
10 | \e[31m-\e[m | |
11 | \e[31m-\e[m | |
12 | \e[31m-\e[m | |
13 | dans old_C_code/build :\e[m | |
14 | cmake ../stage1/src\e[m | |
15 | make\e[m | |
16 | \e[m | |
17 | dans data/, lancer R puis :\e[m | |
18 | source("../old_C_code/wrapper.R")\e[m | |
19 | \e[31m-serialize("../old_C_code/build", "2009.csv","2009.bin")\e[m | |
20 | \e[31m-\e[m | |
21 | \e[31m-\e[m | |
22 | \e[31m-\e[m | |
23 | \e[31m- ppam_exe("build",np,"pathTo2010.bin","nbSeriesPerChunk nbClusters 1 2")\e[m | |
24 | \e[31m- C = getMedoids("build", "ppamResult.xml", "ppamFinalSeries.bin")\e[m | |
25 | \e[31m- quelques_series = deserialize("pathTo2010.bin", rangs...)\e[m | |
26 | \e[31m- #plot C ... et quelques_series ...\e[m | |
27 | \e[31m- getDistor("buid", "ppamResult.xml", "pathTo2010.bin")\e[m | |
28 | \e[32m+\e[m\e[32mserialize("../old_C_code/build", "2009.csv","2009.bin",1)\e[m | |
29 | \e[32m+\e[m\e[32mlibrary(parallel)\e[m | |
30 | \e[32m+\e[m\e[32mnp = detectCores()\e[m | |
31 | \e[32m+\e[m\e[32mnbSeriesPerChunk = 3000\e[m | |
32 | \e[32m+\e[m\e[32mnbClusters = 20\e[m | |
33 | \e[32m+\e[m\e[32mppam_exe("../old_C_code/build",np,"2009.bin",nbSeriesPerChunk,nbClusters)\e[m | |
34 | \e[32m+\e[m\e[32mC = getMedoids("../old_C_code/build", "ppamResult.xml", "ppamFinalSeries.bin")\e[m | |
35 | \e[32m+\e[m\e[32mfirst100series = deserialize("../old_C_code/build", "2009.bin", "2009.csv.part", "1-100")\e[m | |
36 | \e[32m+\e[m\e[32mdistor = getDistor("../old_C_code/build", "ppamResult.xml", "2009.bin")\e[m | |
37 | \e[m | |
38 | - interface matrice -> binaire\e[m | |
39 | OK\e[m | |
40 | \e[1mdiff --git a/old_C_code/wrapper.R b/old_C_code/wrapper.R\e[m | |
41 | \e[1mindex ee15a79..d6d05e1 100644\e[m | |
42 | \e[1m--- a/old_C_code/wrapper.R\e[m | |
43 | \e[1m+++ b/old_C_code/wrapper.R\e[m | |
44 | \e[36m@@ -1,3 +1,21 @@\e[m | |
45 | \e[32m+\e[m\e[32m#Exemple :\e[m | |
46 | \e[32m+\e[m\e[32m#\e[m | |
47 | \e[32m+\e[m\e[32m#dans old_C_code/build :\e[m | |
48 | \e[32m+\e[m\e[32m#cmake ../stage1/src\e[m | |
49 | \e[32m+\e[m\e[32m#make\e[m | |
50 | \e[32m+\e[m\e[32m#\e[m | |
51 | \e[32m+\e[m\e[32m#dans data/, lancer R puis :\e[m | |
52 | \e[32m+\e[m\e[32m#source("../old_C_code/wrapper.R")\e[m | |
53 | \e[32m+\e[m\e[32m#serialize("../old_C_code/build", "2009.csv","2009.bin",1)\e[m | |
54 | \e[32m+\e[m\e[32m#library(parallel)\e[m | |
55 | \e[32m+\e[m\e[32m#np = detectCores()\e[m | |
56 | \e[32m+\e[m\e[32m#nbSeriesPerChunk = 3000\e[m | |
57 | \e[32m+\e[m\e[32m#nbClusters = 20\e[m | |
58 | \e[32m+\e[m\e[32m#ppam_exe("../old_C_code/build",np,"2009.bin",nbSeriesPerChunk,nbClusters)\e[m | |
59 | \e[32m+\e[m\e[32m#C = getMedoids("../old_C_code/build", "ppamResult.xml", "ppamFinalSeries.bin")\e[m | |
60 | \e[32m+\e[m\e[32m#first100series = deserialize("../old_C_code/build", "2009.bin", "2009.csv.part", "1-100")\e[m | |
61 | \e[32m+\e[m\e[32m#distor = getDistor("../old_C_code/build", "ppamResult.xml", "2009.bin")\e[m | |
62 | \e[32m+\e[m | |
63 | ppam_exe = function(path=".", np=parallel::detectCores(), data=NULL,\e[m | |
64 | nbSeriesPerChunk, nbClusters, randomize=1, p_dissims=2)\e[m | |
65 | {\e[m |