diff --git a/fout.txt b/fout.txt new file mode 100644 index 0000000..6bf8159 --- /dev/null +++ b/fout.txt @@ -0,0 +1,316 @@ +3 17 +A2A3B1 +A2A3C1 +A2A4D2 +A2B2D4 +A3B3D4 +A3C3D4 +A4B1C2 +A4B3C3 +A4C1C2 +A4D3D4 +B1B3D2 +B1C1D3 +B1C3D2 +B1D1D4 +B3C1D2 +C1C3D2 +C1D1D4 + 4 88 +A1A2A3A4 +A1A2B1B2 +A1A2B2C1 +A1A2C2D4 +A1A3B1B3 +A1A3B1C3 +A1A3B3C1 +A1A3C1C3 +A1A3D2D4 +A1A4B1D3 +A1A4B3D2 +A1A4C1D3 +A1A4C3D2 +A1A4D1D4 +A1B1C1D1 +A1B1C4D4 +A1B2B3D4 +A1B2C3D4 +A1C1C4D4 +A2A3B3D1 +A2A3C3D1 +A2A3D2D3 +A2A4B2B4 +A2A4C2C4 +A2A4D1D3 +A2B1B4C2 +A2B1C4D3 +A2B2B3D3 +A2B2C2D2 +A2B2C3D3 +A2B3B4C3 +A2B3C4D2 +A2B4C1C2 +A2B4D3D4 +A2C1C4D3 +A2C3C4D2 +A2C4D1D4 +A3A4B2D3 +A3A4B3B4 +A3A4B4C3 +A3A4C4D2 +A3B1B2D1 +A3B1B4D2 +A3B1C2D3 +A3B2C1D1 +A3B2C4D4 +A3B3C2D2 +A3B3C3D3 +A3B4C1D2 +A3C1C2D3 +A3C2C3D2 +A3C2D1D4 +A4B1B4D1 +A4B2B3C4 +A4B2C3C4 +A4B2D1D2 +A4B3C2D1 +A4B4C1D1 +A4B4C4D4 +A4C2C3D1 +A4C2D2D3 +B1B2B3B4 +B1B2B4C3 +B1B2C4D2 +B1B3C2C4 +B1B3D1D3 +B1B4C1C4 +B1C2C3C4 +B1C2D1D2 +B1C3D1D3 +B2B3B4C1 +B2B3C2C3 +B2B4C1C3 +B2B4D2D4 +B2C1C4D2 +B2C2D3D4 +B3B4C2D4 +B3C1C2C4 +B3C1D1D3 +B3C3D1D2 +B3C4D3D4 +B4C2C3D4 +C1C2C3C4 +C1C2D1D2 +C1C3D1D3 +C2C4D2D4 +C3C4D3D4 +D1D2D3D4 + 5 131 +A1A2A3B2C2 +A1A2A3B3C4 +A1A2A3C3C4 +A1A2A3D1D2 +A1A2A4B4C2 +A1A2A4C4D3 +A1A2B1B4D3 +A1A2B1C4D1 +A1A2B2B3D1 +A1A2B2C3D1 +A1A2B2D2D3 +A1A2B3B4D2 +A1A2B3C2D3 +A1A2B4C1D3 +A1A2B4C3D2 +A1A2B4D1D4 +A1A2C1C4D1 +A1A2C2C3D3 +A1A3A4B2D1 +A1A3A4B4D2 +A1A3A4C2D3 +A1A3B1B2C4 +A1A3B1C2D1 +A1A3B2B4D4 +A1A3B2C1C4 +A1A3B3C3D1 +A1A3B3D2D3 +A1A3C1C2D1 +A1A3C2C4D4 +A1A3C3D2D3 +A1A3D1D3D4 +A1A4B1B4C4 +A1A4B2B3B4 +A1A4B2B4C3 +A1A4B2C4D2 +A1A4B3C2C4 +A1A4B3D1D3 +A1A4B4C1C4 +A1A4C2C3C4 +A1A4C2D1D2 +A1A4C3D1D3 +A1B1B2B4D2 +A1B1B2C2D3 +A1B1B3B4C2 +A1B1B3C4D3 +A1B1B4C2C3 +A1B1C2C4D2 +A1B1C3C4D3 +A1B1D1D2D3 +A1B2B3C2D2 +A1B2B3C3D3 +A1B2B4C1D2 +A1B2C1C2D3 +A1B2C2C3D2 +A1B2C2D1D4 +A1B3B4C1C2 +A1B3B4D3D4 +A1B3C1C4D3 +A1B3C3C4D2 +A1B3C4D1D4 +A1B4C1C2C3 +A1B4C2D2D4 +A1B4C3D3D4 +A1C1C2C4D2 +A1C1C3C4D3 +A1C1D1D2D3 +A1C3C4D1D4 +A1C4D2D3D4 +A2A3B2B4D3 +A2A3B2C4D1 +A2A3B4C4D2 +A2A3C2C4D3 +A2A4B4C4D1 +A2B2B3B4C4 +A2B2B4C3C4 +A2B2B4D1D2 +A2B2C2D1D3 +A2B3B4C2D1 +A2B3C4D1D3 +A2B4C2C3D1 +A2B4C2D2D3 +A2C2C4D1D2 +A2C3C4D1D3 +A3A4B2B4C4 +A3A4B4C2D1 +A3A4C4D1D3 +A3B1B4C2C4 +A3B1B4D1D3 +A3B2B3B4C2 +A3B2B3C4D3 +A3B2B4C2C3 +A3B2C2C4D2 +A3B2C3C4D3 +A3B2D1D2D3 +A3B3B4C3C4 +A3B3B4D1D2 +A3B3C2D1D3 +A3B4C1C2C4 +A3B4C1D1D3 +A3B4C3D1D2 +A3B4C4D3D4 +A3C2C3D1D3 +A4B2B4C2D3 +A4B2C2C4D1 +A4B3B4C4D3 +A4B4C2C4D2 +A4B4C3C4D3 +A4B4D1D2D3 +B1B2B4C2D1 +B1B2C4D1D3 +B1B3B4C4D1 +B1B4C3C4D1 +B1B4C4D2D3 +B2B3B4C3D1 +B2B3B4D2D3 +B2B3C4D1D2 +B2B4C1C2D1 +B2B4C2C4D4 +B2B4C3D2D3 +B2B4D1D3D4 +B2C1C4D1D3 +B2C3C4D1D2 +B3B4C1C4D1 +B3B4C2C3D3 +B3C2C3C4D1 +B3C2C4D2D3 +B4C1C3C4D1 +B4C1C4D2D3 +B4C4D1D2D4 +C2C3C4D2D3 +C2C4D1D3D4 + 6 66 +A1A2A3B2B4D1 +A1A2A3B4C2D3 +A1A2A3C2C4D1 +A1A2B2B4C4D2 +A1A2B2C2C4D3 +A1A2B3B4C2C4 +A1A2B3B4D1D3 +A1A2B4C2C3C4 +A1A2B4C2D1D2 +A1A2B4C3D1D3 +A1A2C4D1D2D3 +A1A3A4B4C2C4 +A1A3A4B4D1D3 +A1A3B1B4C4D3 +A1A3B2B3B4D3 +A1A3B2B3C4D1 +A1A3B2B4C2D2 +A1A3B2B4C3D3 +A1A3B2C3C4D1 +A1A3B2C4D2D3 +A1A3B3B4C4D2 +A1A3B3C2C4D3 +A1A3B4C1C4D3 +A1A3B4C3C4D2 +A1A3B4C4D1D4 +A1A3C2C3C4D3 +A1A3C2D1D2D3 +A1A4B2B4C2D1 +A1A4B2C4D1D3 +A1A4B3B4C4D1 +A1A4B4C3C4D1 +A1A4B4C4D2D3 +A1B1B2B4C2C4 +A1B1B2B4D1D3 +A1B1B4C4D1D2 +A1B1C2C4D1D3 +A1B2B3B4C3C4 +A1B2B3B4D1D2 +A1B2B3C2D1D3 +A1B2B4C1C2C4 +A1B2B4C1D1D3 +A1B2B4C3D1D2 +A1B2B4C4D3D4 +A1B2C2C3D1D3 +A1B3B4C2C3D1 +A1B3B4C2D2D3 +A1B3C2C4D1D2 +A1B3C3C4D1D3 +A1B4C1C4D1D2 +A1B4C2C3D2D3 +A1B4C2D1D3D4 +A1C1C2C4D1D3 +A1C2C3C4D1D2 +A2A3B4C4D1D3 +A2B2B4C2C4D1 +A3B2B4C4D1D2 +A3B2C2C4D1D3 +A3B3B4C2C4D1 +A3B4C2C3C4D1 +A3B4C2C4D2D3 +A4B4C2C4D1D3 +B2B3B4C2C4D3 +B2B4C2C3C4D3 +B2B4C2D1D2D3 +B3B4C4D1D2D3 +B4C3C4D1D2D3 + 7 8 +A1A2B2B4C4D1D3 +A1A3B2B4C2D1D3 +A1A3B3B4C4D1D3 +A1A3B4C2C4D1D2 +A1A3B4C3C4D1D3 +A1B2B3B4C2C4D1 +A1B2B4C2C3C4D1 +A1B2B4C2C4D2D3 + \ No newline at end of file diff --git a/foutcont.txt b/foutcont.txt new file mode 100644 index 0000000..74e8ce6 --- /dev/null +++ b/foutcont.txt @@ -0,0 +1,99 @@ +3 3 +A2A3B1 +A4B3C3 +C1C3D2 + 4 33 +A1A2A3A4 +A1A2B1B2 +A1A2B2C1 +A1B1C1D1 +A1B2C3D4 +A2B2C2D2 +A2B2C3D3 +A2B3B4C3 +A3A4B3B4 +A3A4B4C3 +A3B2C1D1 +A3B3C2D2 +A3B3C3D3 +A4B2B3C4 +A4B3C2D1 +A4B4C4D4 +B1B2B3B4 +B1B2B4C3 +B1B3C2C4 +B1C2C3C4 +B1C2D1D2 +B2B3B4C1 +B2B3C2C3 +B2B4C1C3 +B2C2D3D4 +B3C1C2C4 +B3C3D1D2 +B3C4D3D4 +B4C2C3D4 +C1C2C3C4 +C1C2D1D2 +C3C4D3D4 +D1D2D3D4 + 5 35 +A1A2A3B2C2 +A1A2A3B3C4 +A1A2B3C2D3 +A1A4B2B3B4 +A1A4B2B4C3 +A1B1B2C2D3 +A1B1B3B4C2 +A1B1B4C2C3 +A1B2B3C2D2 +A1B2B3C3D3 +A1B2C1C2D3 +A1B2C2C3D2 +A2B2B3B4C4 +A2B2B4C3C4 +A2B2C2D1D3 +A2B3B4C2D1 +A3A4B2B4C4 +A3B2B3B4C2 +A3B2B3C4D3 +A3B2B4C2C3 +A3B2C3C4D3 +A3B3B4C3C4 +A3B3C2D1D3 +A3B4C3D1D2 +A3B4C4D3D4 +A4B3B4C4D3 +A4B4C3C4D3 +B2B4C3D2D3 +B2C3C4D1D2 +B3B4C2C3D3 +B3C2C3C4D1 +B3C2C4D2D3 +B4C1C4D2D3 +C2C3C4D2D3 +C2C4D1D3D4 + 6 18 +A1A2B2C2C4D3 +A1A2B3B4C2C4 +A1A3B2B4C2D2 +A1A3B2B4C3D3 +A1B1C2C4D1D3 +A1B2B3B4C3C4 +A1B2B3C2D1D3 +A1B2B4C3D1D2 +A1B2C2C3D1D3 +A3B2C2C4D1D3 +A3B3B4C2C4D1 +A3B4C2C3C4D1 +A3B4C2C4D2D3 +A4B4C2C4D1D3 +B2B3B4C2C4D3 +B2B4C2C3C4D3 +B3B4C4D1D2D3 +B4C3C4D1D2D3 + 7 4 +A1A3B2B4C2D1D3 +A1B2B3B4C2C4D1 +A1B2B4C2C3C4D1 +A1B2B4C2C4D2D3 + \ No newline at end of file diff --git a/p_vue_graph.adb b/p_vue_graph.adb index 07712bf..0870a61 100644 --- a/p_vue_graph.adb +++ b/p_vue_graph.adb @@ -138,7 +138,7 @@ package body p_vue_graph is ajouterBouton(fenetre, "Solution", "Afficher Solutions", 265 , 430 , 200 , 50); ajouterBouton(fenetre, "Fermer", "Quitter", 200 , 580 , 100 , 50); ajouterBouton(fenetre, "Contigue", "Non", 200 , 375 , 50 , 30); - ajouterBouton(fenetre, "Info", "info", 265 , 505 , 200 , 50); + ajouterBouton(fenetre, "Info", "Informations", 265 , 505 , 200 , 50); ajouterBouton(fenetre, "Scoreboard", "Scoreboard", 35 , 505 , 200 , 50); ajouterTexte(fenetre, "TexTContigue : ", "Seulement contigue : ", 50,375,150,30); ajouterTexte(fenetre, "Textintro", "Bienvenue dans le programme du carre de Subirachs", 50,100,400,30); @@ -275,8 +275,8 @@ package body p_vue_graph is CopieFicherScore(fscore,VScore); triBullesScores(VScore); while i <= 10 and i <= VScore'last loop --On Crée une zone de text par joueur pour les 10prmeir au maximum - ajouterTexte(fenetre, "Joueurs" &integer'image(i) , " Joueur : " & VScore(i).pseudo, 50,50 + (50*i),250,30); - ajouterTexte(fenetre, "Score" &integer'image(i) , "Points : " & integer'image(VScore(i).Score), 250,50 + (50*i),250,30); + ajouterTexte(fenetre, "Joueurs" &integer'image(i) , " Joueur : " & VScore(i).pseudo, 50,(50*i),220,30); + ajouterTexte(fenetre, "Score" &integer'image(i) , "Points : " & integer'image(VScore(i).Score), 270, (50*i),100,30); i := i+1; end loop; end; diff --git a/score b/score new file mode 100644 index 0000000..d30e4e1 Binary files /dev/null and b/score differ diff --git a/test.adb b/test.adb index 23efc17..61c4a3c 100644 --- a/test.adb +++ b/test.adb @@ -1,27 +1,43 @@ with text_io, p_combinaisons ; use text_io, p_combinaisons, p_combinaisons.p_cases_io, p_combinaisons.p_int_io ; - +with p_combinaisons, p_jeu, Ada.Strings, Ada.Strings.Fixed, text_io, Ada.Characters.Handling; +use p_combinaisons, p_jeu, Ada.Strings, Ada.Strings.Fixed, text_io, Ada.Characters.Handling, p_combinaisons.p_cases_io, p_jeu.p_score_io; procedure test is f: p_cases_io.file_type; V: TV_Gaudi(1..16); - +score : TR_Score; fout, foutcont: text_io.file_type; + f2 :p_score_io.file_type; begin - open(f, IN_FILE, "CarreGaudi"); - - CreeVectGaudi(f, V); - triVectGaudi(V); - - create(fout, OUT_FILE, "fout.txt"); - creeFicsol(V, fout); - reset(fout, IN_FILE); - - create(foutcont, OUT_FILE, "foutcont.txt"); - creeFicsolcont(fout, foutcont); - - close(foutcont); - close(fout); - - close(f); - + -- open(f, IN_FILE, "CarreGaudi"); + -- + -- CreeVectGaudi(f, V); + -- triVectGaudi(V); + -- + -- create(fout, OUT_FILE, "fout.txt"); + -- creeFicsol(V, fout); + -- reset(fout, IN_FILE); + -- + -- create(foutcont, OUT_FILE, "foutcont.txt"); + -- creeFicsolcont(fout, foutcont); + -- + -- close(foutcont); + -- close(fout); + -- + -- close(f); + open(f2, APPEND_FILE, "score"); +put("1"); +for i in 1..20 loop + put("2"); + score.pseudo := (others => ' '); + if i >= 10 then + score.pseudo(1..14) := ("Utilisateur" & integer'image(i) ); + else + score.pseudo(1..13) := ("Utilisateur" & integer'image(i)); + end if; + score.score:= (i+2)*3-2*i; + write(f2, score); + put("3"); +end loop; + close(f2); end test;