Skip to content
Snippets Groups Projects
Commit 86599116 authored by Matisse DEKEISER's avatar Matisse DEKEISER
Browse files

Javadoc controllers (fin) + CSV Pokémon avec valeurs corrigées

parent aec25eb8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 619 additions and 41 deletions
res/data/pokemon_train_corrige.csv 0 → 100644
+ 508
− 0
View file @ 86599116
name,attack,base_egg_steps,capture_rate,defense,experience_growth,hp,sp_attack,sp_defense,type1,type2,speed,is_legendary
Swablu,40,5120,255.0,60,600000,45,40,75,normal,flying,50,False
Budew,30,5120,255.0,35,1059860,40,50,70,grass,poison,55,False
Minun,40,5120,200.0,50,1000000,60,75,85,electric,,95,False
Metapod,20,3840,120.0,55,1000000,50,25,25,bug,,30,False
Chikorita,49,5120,45.0,65,1059860,45,49,65,grass,,45,False
Pinsir,155,6400,45.0,120,1250000,65,65,90,bug,,105,False
Cinccino,95,3840,60.0,60,800000,75,65,60,normal,,115,False
Elgyem,55,5120,255.0,55,1000000,55,85,55,psychic,,30,False
Foongus,55,5120,190.0,45,1000000,69,55,55,grass,poison,15,False
Ariados,90,3840,90.0,70,800000,70,60,70,bug,poison,40,False
Aipom,70,5120,45.0,55,800000,55,40,55,normal,,85,False
Accelgor,70,3840,75.0,40,1000000,80,100,60,bug,,145,False
Dialga,120,30720,3.0,120,1250000,100,150,100,steel,dragon,90,True
Starly,55,3840,255.0,30,1059860,40,30,30,normal,flying,60,False
Ledyba,20,3840,255.0,30,800000,40,40,80,bug,flying,55,False
Politoed,75,5120,45.0,75,1059860,90,90,100,water,,70,False
Dodrio,110,5120,45.0,70,1000000,60,60,60,normal,flying,110,False
Aggron,140,8960,45.0,230,1250000,70,60,80,steel,rock,50,False
Mankey,80,5120,190.0,35,1000000,40,35,45,fighting,,70,False
Hitmonlee,120,6400,45.0,53,1000000,50,35,110,fighting,,87,False
Oshawott,55,5120,45.0,45,1059860,55,63,45,water,,45,False
Cyndaquil,52,5120,45.0,43,1059860,39,60,50,fire,,65,False
Goldeen,67,5120,225.0,60,1000000,45,35,50,water,,63,False
Swinub,50,5120,225.0,40,1250000,50,30,30,ice,ground,50,False
Nihilego,53,30720,45.0,47,1250000,109,127,131,rock,poison,103,True
Mudkip,70,5120,45.0,50,1059860,50,50,50,water,,40,False
Sewaddle,53,3840,255.0,70,1059860,45,40,60,bug,grass,42,False
Weezing,90,5120,60.0,120,1000000,65,85,70,poison,,60,False
Grumpig,45,5120,60.0,65,800000,80,90,110,psychic,,80,False
Lopunny,136,5120,60.0,94,1000000,65,54,96,normal,,135,False
Togepi,20,2560,190.0,65,800000,35,40,65,fairy,,20,False
Teddiursa,80,5120,120.0,50,1000000,60,50,50,normal,,40,False
Lampent,40,5120,90.0,60,1059860,60,95,60,ghost,fire,55,False
Palkia,120,30720,3.0,100,1250000,90,150,120,water,dragon,100,True
Shroomish,40,3840,255.0,60,1640000,60,40,60,grass,,35,False
Porygon-Z,80,5120,30.0,70,1000000,85,135,75,normal,,90,False
Flygon,100,5120,45.0,80,1059860,80,80,80,ground,dragon,100,False
Tynamo,55,5120,190.0,40,1250000,35,45,40,electric,,60,False
Machop,80,5120,180.0,50,1059860,70,35,35,fighting,,35,False
Zekrom,150,30720,3.0,120,1250000,100,120,100,dragon,electric,90,True
Wigglytuff,70,2560,50.0,45,800000,140,85,50,normal,fairy,45,False
Heracross,185,6400,45.0,115,1250000,80,40,105,bug,fighting,75,False
Archeops,140,7680,45.0,65,1000000,75,112,65,rock,flying,110,False
Gyarados,155,1280,45.0,109,1250000,95,70,130,water,flying,81,False
Gliscor,95,5120,30.0,125,1059860,75,45,75,ground,flying,95,False
Tranquill,77,3840,120.0,62,1059860,62,50,42,normal,flying,65,False
Gardevoir,85,5120,45.0,65,1250000,68,165,135,psychic,fairy,100,False
Azelf,125,20480,3.0,70,1250000,75,125,70,psychic,,115,True
Regice,50,20480,3.0,100,1250000,80,100,200,ice,,50,True
Roselia,60,5120,150.0,45,1059860,50,100,80,grass,poison,65,False
Chimecho,50,6400,45.0,80,800000,75,95,90,psychic,,65,False
Bounsweet,30,5120,235.0,38,1059860,42,30,38,grass,,32,False
Pikachu,55,2560,190.0,40,1000000,35,50,50,electric,,90,False
Articuno,85,20480,3.0,100,1250000,90,95,125,ice,flying,85,True
Machoke,100,5120,90.0,70,1059860,80,50,60,fighting,,45,False
Gumshoos,110,3840,127.0,60,1000000,88,55,60,normal,,45,False
Pikipek,75,3840,255.0,30,1000000,35,30,30,normal,flying,65,False
Cloyster,95,5120,60.0,180,1250000,50,85,45,water,ice,70,False
Crawdaunt,120,3840,155.0,85,1640000,63,90,55,water,dark,55,False
Whismur,51,5120,190.0,23,1059860,64,51,23,normal,,28,False
Silcoon,35,3840,120.0,55,1000000,50,25,25,bug,,15,False
Chandelure,55,5120,45.0,90,1059860,60,145,90,ghost,fire,80,False
Jumpluff,55,5120,45.0,70,1059860,75,55,95,grass,flying,110,False
Amoonguss,85,5120,75.0,70,1000000,114,85,80,grass,poison,30,False
Victreebel,105,5120,45.0,65,1059860,80,100,70,grass,poison,70,False
Metagross,145,10240,3.0,150,1250000,80,105,110,steel,psychic,110,False
Braixen,59,5120,45.0,58,1059860,59,90,70,fire,,73,False
Tapu Bulu,130,3840,3.0,115,1250000,70,85,95,grass,fairy,75,True
Magikarp,10,1280,255.0,55,1250000,20,15,20,water,,80,False
Simisear,98,5120,75.0,63,1000000,75,98,63,fire,,101,False
Charjabug,82,3840,120.0,95,1000000,57,55,75,bug,electric,36,False
Ducklett,44,5120,190.0,50,1000000,62,44,50,water,flying,55,False
Eelektrik,85,5120,60.0,70,1250000,65,75,70,electric,,40,False
Gallade,165,5120,45.0,95,1250000,68,65,115,psychic,fighting,110,False
Fletchling,50,3840,255.0,43,1059860,45,40,38,normal,flying,62,False
Murkrow,85,5120,30.0,42,1059860,60,85,42,dark,flying,91,False
Noctowl,50,3840,90.0,50,1000000,100,86,96,normal,flying,70,False
Anorith,95,7680,45.0,50,600000,45,40,50,rock,bug,75,False
Forretress,90,5120,75.0,140,1000000,75,60,60,bug,steel,40,False
Nidorino,72,5120,120.0,57,1059860,61,55,55,poison,,65,False
Ferroseed,50,5120,255.0,91,1000000,44,24,86,grass,steel,10,False
Chingling,30,6400,120.0,50,800000,45,65,50,psychic,,45,False
Duskull,40,6400,190.0,90,800000,20,30,90,ghost,,25,False
Mimikyu,90,5120,45.0,80,1000000,55,50,105,ghost,fairy,96,False
Fearow,90,3840,90.0,65,1000000,65,61,61,normal,flying,100,False
Reshiram,120,30720,3.0,100,1250000,100,150,120,dragon,fire,90,True
Magnemite,35,5120,190.0,70,1000000,25,95,55,electric,steel,45,False
Huntail,104,5120,60.0,105,600000,55,94,75,water,,52,False
Ambipom,100,5120,45.0,66,800000,75,60,66,normal,,115,False
Snivy,45,5120,45.0,55,1059860,45,45,55,grass,,63,False
Spinda,60,3840,255.0,60,800000,60,60,60,normal,,60,False
Croagunk,61,2560,140.0,40,1000000,48,61,40,poison,fighting,50,False
Mesprit,105,20480,3.0,105,1250000,80,105,105,psychic,,80,True
Poliwag,50,5120,255.0,40,1059860,40,40,40,water,,90,False
Oricorio,70,5120,45.0,70,1000000,75,98,70,fire,flying,93,False
Golurk,124,6400,90.0,80,1000000,89,55,80,ground,ghost,55,False
Armaldo,125,7680,45.0,100,600000,75,70,80,rock,bug,45,False
Electabuzz,83,6400,45.0,57,1000000,65,95,85,electric,,105,False
Ursaring,130,5120,60.0,75,1000000,90,75,75,normal,,55,False
Bewear,125,3840,70.0,80,1000000,120,55,60,normal,fighting,60,False
Charizard,104,5120,45.0,78,1059860,78,159,115,fire,flying,100,False
Vanillite,50,5120,255.0,50,1250000,36,65,60,ice,,44,False
Floette,65,5120,120.0,67,1000000,74,125,128,fairy,,92,False
Happiny,5,10240,130.0,5,800000,100,15,65,normal,,30,False
Deino,65,10240,45.0,50,1250000,52,45,50,dark,dragon,38,False
Hoothoot,30,3840,255.0,30,1000000,60,36,56,normal,flying,50,False
Volcarona,60,10240,15.0,65,1250000,85,135,105,bug,fire,100,False
Sylveon,65,8960,45.0,65,1000000,95,110,130,fairy,,60,False
Finneon,49,5120,190.0,56,600000,49,49,61,water,,66,False
Rufflet,83,5120,190.0,50,1250000,70,37,50,normal,flying,60,False
Karrablast,75,3840,200.0,45,1000000,50,40,45,bug,,60,False
Lotad,30,3840,255.0,30,1059860,40,40,50,water,grass,30,False
Lapras,85,10240,45.0,80,1250000,130,85,95,water,ice,60,False
Poliwhirl,65,5120,120.0,65,1059860,65,50,50,water,,90,False
Sawsbuck,100,5120,75.0,70,1000000,80,60,70,normal,grass,95,False
Piloswine,100,5120,75.0,80,1250000,100,60,60,ice,ground,50,False
Litten,65,3840,45.0,40,1059860,45,60,40,fire,,70,False
Clauncher,53,3840,225.0,62,1250000,50,58,63,water,,44,False
Zoroark,105,5120,45.0,60,1059860,60,120,60,dark,,105,False
Garbodor,95,5120,60.0,82,1000000,80,60,82,poison,,75,False
Deerling,60,5120,190.0,50,1000000,60,40,50,normal,grass,75,False
Illumise,47,3840,150.0,75,1640000,65,73,85,bug,,85,False
Unfezant,115,3840,45.0,80,1059860,80,65,55,normal,flying,93,False
Manaphy,100,2560,3.0,100,1250000,100,100,100,water,,100,True
Glaceon,60,8960,45.0,110,1000000,65,130,95,ice,,65,False
Vikavolt,70,3840,45.0,90,1000000,77,145,75,bug,electric,43,False
Xatu,75,5120,75.0,70,1000000,65,95,70,psychic,flying,95,False
Galvantula,77,5120,75.0,60,1000000,70,97,60,bug,electric,108,False
Fraxure,117,10240,60.0,70,1250000,66,40,50,dragon,,67,False
Exeggcute,40,5120,90.0,80,1250000,60,60,45,grass,psychic,40,False
Baltoy,40,5120,255.0,55,1000000,40,40,70,ground,psychic,55,False
Zebstrika,100,5120,75.0,63,1000000,75,80,63,electric,,116,False
Loudred,71,5120,120.0,43,1059860,84,71,43,normal,,48,False
Cofagrigus,50,6400,90.0,145,1000000,58,95,105,ghost,,30,False
Cubone,50,5120,190.0,95,1000000,50,40,50,ground,,35,False
Virizion,90,20480,3.0,72,1250000,91,90,129,grass,fighting,108,True
Groudon,180,30720,3.0,160,1250000,100,150,90,ground,,90,True
Sunkern,30,5120,235.0,30,1059860,30,30,30,grass,,30,False
Lurantis,105,5120,75.0,90,1000000,70,80,90,grass,,45,False
Quilladin,78,5120,45.0,95,1059860,61,56,58,grass,,57,False
Lunala,113,30720,45.0,89,1250000,137,137,107,psychic,ghost,97,True
Infernape,104,5120,45.0,71,1059860,76,104,71,fire,fighting,108,False
Exploud,91,5120,45.0,63,1059860,104,91,73,normal,,68,False
Zubat,45,3840,255.0,35,1000000,40,30,40,poison,flying,55,False
Tapu Lele,85,3840,3.0,75,1250000,70,130,115,psychic,fairy,95,True
Hakamo-o,75,10240,45.0,90,1250000,55,65,70,dragon,fighting,65,False
Floatzel,105,5120,75.0,55,1000000,85,85,50,water,,115,False
Gurdurr,105,5120,90.0,85,1059860,85,40,50,fighting,,40,False
Kricketot,25,3840,255.0,41,1059860,37,25,41,bug,,25,False
Terrakion,129,20480,3.0,90,1250000,91,72,90,rock,fighting,108,True
Roggenrola,75,3840,255.0,85,1059860,55,25,25,rock,,15,False
Masquerain,60,3840,75.0,62,1000000,70,100,82,bug,flying,80,False
Crabominable,132,5120,60.0,77,1000000,97,62,67,fighting,ice,43,False
Dusknoir,100,6400,45.0,135,800000,45,65,135,ghost,,45,False
Gastrodon,83,5120,75.0,68,1000000,111,92,82,water,ground,39,False
Riolu,70,6400,75.0,40,1059860,40,35,40,fighting,,60,False
Kangaskhan,125,5120,45.0,100,1000000,105,60,100,normal,,100,False
Treecko,45,5120,45.0,35,1059860,40,65,55,grass,,70,False
Darumaka,90,5120,120.0,45,1059860,70,15,45,fire,,50,False
Wartortle,63,5120,45.0,80,1059860,59,65,80,water,,58,False
Azumarill,50,2560,75.0,80,800000,100,60,80,water,fairy,50,False
Swirlix,48,5120,200.0,66,1000000,62,59,57,fairy,,49,False
Shiinotic,45,5120,75.0,80,1000000,60,90,100,grass,fairy,30,False
Spoink,25,5120,255.0,35,800000,60,70,80,psychic,,60,False
Pyukumuku,60,3840,60.0,130,800000,55,30,130,water,,5,False
Rhydon,130,5120,60.0,120,1250000,105,45,45,ground,rock,40,False
Lileep,41,7680,45.0,77,600000,66,61,87,rock,grass,23,False
Steelix,125,6400,25.0,230,1000000,75,55,95,steel,ground,30,False
Palossand,75,3840,60.0,110,1000000,85,100,75,ghost,ground,35,False
Ralts,25,5120,235.0,25,1250000,28,45,35,psychic,fairy,40,False
Buzzwole,139,30720,25.0,139,1250000,107,53,53,bug,fighting,79,True
Wailmer,70,10240,125.0,35,1640000,130,70,35,water,,60,False
Jellicent,60,5120,60.0,70,1000000,100,85,105,water,ghost,60,False
Stunky,63,5120,225.0,47,1000000,63,41,41,poison,dark,74,False
Yungoos,70,3840,255.0,30,1000000,48,30,30,normal,,45,False
Morelull,35,5120,190.0,55,1000000,40,65,75,grass,fairy,15,False
Buizel,65,5120,190.0,35,1000000,55,60,30,water,,85,False
Hippowdon,112,7680,60.0,118,1250000,108,68,72,ground,,47,False
Nidoran♀,47,5120,235.0,52,1059860,55,40,40,poison,,41,False
Samurott,100,5120,45.0,85,1059860,95,108,70,water,,70,False
Omanyte,40,7680,45.0,100,1000000,35,90,55,rock,water,35,False
Blaziken,160,5120,45.0,80,1059860,80,130,80,fire,fighting,100,False
Golbat,80,3840,90.0,70,1000000,75,65,75,poison,flying,90,False
Dratini,64,10240,45.0,45,1250000,41,50,50,dragon,,50,False
Meganium,82,5120,45.0,100,1059860,80,83,100,grass,,80,False
Delphox,69,5120,45.0,72,1059860,75,114,100,fire,psychic,104,False
Corphish,80,3840,205.0,65,1640000,43,50,35,water,,35,False
Araquanid,70,3840,100.0,92,1000000,68,50,132,water,bug,42,False
Cleffa,25,2560,150.0,28,800000,50,45,55,fairy,,15,False
Xurkitree,89,30720,30.0,71,1250000,83,173,71,electric,,83,True
Doduo,85,5120,190.0,45,1000000,35,35,35,normal,flying,75,False
Basculin,92,10240,25.0,65,1000000,70,80,55,water,,98,False
Bidoof,45,3840,255.0,40,1000000,59,35,40,normal,,31,False
Krookodile,117,5120,45.0,80,1059860,95,65,70,ground,dark,92,False
Spinarak,60,3840,255.0,40,800000,40,40,40,bug,poison,30,False
Girafarig,80,5120,60.0,65,1000000,70,90,65,normal,psychic,85,False
Pangoro,124,6400,65.0,78,1000000,95,69,71,fighting,dark,58,False
Butterfree,45,3840,45.0,50,1000000,60,90,80,bug,flying,70,False
Altaria,110,5120,45.0,110,600000,75,110,105,dragon,flying,80,False
Electrode,50,5120,60.0,70,1000000,60,80,80,electric,,150,False
Phanpy,60,5120,120.0,60,1000000,90,40,40,ground,,40,False
Vileplume,80,5120,45.0,85,1059860,75,110,90,grass,poison,50,False
Kyurem,120,30720,3.0,90,1250000,125,170,100,dragon,ice,95,True
Beautifly,70,3840,45.0,50,1000000,60,100,50,bug,flying,65,False
Kommo-o,110,10240,45.0,125,1250000,75,100,105,dragon,fighting,85,False
Zorua,65,6400,75.0,40,1059860,40,80,40,dark,,65,False
Wormadam,69,3840,45.0,95,1000000,60,69,95,bug,grass,36,False
Boldore,105,3840,120.0,105,1059860,70,50,40,rock,,20,False
Meloetta,128,30720,3.0,90,1250000,100,77,77,normal,psychic,128,True
Sandile,72,5120,180.0,35,1059860,50,35,35,ground,dark,65,False
Farfetch'd,90,5120,45.0,55,1000000,52,58,62,normal,flying,60,False
Nosepass,45,5120,255.0,135,1000000,30,45,90,rock,,30,False
Shelgon,95,10240,45.0,100,1250000,65,60,50,dragon,,50,False
Yanmega,76,5120,30.0,86,1000000,86,116,56,bug,flying,95,False
Granbull,120,5120,75.0,75,800000,90,60,60,fairy,,45,False
Grovyle,65,5120,45.0,45,1059860,50,85,65,grass,,95,False
Swoobat,57,3840,45.0,55,1000000,67,77,55,psychic,flying,114,False
Grubbin,62,3840,255.0,45,1000000,47,55,45,bug,,46,False
Lairon,90,8960,90.0,140,1250000,60,50,50,steel,rock,40,False
Kecleon,90,5120,200.0,70,1059860,60,60,120,normal,,40,False
Psyduck,52,5120,190.0,48,1000000,50,65,50,water,,55,False
Gulpin,43,5120,225.0,53,1640000,70,43,53,poison,,40,False
Wobbuffet,33,5120,45.0,58,1000000,190,33,58,psychic,,33,False
Lickilicky,85,5120,30.0,95,1000000,110,80,95,normal,,50,False
Chespin,61,5120,45.0,65,1059860,56,48,45,grass,,38,False
Giratina,120,30720,3.0,100,1250000,150,120,100,ghost,dragon,90,True
Suicune,75,20480,3.0,115,1250000,100,90,115,water,,85,True
Inkay,54,5120,190.0,53,1000000,53,37,46,dark,psychic,45,False
Alakazam,50,5120,50.0,65,1059860,55,175,105,psychic,,150,False
Latias,100,30720,3.0,120,1250000,80,140,150,dragon,psychic,110,True
Popplio,54,3840,45.0,54,1059860,50,66,56,water,,40,False
Magby,75,6400,45.0,37,1000000,45,70,55,fire,,83,False
Aerodactyl,135,8960,45.0,85,1250000,80,70,95,rock,flying,150,False
Drifblim,80,7680,60.0,44,1640000,150,90,54,ghost,flying,80,False
Clawitzer,73,3840,55.0,88,1250000,71,120,89,water,,59,False
Slowbro,75,5120,75.0,180,1000000,95,130,80,water,psychic,30,False
Komala,115,5120,45.0,65,1250000,65,75,95,normal,,65,False
Feebas,15,5120,255.0,20,600000,20,10,55,water,,80,False
Vanilluxe,95,5120,45.0,85,1250000,71,110,95,ice,,79,False
Probopass,55,5120,60.0,145,1000000,60,75,150,rock,steel,40,False
Heliolisk,55,5120,75.0,52,1000000,62,109,94,electric,normal,109,False
Frillish,40,5120,190.0,50,1000000,55,65,85,water,ghost,40,False
Hitmontop,95,6400,45.0,95,1000000,50,35,110,fighting,,70,False
Goodra,100,10240,45.0,70,1250000,90,110,150,dragon,,80,False
Nidorina,62,5120,120.0,67,1059860,70,55,55,poison,,56,False
Umbreon,65,8960,45.0,110,1000000,95,60,130,dark,,65,False
Munna,25,2560,190.0,45,800000,76,67,55,psychic,,24,False
Froslass,80,5120,75.0,70,1000000,70,80,70,ice,ghost,110,False
Abra,20,5120,200.0,15,1059860,25,105,55,psychic,,90,False
Pineco,65,5120,190.0,90,1000000,50,35,35,bug,,15,False
Weepinbell,90,5120,120.0,50,1059860,65,85,45,grass,poison,55,False
Wooper,45,5120,255.0,45,1000000,55,25,25,water,ground,15,False
Arcanine,110,5120,75.0,80,1250000,90,100,80,fire,,95,False
Magcargo,50,5120,75.0,120,1000000,60,90,80,fire,rock,30,False
Feraligatr,105,5120,45.0,100,1059860,85,79,83,water,,78,False
Conkeldurr,140,5120,45.0,95,1059860,105,55,65,fighting,,45,False
Greninja,145,5120,45.0,67,1059860,72,153,71,water,dark,132,False
Toucannon,120,3840,45.0,75,1000000,80,75,75,normal,flying,60,False
Munchlax,85,10240,50.0,40,1250000,135,40,85,normal,,5,False
Oddish,50,5120,255.0,55,1059860,45,75,65,grass,poison,30,False
Chinchou,38,5120,190.0,38,1250000,75,56,56,water,electric,67,False
Rayquaza,180,30720,45.0,100,1250000,105,180,100,dragon,flying,115,True
Scrafty,90,3840,90.0,115,1000000,65,45,115,dark,fighting,58,False
Gourgeist,100,5120,60.0,122,1000000,85,58,75,ghost,grass,54,False
Type: Null,95,30720,3.0,95,1250000,95,95,95,normal,,59,False
Onix,45,6400,45.0,160,1000000,35,30,45,rock,ground,70,False
Remoraid,65,5120,190.0,35,1000000,35,65,35,water,,65,False
Voltorb,30,5120,190.0,50,1000000,40,55,55,electric,,100,False
Glalie,120,5120,75.0,80,1000000,80,120,80,ice,,100,False
Trevenant,110,5120,60.0,76,1000000,85,65,82,ghost,grass,56,False
Dustox,50,3840,45.0,70,1000000,60,50,90,bug,poison,65,False
Drilbur,85,5120,120.0,40,1000000,60,30,45,ground,,68,False
Skiddo,65,5120,200.0,48,1000000,66,62,57,grass,,52,False
Scraggy,75,3840,180.0,70,1000000,50,35,70,dark,fighting,48,False
Venipede,45,3840,255.0,59,1059860,30,30,39,bug,poison,57,False
Kabuto,80,7680,45.0,90,1000000,30,55,45,rock,water,55,False
Latios,130,30720,3.0,100,1250000,80,160,120,dragon,psychic,110,True
Gengar,65,5120,45.0,80,1059860,60,170,95,ghost,poison,130,False
Typhlosion,84,5120,45.0,78,1059860,78,109,85,fire,,100,False
Seaking,92,5120,60.0,65,1000000,80,65,80,water,,68,False
Poochyena,55,3840,255.0,35,1000000,35,30,30,dark,,35,False
Sentret,46,3840,255.0,34,1000000,35,35,45,normal,,20,False
Cottonee,27,5120,190.0,60,1000000,40,37,50,grass,fairy,66,False
Miltank,80,5120,45.0,105,1250000,95,40,70,normal,,100,False
Pachirisu,45,2560,200.0,70,1000000,60,45,90,electric,,95,False
Honchkrow,125,5120,30.0,52,1059860,100,105,52,dark,flying,71,False
Regigigas,160,30720,3.0,110,1250000,110,80,110,normal,,100,True
Combusken,85,5120,45.0,60,1059860,60,85,60,fire,fighting,55,False
Walrein,80,5120,45.0,90,1059860,110,95,90,ice,water,65,False
Monferno,78,5120,45.0,52,1059860,64,78,52,fire,fighting,81,False
Taillow,55,3840,200.0,30,1059860,40,30,30,normal,flying,85,False
Gogoat,100,5120,45.0,62,1000000,123,97,81,grass,,68,False
Comfey,52,5120,60.0,90,800000,51,82,110,fairy,,100,False
Jynx,50,6400,45.0,35,1000000,65,115,95,ice,psychic,95,False
Amaura,59,7680,45.0,50,1000000,77,67,63,rock,ice,46,False
Koffing,65,5120,190.0,95,1000000,40,60,45,poison,,35,False
Swellow,85,3840,45.0,60,1059860,60,75,50,normal,flying,125,False
Vibrava,70,5120,120.0,50,1059860,50,50,50,ground,dragon,70,False
Shiftry,100,3840,45.0,60,1059860,90,90,60,grass,dark,80,False
Crabrawler,82,5120,225.0,57,1000000,47,42,47,fighting,,63,False
Horsea,40,5120,225.0,70,1000000,30,70,25,water,,60,False
Unown,72,10240,225.0,48,1000000,48,72,48,psychic,,48,False
Hitmonchan,105,6400,45.0,79,1000000,50,35,110,fighting,,76,False
Snubbull,80,5120,190.0,50,800000,60,40,40,fairy,,30,False
Kartana,181,30720,255.0,131,1250000,59,59,31,grass,steel,109,True
Slakoth,60,3840,255.0,60,1250000,60,35,35,normal,,30,False
Pansear,53,5120,190.0,48,1000000,50,53,48,fire,,64,False
Maractus,86,5120,255.0,67,1000000,75,106,67,grass,,60,False
Espurr,48,5120,190.0,54,1000000,62,63,60,psychic,,68,False
Cherrim,60,5120,75.0,70,1000000,70,87,78,grass,,85,False
Doublade,110,5120,90.0,150,1000000,59,45,49,steel,ghost,35,False
Tsareena,120,5120,45.0,98,1059860,72,50,98,grass,,72,False
Wimpod,35,5120,90.0,40,1000000,25,20,30,bug,water,80,False
Tyrantrum,121,7680,45.0,119,1000000,82,69,59,rock,dragon,71,False
Bagon,75,10240,45.0,60,1250000,45,40,30,dragon,,50,False
Moltres,100,20480,3.0,90,1250000,90,125,85,fire,flying,90,True
Quagsire,85,5120,90.0,85,1000000,95,65,65,water,ground,35,False
Carvanha,90,5120,225.0,20,1250000,45,65,20,water,dark,65,False
Beldum,55,10240,3.0,80,1250000,40,35,60,steel,psychic,30,False
Mew,100,30720,45.0,100,1059860,100,100,100,psychic,,100,True
Gorebyss,84,5120,60.0,105,600000,55,114,75,water,,52,False
Excadrill,135,5120,60.0,60,1000000,110,50,65,ground,steel,88,False
Mienfoo,85,6400,180.0,50,1059860,45,55,50,fighting,,65,False
Patrat,55,3840,255.0,39,1000000,45,35,39,normal,,42,False
Houndoom,90,5120,45.0,90,1250000,75,140,90,dark,fire,115,False
Uxie,75,20480,3.0,130,1250000,75,75,130,psychic,,95,True
Passimian,120,5120,45.0,90,1250000,100,40,60,fighting,,80,False
Luxio,85,5120,120.0,49,1059860,60,60,49,electric,,60,False
Electrike,45,5120,120.0,40,1250000,40,65,40,electric,,65,False
Jolteon,65,8960,45.0,60,1000000,65,110,95,electric,,130,False
Clefable,70,2560,25.0,73,800000,95,95,90,fairy,,60,False
Goomy,50,10240,45.0,35,1250000,45,55,75,dragon,,40,False
Ampharos,95,5120,45.0,105,1059860,90,165,110,electric,,45,False
Hippopotas,72,7680,140.0,78,1250000,68,38,42,ground,,32,False
Genesect,120,30720,3.0,95,1250000,71,120,95,bug,steel,99,True
Misdreavus,60,6400,45.0,60,800000,60,85,85,ghost,,85,False
Absol,150,6400,30.0,60,1059860,65,115,60,dark,,115,False
Noibat,30,5120,190.0,35,1000000,40,45,40,flying,dragon,55,False
Talonflame,81,3840,45.0,71,1059860,78,74,69,fire,flying,126,False
Stufful,75,3840,140.0,50,1000000,70,45,50,normal,fighting,50,False
Swanna,87,5120,45.0,63,1000000,75,87,63,water,flying,98,False
Dusclops,70,6400,90.0,130,800000,40,60,130,ghost,,25,False
Torkoal,85,5120,90.0,140,1000000,70,85,70,fire,,20,False
Chesnaught,107,5120,45.0,122,1059860,88,74,75,grass,fighting,64,False
Vanillish,65,5120,120.0,65,1250000,51,80,75,ice,,59,False
Spheal,40,5120,255.0,50,1059860,70,55,50,ice,water,25,False
Clefairy,45,2560,150.0,48,800000,70,60,65,fairy,,35,False
Donphan,120,5120,60.0,120,1000000,90,60,60,ground,,50,False
Barbaracle,105,5120,45.0,115,1000000,72,54,86,rock,water,68,False
Aron,70,8960,180.0,100,1250000,50,40,40,steel,rock,30,False
Purrloin,50,5120,255.0,37,1000000,41,50,37,dark,,66,False
Cranidos,125,7680,45.0,40,600000,67,30,30,rock,,58,False
Torchic,60,5120,45.0,40,1059860,45,70,50,fire,,45,False
Growlithe,70,5120,190.0,45,1250000,55,70,50,fire,,60,False
Pancham,82,6400,220.0,62,1000000,67,46,48,fighting,,43,False
Flaaffy,55,5120,120.0,55,1059860,70,80,60,electric,,45,False
Electivire,123,6400,30.0,67,1000000,75,95,85,electric,,95,False
Phantump,70,5120,120.0,48,1000000,43,50,60,ghost,grass,38,False
Steenee,40,5120,120.0,48,1059860,52,40,48,grass,,62,False
Staraptor,120,3840,45.0,70,1059860,85,50,60,normal,flying,100,False
Grotle,89,5120,45.0,85,1059860,75,55,65,grass,,36,False
Emboar,123,5120,45.0,65,1059860,110,100,65,fire,fighting,65,False
Solosis,30,5120,200.0,40,1059860,45,105,50,psychic,,20,False
Hawlucha,92,5120,100.0,75,1000000,78,74,63,fighting,flying,118,False
Servine,60,5120,45.0,75,1059860,60,60,75,grass,,83,False
Tentacool,40,5120,190.0,35,1250000,40,50,100,water,poison,70,False
Shuckle,10,5120,190.0,230,1059860,20,10,230,bug,rock,5,False
Marill,20,2560,190.0,50,800000,70,20,50,water,fairy,40,False
Furfrou,80,5120,160.0,60,1000000,75,65,90,normal,,102,False
Zangoose,115,5120,90.0,60,600000,73,60,60,normal,,90,False
Skitty,45,3840,255.0,45,800000,50,35,35,normal,,50,False
Porygon2,80,5120,45.0,90,1000000,85,105,95,normal,,60,False
Bouffalant,110,5120,45.0,95,1000000,95,40,95,normal,,55,False
Mantine,40,6400,25.0,70,1250000,85,80,140,water,flying,70,False
Avalugg,117,5120,55.0,184,1000000,95,44,46,ice,,28,False
Smoochum,30,6400,45.0,15,1000000,45,85,65,ice,psychic,65,False
Milotic,60,5120,60.0,79,600000,95,100,125,water,,81,False
Frogadier,63,5120,45.0,52,1059860,54,83,56,water,,97,False
Pansage,53,5120,190.0,48,1000000,50,53,48,grass,,64,False
Mr. Mime,45,6400,45.0,65,1000000,40,100,120,psychic,fairy,90,False
Skuntank,93,5120,60.0,67,1000000,103,71,61,poison,dark,84,False
Kyogre,150,30720,3.0,90,1250000,100,180,160,water,,90,True
Kabutops,115,7680,45.0,105,1000000,60,65,70,rock,water,80,False
Minccino,50,3840,255.0,40,800000,55,40,40,normal,,75,False
Croconaw,80,5120,45.0,80,1059860,65,59,63,water,,58,False
Rotom,65,5120,45.0,107,1000000,50,105,107,electric,ghost,86,False
Bayleef,62,5120,45.0,80,1059860,60,63,80,grass,,60,False
Gligar,75,5120,60.0,105,1059860,65,35,65,ground,flying,85,False
Makuhita,60,5120,180.0,30,1640000,72,20,30,fighting,,25,False
Squirtle,48,5120,45.0,65,1059860,44,50,64,water,,43,False
Nidoqueen,92,5120,45.0,87,1059860,90,75,85,poison,ground,76,False
Crustle,105,5120,75.0,125,1000000,70,65,75,bug,rock,45,False
Carnivine,100,6400,200.0,72,1250000,74,90,72,grass,,46,False
Ditto,48,5120,35.0,48,1000000,48,48,48,normal,,48,False
Snorunt,50,5120,190.0,50,1000000,50,50,50,ice,,50,False
Purugly,82,5120,75.0,64,800000,71,64,59,normal,,112,False
Magmortar,95,6400,30.0,67,1000000,75,125,95,fire,,83,False
Magneton,60,5120,60.0,95,1000000,50,120,70,electric,steel,70,False
Bronzong,89,5120,90.0,116,1000000,67,79,116,steel,psychic,33,False
Golett,74,6400,190.0,50,1000000,59,35,50,ground,ghost,35,False
Slaking,160,3840,45.0,100,1250000,150,95,65,normal,,100,False
Burmy,29,3840,120.0,45,1000000,40,29,45,bug,,36,False
Dewgong,70,5120,75.0,80,1000000,90,70,95,water,ice,70,False
Stunfisk,66,5120,75.0,84,1000000,109,81,99,ground,electric,32,False
Gastly,35,5120,190.0,30,1059860,30,100,35,ghost,poison,80,False
Blastoise,103,5120,45.0,120,1059860,79,135,115,water,,78,False
Turtonator,78,5120,70.0,135,1000000,60,91,85,fire,dragon,36,False
Spewpa,22,3840,120.0,60,1000000,45,27,30,bug,,29,False
Pelipper,50,5120,45.0,100,1000000,60,95,70,water,flying,65,False
Stantler,95,5120,45.0,62,1250000,73,85,65,normal,,85,False
Barboach,48,5120,190.0,43,1000000,50,46,41,water,ground,60,False
Phione,80,10240,30.0,80,1250000,80,80,80,water,,80,False
Trumbeak,85,3840,120.0,50,1000000,55,40,50,normal,flying,75,False
Chimchar,58,5120,45.0,44,1059860,44,58,44,fire,,61,False
Luxray,120,5120,45.0,79,1059860,80,95,79,electric,,70,False
Quilava,64,5120,45.0,58,1059860,58,80,65,fire,,80,False
Cosmog,29,30720,45.0,31,1250000,43,29,31,psychic,,37,True
Drampa,60,5120,70.0,85,1000000,78,135,91,normal,dragon,36,False
Camerupt,120,5120,150.0,100,1000000,70,145,105,fire,ground,20,False
Cherubi,35,5120,190.0,45,1000000,45,62,53,grass,,35,False
Breloom,130,3840,90.0,80,1640000,60,60,60,grass,fighting,70,False
Litwick,30,5120,190.0,55,1059860,50,65,55,ghost,fire,20,False
Elekid,63,6400,45.0,37,1000000,45,65,55,electric,,95,False
Roserade,70,5120,75.0,65,1059860,60,125,105,grass,poison,90,False
Joltik,47,5120,190.0,50,1000000,50,57,50,bug,electric,65,False
Lillipup,60,3840,255.0,45,1059860,45,25,45,normal,,55,False
Toxicroak,106,5120,75.0,65,1000000,83,86,65,poison,fighting,85,False
Beheeyem,75,5120,90.0,75,1000000,75,125,95,psychic,,40,False
Incineroar,115,3840,45.0,90,1059860,95,80,90,fire,dark,60,False
Bisharp,125,5120,45.0,100,1000000,65,60,70,dark,steel,70,False
Golisopod,125,5120,45.0,140,1000000,75,60,90,bug,water,40,False
Marshtomp,85,5120,45.0,70,1059860,70,60,70,water,ground,50,False
Mandibuzz,65,5120,60.0,105,1250000,110,55,95,dark,flying,80,False
Togetic,40,2560,75.0,85,800000,55,80,105,fairy,flying,40,False
Wynaut,23,5120,125.0,48,1000000,95,23,48,psychic,,23,False
Klink,55,5120,130.0,70,1059860,40,45,60,steel,,30,False
Blitzle,60,5120,190.0,32,1000000,45,50,32,electric,,76,False
Tyrunt,89,7680,45.0,77,1000000,58,45,45,rock,dragon,48,False
Dunsparce,70,5120,190.0,70,1000000,100,65,65,normal,,45,False
Nidoran♂,57,5120,235.0,40,1059860,46,40,40,poison,,50,False
Vullaby,55,5120,190.0,75,1250000,70,45,65,dark,flying,60,False
Meditite,40,5120,180.0,55,1000000,30,40,55,fighting,psychic,60,False
Alomomola,75,10240,75.0,80,800000,165,40,45,water,,65,False
Parasect,95,5120,75.0,80,1000000,60,60,80,bug,grass,30,False
Spearow,60,3840,255.0,30,1000000,40,31,31,normal,flying,70,False
Tauros,100,5120,45.0,95,1250000,75,40,70,normal,,110,False
Eevee,55,8960,45.0,50,1000000,55,45,65,normal,,55,False
Slugma,40,5120,190.0,40,1000000,40,70,40,fire,,20,False
Beartic,130,5120,60.0,80,1000000,95,70,80,ice,,50,False
Scyther,110,6400,45.0,80,1000000,70,55,80,bug,flying,105,False
Garchomp,170,10240,45.0,115,1250000,108,120,95,dragon,ground,92,False
Kadabra,35,5120,100.0,30,1059860,40,120,70,psychic,,105,False
Combee,30,3840,120.0,42,1059860,30,30,42,bug,flying,70,False
Espeon,65,8960,45.0,60,1000000,65,130,95,psychic,,110,False
Gabite,90,10240,45.0,65,1250000,68,50,55,dragon,ground,82,False
Starmie,75,5120,60.0,85,1250000,60,100,85,water,psychic,115,False
Crobat,90,3840,90.0,80,1000000,85,70,80,poison,flying,130,False
Banette,165,6400,45.0,75,800000,64,93,83,ghost,,75,False
Mudsdale,125,5120,60.0,100,1000000,100,55,85,ground,,35,False
Spritzee,52,5120,200.0,60,1000000,78,63,65,fairy,,23,False
Venomoth,65,5120,75.0,60,1000000,70,90,75,bug,poison,90,False
Shaymin,103,30720,45.0,75,1059860,100,120,75,grass,grass,127,True
Binacle,52,5120,120.0,67,1000000,42,39,56,rock,water,50,False
Skarmory,80,6400,25.0,140,1250000,65,40,70,steel,flying,70,False
Durant,109,5120,90.0,112,1000000,58,48,48,bug,steel,109,False
Ponyta,85,5120,190.0,55,1000000,50,65,65,fire,,90,False
Archen,112,7680,45.0,45,1000000,55,74,45,rock,flying,70,False
Tangrowth,100,5120,30.0,125,1000000,100,110,50,grass,,50,False
Omastar,60,7680,45.0,125,1000000,70,115,70,rock,water,55,False
Druddigon,120,7680,45.0,90,1000000,77,60,90,dragon,,48,False
Ribombee,55,5120,75.0,60,1000000,60,95,70,bug,fairy,124,False
Spiritomb,92,7680,100.0,108,1000000,50,92,108,ghost,dark,35,False
Larvesta,85,10240,45.0,55,1250000,55,50,55,bug,fire,60,False
Ledian,35,3840,90.0,50,800000,55,55,110,bug,flying,85,False
Medicham,100,5120,90.0,85,1000000,60,80,85,fighting,psychic,100,False
Staravia,75,3840,120.0,50,1059860,55,40,40,normal,flying,80,False
Fennekin,45,5120,45.0,40,1059860,40,62,60,fire,,60,False
Tangela,55,5120,45.0,115,1000000,65,100,40,grass,,60,False
Heatran,90,2560,3.0,106,1250000,91,130,106,fire,steel,77,True
Numel,60,5120,255.0,40,1000000,60,65,45,fire,ground,35,False
Deoxys,95,30720,3.0,90,1250000,50,95,90,psychic,,180,True
Venonat,55,5120,190.0,50,1000000,60,40,55,bug,poison,45,False
Mismagius,60,6400,45.0,60,800000,60,105,105,ghost,,105,False
Rowlet,55,3840,45.0,55,1059860,68,50,50,grass,flying,42,False
Dragonite,134,10240,45.0,95,1250000,91,100,100,dragon,flying,80,False
Florges,65,5120,45.0,68,1000000,78,112,154,fairy,,75,False
Musharna,55,2560,75.0,85,800000,116,107,95,psychic,,29,False
Helioptile,38,5120,190.0,33,1000000,44,61,43,electric,normal,70,False
Caterpie,30,3840,255.0,35,1000000,45,20,20,bug,,45,False
Kirlia,35,5120,120.0,35,1250000,38,65,55,psychic,fairy,50,False
Silvally,95,30720,3.0,95,1250000,95,95,95,normal,,95,False
Lickitung,55,5120,45.0,75,1000000,90,60,75,normal,,30,False
Brionne,69,3840,45.0,69,1059860,60,91,81,water,,50,False
Shelmet,40,3840,200.0,85,1000000,50,40,65,bug,,25,False
Cutiefly,45,5120,190.0,40,1000000,40,55,40,bug,fairy,84,False
Togedemaru,98,2560,180.0,63,1000000,65,40,73,electric,steel,96,False
Tentacruel,70,5120,60.0,65,1250000,80,80,120,water,poison,100,False
Shuppet,75,6400,225.0,35,800000,44,63,33,ghost,,45,False
Aurorus,77,7680,45.0,72,1000000,123,99,92,rock,ice,58,False
Slowpoke,65,5120,190.0,65,1000000,90,40,40,water,psychic,15,False
Jirachi,100,30720,3.0,100,1250000,100,100,100,steel,psychic,100,True
Shedinja,90,3840,45.0,45,600000,1,30,30,bug,ghost,40,False
Necrozma,107,30720,3.0,101,1250000,97,127,89,psychic,,79,True
Zweilous,85,10240,45.0,70,1250000,72,65,70,dark,dragon,58,False
Flabébé,38,5120,225.0,39,1000000,44,61,79,fairy,,42,False
Mantyke,20,6400,25.0,50,1250000,45,60,120,water,flying,50,False
Seismitoad,95,5120,45.0,75,1059860,105,85,75,water,ground,74,False
src/main/java/fr/univlille/sae/classification/controller/DataVisualizationController.java
+ 42
− 16
View file @ 86599116
...@@ -11,33 +11,57 @@ import javafx.scene.layout.HBox; ...@@ -11,33 +11,57 @@ import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;
import javafx.stage.Stage; import javafx.stage.Stage;
/**
* Classe abstraite de contrôleur pour les fenêtres de visualisation de données.
*/
public abstract class DataVisualizationController { public abstract class DataVisualizationController {
/**
* Fenêtre associée à cette vue.
*/
@FXML @FXML
Stage stage; Stage stage;
/**
* Label affichant les axes.
*/
@FXML @FXML
Label AxesSelected; Label AxesSelected;
/**
* Légende de la visualisation.
*/
@FXML @FXML
VBox legend; VBox legend;
/**
* ScatterChart pour l'affichage des données.
*/
@FXML @FXML
ScatterChart scatterChart; ScatterChart scatterChart;
/**
* Positions x et y du curseur de la souris.
*/
protected double initialX; protected double initialX;
protected double initialY; protected double initialY;
/**
* Limites initiales des axes.
*/
protected double initialLowerBoundX; protected double initialLowerBoundX;
protected double initialUpperBoundX; protected double initialUpperBoundX;
protected double initialLowerBoundY; protected double initialLowerBoundY;
protected double initialUpperBoundY; protected double initialUpperBoundY;
/**
* Vue de visualisation des données associé à ce contrôleur.
*/
protected DataVisualizationView view; protected DataVisualizationView view;
/**
* Configure les fonctionnalités de zoom à l'aide de la molette de la souris.
*/
protected void setupZoom() { protected void setupZoom() {
NumberAxis xAxis = (NumberAxis) scatterChart.getXAxis(); NumberAxis xAxis = (NumberAxis) scatterChart.getXAxis();
NumberAxis yAxis = (NumberAxis) scatterChart.getYAxis(); NumberAxis yAxis = (NumberAxis) scatterChart.getYAxis();
...@@ -82,7 +106,9 @@ public abstract class DataVisualizationController { ...@@ -82,7 +106,9 @@ public abstract class DataVisualizationController {
yAxis.setAutoRanging(true); yAxis.setAutoRanging(true);
} }
/**
* Configure les fonctionnalités de déplacement à l'aide de la souris.
*/
protected void setupDrag() { protected void setupDrag() {
scatterChart.setOnMousePressed(event -> { scatterChart.setOnMousePressed(event -> {
initialX = event.getSceneX(); initialX = event.getSceneX();
...@@ -117,17 +143,16 @@ public abstract class DataVisualizationController { ...@@ -117,17 +143,16 @@ public abstract class DataVisualizationController {
} }
/** /**
* Ouvrir les paramètres des axes de la vue * Ouvrir les paramètres des axes de la vue.
*/ */
public void openAxesSetting(){ public void openAxesSetting(){
AxesSettingsView axesSettingsView = new AxesSettingsView(ClassificationModel.getClassificationModel(), stage, view); AxesSettingsView axesSettingsView = new AxesSettingsView(ClassificationModel.getClassificationModel(), stage, view);
axesSettingsView.show(); axesSettingsView.show();
} }
/** /**
* Renvoie la grille associé à la classe * Renvoie la grille associée à la classe.
* @return grille de la classe * @return Grille de la classe
*/ */
public ScatterChart getScatterChart() { public ScatterChart getScatterChart() {
return this.scatterChart; return this.scatterChart;
...@@ -135,25 +160,26 @@ public abstract class DataVisualizationController { ...@@ -135,25 +160,26 @@ public abstract class DataVisualizationController {
/** /**
* Attribut une valeur à l'axe de la grille * Attribue une valeur à l'axe de la grille.
* @param texte Valeur de l'axe * @param texte Valeur de l'axe
*/ */
public void setAxesSelected(String texte) { public void setAxesSelected(String texte) {
this.AxesSelected.setText(texte); this.AxesSelected.setText(texte);
} }
/**
* Désactive le texte des axes sélectionnés.
*/
public void setAxesSelectedDisable(){ public void setAxesSelectedDisable(){
this.AxesSelected.setDisable(true); this.AxesSelected.setDisable(true);
} }
/**
* Charge une légende dans le conteneur dédié.
* @param vBox Conteneur contenant les éléments de la légende
*/
public void loadLegend(VBox vBox) { public void loadLegend(VBox vBox) {
this.legend.getChildren().clear(); this.legend.getChildren().clear();
this.legend.getChildren().addAll(vBox.getChildren()); this.legend.getChildren().addAll(vBox.getChildren());
} }
} }
src/main/java/fr/univlille/sae/classification/controller/KNNController.java
+ 27
− 10
View file @ 86599116
...@@ -19,24 +19,44 @@ import java.util.ArrayList; ...@@ -19,24 +19,44 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
/**
* Contrôleur pour la fenêtre de l'algorithme KNN.
*/
public class KNNController { public class KNNController {
/**
* Fenêtre associée à cette vue.
*/
@FXML @FXML
private Stage stage; private Stage stage;
/**
* Menu déroulant pour sélectionner l'algorithme de calcul de distances.
*/
@FXML @FXML
ChoiceBox<String> algoSelector; ChoiceBox<String> algoSelector;
/**
* Spinner pour définir le nombre de k (voisins).
*/
@FXML @FXML
Spinner<Integer> kEntry; Spinner<Integer> kEntry;
/**
* Bouton pour calculer automatiquement le k optimal.
*/
@FXML @FXML
Button autoK; Button autoK;
/**
* Bouton pour valider la classification du point.
*/
@FXML @FXML
Button confirmK; Button confirmK;
/**
* Initialisation du contrôleur.
*/
@FXML @FXML
public void initialize() { public void initialize() {
int max = (int) Math.sqrt(ClassificationModel.getClassificationModel().getDatas().size()); int max = (int) Math.sqrt(ClassificationModel.getClassificationModel().getDatas().size());
...@@ -51,8 +71,9 @@ public class KNNController { ...@@ -51,8 +71,9 @@ public class KNNController {
algoSelector.setValue(Distance.getDistanceName(ClassificationModel.getClassificationModel().getDistance())); algoSelector.setValue(Distance.getDistanceName(ClassificationModel.getClassificationModel().getDistance()));
} }
/**
* Calcul du k optimal en fonction des données actuelles.
*/
public void bestK() { public void bestK() {
ClassificationModel model = ClassificationModel.getClassificationModel(); ClassificationModel model = ClassificationModel.getClassificationModel();
...@@ -61,8 +82,6 @@ public class KNNController { ...@@ -61,8 +82,6 @@ public class KNNController {
kEntry.getValueFactory().setValue(model.getkOptimal()); kEntry.getValueFactory().setValue(model.getkOptimal());
}else { }else {
// Calcul du K Optimal: // Calcul du K Optimal:
Task<Scene> knnTask = new Task<>() { Task<Scene> knnTask = new Task<>() {
@Override @Override
protected Scene call() throws Exception { protected Scene call() throws Exception {
...@@ -130,15 +149,13 @@ public class KNNController { ...@@ -130,15 +149,13 @@ public class KNNController {
}); });
new Thread(knnTask).start(); new Thread(knnTask).start();
} }
} }
/**
* Validation des paramètres de l'algorithme KNN.
*/
public void validate() { public void validate() {
ClassificationModel model = ClassificationModel.getClassificationModel(); ClassificationModel model = ClassificationModel.getClassificationModel();
......
src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java
+ 18
− 6
View file @ 86599116
...@@ -18,24 +18,37 @@ import javafx.stage.Stage; ...@@ -18,24 +18,37 @@ import javafx.stage.Stage;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
/**
* Contrôleur pour la fenêtre de chargement des données.
*/
public class LoadDataController { public class LoadDataController {
/**
* Fenêtre associée à cette vue.
*/
@FXML @FXML
Stage stage; Stage stage;
/**
* Champ de texte affichant le chemin du fichier sélectionné.
*/
@FXML @FXML
TextField filePath; TextField filePath;
/**
* Menu déroulant permettant de sélectionner une classification pré-fabriquée des données du fichier.
*/
@FXML @FXML
ChoiceBox<DataType> fileType = new ChoiceBox<>(); ChoiceBox<DataType> fileType = new ChoiceBox<>();
/** /**
* Fichier sélectionné * Fichier sélectionné.
*/ */
File file; File file;
/**
* Initialisation du contrôleur.
*/
@FXML @FXML
public void initialize() { public void initialize() {
fileType.getItems().addAll(DataType.values()); fileType.getItems().addAll(DataType.values());
...@@ -43,7 +56,7 @@ public class LoadDataController { ...@@ -43,7 +56,7 @@ public class LoadDataController {
} }
/** /**
* Ouvre un explorateur de fichiers pour sélectionner le fichier à étudier * Ouvre un explorateur de fichiers pour sélectionner le fichier à étudier.
*/ */
public void openFileChooser() { public void openFileChooser() {
FileChooser fileChooser = new FileChooser(); FileChooser fileChooser = new FileChooser();
...@@ -57,9 +70,8 @@ public class LoadDataController { ...@@ -57,9 +70,8 @@ public class LoadDataController {
} }
/** /**
* Valide le fichier sélectionné au préalable * Valide le fichier sélectionné au préalable.
*/ */
public void validate(){ public void validate(){
......
src/main/java/fr/univlille/sae/classification/controller/MainStageController.java
+ 24
− 9
View file @ 86599116
...@@ -12,23 +12,32 @@ import javafx.stage.Stage; ...@@ -12,23 +12,32 @@ import javafx.stage.Stage;
import java.io.IOException; import java.io.IOException;
/**
* Contrôleur de la fenêtre principale du programme.
*/
public class MainStageController extends DataVisualizationController{ public class MainStageController extends DataVisualizationController{
/**
* Bouton pour classifier les points ajoutés par l'utilisateur à l'aide de
* l'algorithme KNN.
*/
@FXML @FXML
Button classifyData; Button classifyData;
/**
* Affichage des informations du point sélectionné par l'utilisateur.
*/
@FXML @FXML
ListView PointInfo; ListView PointInfo;
/**
* Vue principale associée à ce contrôleur.
*/
private MainStageView mainStageView; private MainStageView mainStageView;
/**
* Initialisation du contrôleur.
*/
public void initialize() { public void initialize() {
setupZoom(); setupZoom();
setupDrag(); setupDrag();
...@@ -43,6 +52,10 @@ public class MainStageController extends DataVisualizationController{ ...@@ -43,6 +52,10 @@ public class MainStageController extends DataVisualizationController{
loadDataView.show(); loadDataView.show();
} }
/**
* Ouvre l'interface de classification des données entrées par l'utilisateur à
* l'aide de l'algorithme KNN.
*/
public void openClassification(){ public void openClassification(){
KNNView knnView = new KNNView(ClassificationModel.getClassificationModel(), stage); KNNView knnView = new KNNView(ClassificationModel.getClassificationModel(), stage);
knnView.show(); knnView.show();
...@@ -111,10 +124,12 @@ public class MainStageController extends DataVisualizationController{ ...@@ -111,10 +124,12 @@ public class MainStageController extends DataVisualizationController{
return this.classifyData; return this.classifyData;
} }
/**
* Retourne l'instance de PointInfo.
* @return Instance de PointInfo.
*/
public ListView getPointInfo(){ public ListView getPointInfo(){
return this.PointInfo; return this.PointInfo;
}; };
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment