From 041baa4f336ec8c7cdb5e0816b80f86ea425ff04 Mon Sep 17 00:00:00 2001 From: Thomas MESLIN <th.meslin@gmail.com> Date: Thu, 27 Mar 2025 02:40:08 +0100 Subject: [PATCH] =?UTF-8?q?J'ai=20renomm=C3=A9=20plein=20de=20truc=20dans?= =?UTF-8?q?=20les=20coef=20dans=20asset,=20et=20ca=20recoefficiente=20bien?= =?UTF-8?q?=20maintenant?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asset_original/coef_asso.txt | 21 ++++++------------ asset_original/coef_listes.txt | 4 ++-- asset_original/points_asso_S1S3S5_2024.csv | 2 +- script/src/csv.cmo | Bin 3497 -> 4123 bytes script/src/csv.ml | 24 +++++++++++++++++++-- script/src/point_assos_to_gephi.ml | 18 ++++++++++++++-- script/src/{csv.mli => truchmiuch} | 2 ++ 7 files changed, 49 insertions(+), 22 deletions(-) rename script/src/{csv.mli => truchmiuch} (88%) diff --git a/asset_original/coef_asso.txt b/asset_original/coef_asso.txt index 1b58349..e889da5 100644 --- a/asset_original/coef_asso.txt +++ b/asset_original/coef_asso.txt @@ -1,49 +1,40 @@ AlexandrIIE : 5 -Apéral : 10 -Arise : 100 +ARISE : 100 BDS : 60 -Baka : 30 +Bakaclub : 30 Bakanim' : 40 BdE : 100 CiD : 25 CCCM : 50 -CIIrquE : 0 -ComDiie : 25 -ComWEI : 80 +Comdiie : 25 CraftIIE : 5 CuIsInE : 45 DansIIE : 45 DataScIIEnce : 15 Dièse : 50 EchequIIE : 30 -ÉcologIIE : 10 -ENiiGMe : 0 +EcologIIE : 10 FiLiGRANe : 10 FinancIIE : 5 Forum : 70 Gala : 60 GuIIldE : 25 -Houdiniie : 0 i-TV : 70 IIE++ : 35 IImagE : 40 -IImondE : 0 -InclusivE : 0 Kryptosphère : 60 LanPartIIE : 55 LeBar(c) : 95 -Liien : 70 +LiieN : 70 LudIIE : 20 LumIIEre : 10 MissterIIE : 35 Muzzik' : 50 NightIIEs : 50 -ORiGiNe : 0 ParoleDeHyène : 35 -PiiXel : 40 +PiiXeL : 40 PomPom : 40 Radioactive : 5 -RDDiie : 0 SecuritIIE : 10 Siieste : 5 SmashIIE : 25 diff --git a/asset_original/coef_listes.txt b/asset_original/coef_listes.txt index 1385c7f..de44826 100644 --- a/asset_original/coef_listes.txt +++ b/asset_original/coef_listes.txt @@ -1,6 +1,6 @@ -ÉquIlIbre : 45 +EquIlIbre : 45 TIIMELESS : 80 OnIrIquE : 80 ChIImpanzEd : 40 IInvadErs : 45 -ObscurIItÉ : 45 +ObscurIItE : 45 diff --git a/asset_original/points_asso_S1S3S5_2024.csv b/asset_original/points_asso_S1S3S5_2024.csv index 2d6ae3a..7a5a03e 100644 --- a/asset_original/points_asso_S1S3S5_2024.csv +++ b/asset_original/points_asso_S1S3S5_2024.csv @@ -1,4 +1,4 @@ -NOM,Prénom,Formation,Asso,ARISE,Alexandriie,BDE,BDS,Bakaclub,Bakanim,CBDE,CCCM,ChIImpanzEd,CiD,Comdiie,CraftIIE,CuIsInE,DansIIE,DataScIIEnce,Dièse,ECOLOGIIE,EchequIIE,FiLiGRANe,FinancIIE,Forum,Gala,GuIIldE,I-TV,IIE++,IINVADERS,IImagE,Kryptosphere,LanPartIIE,LeBar(c),LiieN,LudIIE,LumIIEre,MissterIIE,Muzzik',NightIIEs,Obscurite,OnIrIquE,ParoleDeHyène,PiiXeL,PomPom,Radioactive,SURFIIE,Securitiie,Siieste,SmashIIE,SoutIIEN,SymphonIIE,TIIMELESS,VocalIIsE,,Assos,Total +NOM,Prénom,Formation,Asso,ARISE,AlexandrIIE,BdE,BDS,Bakaclub,Bakanim',EquIlIbre,CCCM,ChIImpanzEd,CiD,Comdiie,CraftIIE,CuIsInE,DansIIE,DataScIIEnce,Dièse,EcologIIE,EchequIIE,FiLiGRANe,FinancIIE,Forum,Gala,GuIIldE,i-TV,IIE++,IInvadErs,IImagE,Kryptosphère,LanPartIIE,LeBar(c),LiieN,LudIIE,LumIIEre,MissterIIE,Muzzik',NightIIEs,ObscurIItE,OnIrIquE,ParoleDeHyène,PiiXeL,PomPom,Radioactive,SurfIIE,SecuritIIE,Siieste,SmashIIE,SoutIIEn,SymphonIIE,TIIMELESS,VocalIIsE,,Assos,Total ABAHAMOU,Ziad,FISE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0 ABDEL WEDOUD,Yahdhih,FISE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0 ABDELNOUR,Kevin,FISE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0 diff --git a/script/src/csv.cmo b/script/src/csv.cmo index f187c9f703755d66f8ab8051b13dfff4c618a038..c487467b1467f7f84a01bf832edbc552dc131ec3 100644 GIT binary patch delta 1186 zcmZ1}JzGK4IWafK(9+V<-@w>_fq{EQ2m=Gdtc{}4ER&b82xNvaFffQRFfcGNFfed4 zFfhb1KmZQ|1A{XI1A{aJ1A_%bh=GfNfk7Fnww{53fsuiM0i@0aN*ggSFsL&yFt9N& zFlaC^Ffc>)$$-qAtjHu>&&t5SpazvmhMEqt1!RgG0|Ns))CLI#1_qEWMFs{2NvMe+ zc@_o+25qPdp8fy-A0!4c6XrsYi(uw!GB7Y`L0t)Qh%*DjWMM`@!3-oHfy9+28VXOA zVdO{wIRfMum|>vc06738t^+j)WWmz^|NnzDg2ee47#IW?7#M^Y7#KK_Xpkd8!La}T z|Ns093=E(k0+~1Y0gH&BAT(?pK&F7gYVu!Z>CG)HJ}iu}lP_{8*Mm#~nE;Ys`tSdL zUZ}T0w)_A4{~uXi0gb=oFRJ|1zyJS(A`aw24yZYx$S#J8qx*t`fnjnyr=}}Ny$AyX zgB>(sfZQSsWm|$c3=9k{Q<v>yU|`8-U|>{cU|_CiU|{y<0L8tsb8%S!BX`H-qnu{^ zYRScAdbv3aC5-(082Nuq7UhZ*DrDp@V&v~Rz#_%~VJ@27z@;t}&&czVkyrZwi#h{@ zsWW*em!eP{BhMm6o+k%b%orfdXOrJ>DGH@9^3G%A<3GUS$^c;sPL}6}2|FHO34sbb zO%CEtu5VeeVB#eG;F6S_%%u2ukHq4PlB66)mKh5cOlIL{WVy3o!9*4gMwS;KTA7j6 z14P#_vKD}7K}J@Pc9tea);S=)J|pWE5Z%GZCIHf}&dBBhqGvO*#el>oGP11!(aRXw z{($I}jO_Ie3l>b6ut{OV0hYxDjI93{+3Hys9UK_hQ$QN+7}?i=Xh%l&Js^53Bl`om z`Yl<EtnQ4gIS}<PK=KC|*}(>HW8}yHS#X+>;{=FKW8}C2qW3d$faR|+a*BZXM;Wa- zH9(9LjGSPfZDZuD0r7V-axMVT7a6%YK=gh_E(H*Mh><H~!GcMXSUxgxw@mKmNmoJ- zx(Nn97AAIa{r$dGs_sw3<+V$>Cx78d5@lr+n_!TtI)#7w)_re-nR{*(PtCnJIg8go X<nscS%?nuOEMR5iUckyI=Kul#>MR3& delta 640 zcmbQOuu@voIWafK(9+V<-@w>_fq`>L2m=Fy%0|&>mdPwEBAa8_d{`JSPhQET9LU4K zz@W{*z`)4Bz;N>4|Nop&J_7>-!z?tu5gMQW-~azy3=9l{P(4fx3=Hok8*)3_+A%ON zfMh_X2t(PHAPxfqL(9}<`xqFQKQb^d{AFNZ7G+>ydd9)PpuwQ*TwE5w$T?;5PHr<P z!{X$k%z_gA;-X~z<l-{D+#H5PMxM8fyqc5$aYqWpG4d>A<k@|IMT`N$yf`_NN8Qzj zkxPP+E9wA?Is=3m?cl)3WUyetL>56tCL0hf!pM}dV8Mh5n-sY=9AGhJ@Mh$^$jBvp zfW-{T6rFsPM^Pw{k?SlYx7`62R|W{vVKN6VOt|0xO9)iBaI!UTa(&K%1(R8-8ChCD zHWV_lTmjK-jI1gkx|5L=Vxz)_11!x2jI93{+3Hys9UK^0dqDc+7+J4?XhlZWCm?z% zBO3?Ug&_4)vKU$28Ci3{>e&Q9@(UQ*z~)Y4WSamoe>Gz?+XoQCjgg%JM9*hr2P@dZ z$PV`MQbzUwkoXEl_5u(+jgfr`h@Q#FegZ^qWaIz`(R@Y@4-kJ5BS+1G1(PPRTx8^& zF!?%P`s5`31QC{x6AZZGJxWcKR+~xK6>Yo7X7+UQb$$c>a|>Ad7O*^B!1BWZ1OUzx BvvB|b diff --git a/script/src/csv.ml b/script/src/csv.ml index d568392..e9e0e9b 100644 --- a/script/src/csv.ml +++ b/script/src/csv.ml @@ -27,7 +27,7 @@ let open_as_csv name = let rec trouve_indice l elt = match l with - |[] -> (-1) + |[] -> failwith "Indice non trouvé !" |x :: tl -> if String.equal x elt then 0 else 1 + (trouve_indice tl elt) @@ -52,13 +52,33 @@ let merge_column rand_csv col_name1 col_name2 new_col_name f = {column_name = new_col_name;data = new_data} -let map rand_csv col_name f = +let map rand_csv col_name f = begin let idx = trouve_indice rand_csv.column_name col_name in let new_data = List.map (fun a -> (a.(idx) <- f a.(idx);a)) rand_csv.data in {column_name = rand_csv.column_name;data = new_data} +end + +let map_line rand_csv f = + let htab = Hashtbl.create (List.length rand_csv.column_name) in + let n = List.length rand_csv.column_name in + let col_name_arr = Array.of_list rand_csv.column_name in + let rec save_line a l i = + match l with + |[] -> () + |x :: tl -> (Hashtbl.replace htab x a.(i);save_line a tl (i+1)) + in + let map_l a = begin + save_line a rand_csv.column_name 0; + (f htab); + Array.init n (fun i -> Hashtbl.find htab (col_name_arr.(i))); + end + in + let new_data = List.map map_l rand_csv.data in + {column_name = rand_csv.column_name;data = new_data} + let iter rand_csv col_name f = diff --git a/script/src/point_assos_to_gephi.ml b/script/src/point_assos_to_gephi.ml index a1cc582..a7392eb 100644 --- a/script/src/point_assos_to_gephi.ml +++ b/script/src/point_assos_to_gephi.ml @@ -1,4 +1,14 @@ +let apply_coef csv_coef csv_note = + Csv.map_line csv_coef (fun tab_h -> begin + let nom = Hashtbl.find tab_h "Nom" in + let c = Hashtbl.find tab_h "Coef" in + Printf.printf "nom_asso : %s,coef_asso : %s \n" nom c; + Csv.map csv_note nom (fun coef_original -> ((*Printf.printf " coef_original:%s,c:%s\n" coef_original c; *) + if c = "" || coef_original = "" then "" else string_of_float((float_of_string coef_original)*.(float_of_string c)))) + end + ) + let () = begin let point_asso_path = "../../asset_original/points_asso_S1S3S5_2024.csv" in (*Ouverture point assos*) @@ -9,9 +19,13 @@ let () = begin (*Ouverture coef listes*) let coef_liste_path = "../../res_script/coef_listes.csv" in let coef_liste = Csv.open_as_csv coef_liste_path in - print_endline "J'ai ouvert tout mes fichiers ! " - + print_endline "J'ai ouvert tout mes fichiers ! "; + + let _ = apply_coef coef_asso points_assos in + let _ = apply_coef coef_liste points_assos in + Csv.save points_assos "../../res_script/point_assos_re_coefficiente.csv" + end diff --git a/script/src/csv.mli b/script/src/truchmiuch similarity index 88% rename from script/src/csv.mli rename to script/src/truchmiuch index 8a24af3..684c133 100644 --- a/script/src/csv.mli +++ b/script/src/truchmiuch @@ -9,6 +9,8 @@ let merge_column : csv -> string -> string -> string -> (string -> string -> str let map : csv -> string -> (string -> string) -> csv +let map_line : csv -> ((string, string) Hashtbl.t -> 'a) -> csv + let iter : csv -> string -> (string -> ()) -> () let save : csv -> string -> () -- GitLab