From e675183ae8325223b1ce2bd0b0deea03e41776c3 Mon Sep 17 00:00:00 2001 From: JunkJumper Date: Wed, 20 May 2020 17:36:45 +0200 Subject: [PATCH] tree and classes ok ! :D --- src/TD1/HelloWorld.java | 2 + src/TD1/point/Point.java | 2 +- src/TD1/point/PointTest.java | 2 +- src/TD1/point/TestPoint.java | 2 +- src/TD10/input/LectureFichierAffichage.java | 2 +- src/TD10/input/LectureFichierEcriture.java | 3 +- src/TD10/input/LectureFichierEcritureESP.java | 2 +- src/TD10/pokemon/Joueur.java | 2 +- src/TD10/pokemon/Partie.java | 2 +- src/TD10/pokemon/Pokemon.java | 2 +- src/TD10/pokemon/PokemonEAU.java | 2 +- src/TD10/pokemon/PokemonELECTRIK.java | 2 +- src/TD10/pokemon/PokemonFEU.java | 2 +- src/TD10/pokemon/PokemonPLANTE.java | 2 +- src/TD10/pokemon/TestPokemon.java | 2 +- src/TD10/pokemon/Type.java | 2 +- .../EnsembleEntierBorne.java | 2 +- .../TestEnsembleEntierBorne.java | 2 +- src/TD2/tripletEntier/TestTripletEntier.java | 2 +- src/TD2/tripletEntier/TripletEntier.java | 2 +- src/TD3/boite/Boite.java | 2 +- src/TD3/boite/Objet.java | 2 +- src/TD3/boite/testBoite.java | 2 +- src/TD3/fleuriste/Bouquet.java | 2 +- src/TD3/fleuriste/Fleur.java | 2 +- src/TD3/fleuriste/LotFleur.java | 2 +- src/TD3/fleuriste/LotFleurs.java | 2 +- src/TD3/fleuriste/Stock.java | 2 +- src/TD3/fleuriste/TestBouquet.java | 2 +- src/TD3/segment/Segment.java | 49 ---------- src/TD3/segment/TestSegment.java | 43 -------- src/TD3/segments/Segment.java | 64 ------------ src/TD3/segments/TestSegment.java | 34 ------- src/TD4/pointcolore/PointColore.java | 4 +- src/TD4/pointcolore/TestPointColore.java | 4 +- src/TD4/vehicule/Avion.java | 2 +- src/TD4/vehicule/GestionVehicule.java | 2 +- src/TD4/vehicule/Vehicule.java | 2 +- src/TD4/vehicule/Voiture.java | 2 +- src/TD5/pointcolore/PointColore.java | 4 +- src/TD5/pointcolore/TestPointColore.java | 5 +- src/TD5/pokemon/Pokemon.java | 2 +- src/TD5/pokemon/PokemonEAU.java | 2 +- src/TD5/pokemon/PokemonELECTRIK.java | 2 +- src/TD5/pokemon/PokemonFEU.java | 2 +- src/TD5/pokemon/PokemonPLANTE.java | 2 +- src/TD5/pokemon/TestPokemon.java | 2 +- src/TD5/pokemon/Type.java | 2 +- src/TD6/pkmA/Attaque.java | 5 - src/TD6/pkmA/Pokemon.java | 58 ----------- src/TD6/pkmA/PokemonEAU.java | 76 -------------- src/TD6/pkmA/PokemonELECTRIK.java | 87 ---------------- src/TD6/pkmA/PokemonFEU.java | 76 -------------- src/TD6/pkmA/PokemonPLANTE.java | 70 ------------- src/TD6/pkmA/TestPokemon.java | 23 ----- src/TD6/pkmA/Type.java | 11 --- src/TD6/pokemon/Pokemon.java | 2 +- src/TD6/pokemon/PokemonEAU.java | 2 +- src/TD6/pokemon/PokemonELECTRIK.java | 2 +- src/TD6/pokemon/PokemonFEU.java | 2 +- src/TD6/pokemon/PokemonPLANTE.java | 2 +- src/TD6/pokemon/TestPokemon.java | 2 +- src/TD6/pokemon/Type.java | 2 +- src/TD6/vehicule/Avion.java | 37 ------- src/TD6/{vehiculev2 => vehicule}/Camion.java | 2 +- src/TD6/vehicule/GestionVehicule.java | 33 +++---- src/TD6/vehicule/Vehicule.java | 98 +++++++++++++------ .../VehiculeAMoteur.java | 2 +- .../VehiculeSansMoteur.java | 2 +- src/TD6/{vehiculev2 => vehicule}/Velo.java | 2 +- src/TD6/vehicule/Voiture.java | 86 ++++++---------- src/TD6/vehiculev2/GestionVehicule.java | 18 ---- src/TD6/vehiculev2/Vehicule.java | 72 -------------- src/TD6/vehiculev2/Voiture.java | 32 ------ src/TD7/ip/IP.java | 2 +- src/TD7/ip/MainIp.java | 2 +- src/TD7/monney/Monnaie.java | 2 +- .../MaClasse.java | 2 +- .../MaClasseTest.java | 2 +- src/TD8/parking/Parking.java | 10 +- src/TD8/parking/ParkingTest.java | 10 +- src/TD8/parking/Voiture.java | 2 +- src/TD8/pokemon/Joueur.java | 2 +- src/TD8/pokemon/Pokemon.java | 2 +- src/TD8/pokemon/PokemonEAU.java | 2 +- src/TD8/pokemon/PokemonELECTRIK.java | 2 +- src/TD8/pokemon/PokemonFEU.java | 2 +- src/TD8/pokemon/PokemonPLANTE.java | 2 +- src/TD8/pokemon/TestPokemon.java | 2 +- src/TD8/pokemon/Type.java | 2 +- .../{services => service}/TestExercices.java | 2 +- src/TD9/comparable/ComparetoDepNom.java | 2 +- src/TD9/comparable/Enseignant.java | 2 +- src/TD9/comparable/Etudiant.java | 2 +- src/TD9/comparable/Personne.java | 2 +- src/TD9/comparable/main.java | 2 +- src/TD9/pokemon/Joueur.java | 2 +- src/TD9/pokemon/Pokemon.java | 2 +- src/TD9/pokemon/PokemonEAU.java | 2 +- src/TD9/pokemon/PokemonELECTRIK.java | 2 +- src/TD9/pokemon/PokemonFEU.java | 2 +- src/TD9/pokemon/PokemonPLANTE.java | 2 +- src/TD9/pokemon/TestPokemon.java | 2 +- src/TD9/pokemon/Type.java | 2 +- .../CompareAlpha.java | 2 +- .../CompareNiveau.java | 2 +- src/{TDPokemon => TDPokemons}/IAttaque.java | 2 +- src/{TDPokemon => TDPokemons}/Joueur.java | 10 +- .../ListePokemon.txt | 0 src/{TDPokemon => TDPokemons}/Partie.java | 14 ++- src/{TDPokemon => TDPokemons}/PokeCentre.java | 22 ++--- src/{TDPokemon => TDPokemons}/Pokemon.java | 5 +- src/{TDPokemon => TDPokemons}/PokemonEAU.java | 4 +- .../PokemonELECTRIK.java | 4 +- src/{TDPokemon => TDPokemons}/PokemonFEU.java | 4 +- .../PokemonPLANTE.java | 4 +- src/{TDPokemon => TDPokemons}/Type.java | 2 +- .../TD2/tripletEntier}/TestTriplet.java | 3 +- tests/TD7/ip/IPTest.java | 3 +- tests/TD7/{ => monney}/MonnaieTest.java | 10 +- tests/TD8/{ => pokemon}/testJoueurs.java | 6 +- .../testPokemon.java | 10 +- 122 files changed, 263 insertions(+), 1012 deletions(-) delete mode 100644 src/TD3/segment/Segment.java delete mode 100644 src/TD3/segment/TestSegment.java delete mode 100644 src/TD3/segments/Segment.java delete mode 100644 src/TD3/segments/TestSegment.java delete mode 100644 src/TD6/pkmA/Attaque.java delete mode 100644 src/TD6/pkmA/Pokemon.java delete mode 100644 src/TD6/pkmA/PokemonEAU.java delete mode 100644 src/TD6/pkmA/PokemonELECTRIK.java delete mode 100644 src/TD6/pkmA/PokemonFEU.java delete mode 100644 src/TD6/pkmA/PokemonPLANTE.java delete mode 100644 src/TD6/pkmA/TestPokemon.java delete mode 100644 src/TD6/pkmA/Type.java delete mode 100644 src/TD6/vehicule/Avion.java rename src/TD6/{vehiculev2 => vehicule}/Camion.java (97%) rename src/TD6/{vehiculev2 => vehicule}/VehiculeAMoteur.java (98%) rename src/TD6/{vehiculev2 => vehicule}/VehiculeSansMoteur.java (90%) rename src/TD6/{vehiculev2 => vehicule}/Velo.java (97%) delete mode 100644 src/TD6/vehiculev2/GestionVehicule.java delete mode 100644 src/TD6/vehiculev2/Vehicule.java delete mode 100644 src/TD6/vehiculev2/Voiture.java rename src/TD7/{premierTest => premierTests}/MaClasse.java (90%) rename src/TD7/{premierTest => premierTests}/MaClasseTest.java (95%) rename src/TD8/{services => service}/TestExercices.java (97%) rename src/{TDPokemon => TDPokemons}/CompareAlpha.java (90%) rename src/{TDPokemon => TDPokemons}/CompareNiveau.java (91%) rename src/{TDPokemon => TDPokemons}/IAttaque.java (74%) rename src/{TDPokemon => TDPokemons}/Joueur.java (88%) rename src/{TDPokemon => TDPokemons}/ListePokemon.txt (100%) rename src/{TDPokemon => TDPokemons}/Partie.java (92%) rename src/{TDPokemon => TDPokemons}/PokeCentre.java (85%) rename src/{TDPokemon => TDPokemons}/Pokemon.java (96%) rename src/{TDPokemon => TDPokemons}/PokemonEAU.java (96%) rename src/{TDPokemon => TDPokemons}/PokemonELECTRIK.java (96%) rename src/{TDPokemon => TDPokemons}/PokemonFEU.java (96%) rename src/{TDPokemon => TDPokemons}/PokemonPLANTE.java (95%) rename src/{TDPokemon => TDPokemons}/Type.java (91%) rename {src/TD2/test => tests/TD2/tripletEntier}/TestTriplet.java (98%) rename tests/TD7/{ => monney}/MonnaieTest.java (88%) rename tests/TD8/{ => pokemon}/testJoueurs.java (91%) rename tests/{TDPokemon => TDPokemons}/testPokemon.java (86%) diff --git a/src/TD1/HelloWorld.java b/src/TD1/HelloWorld.java index f7c6856..74e092f 100644 --- a/src/TD1/HelloWorld.java +++ b/src/TD1/HelloWorld.java @@ -1,3 +1,5 @@ +package TD1; + public class HelloWorld { public static void main(String[] args) diff --git a/src/TD1/point/Point.java b/src/TD1/point/Point.java index efa0e0e..8cd5e4d 100644 --- a/src/TD1/point/Point.java +++ b/src/TD1/point/Point.java @@ -1,4 +1,4 @@ -package point; +package TD1.point; public class Point { diff --git a/src/TD1/point/PointTest.java b/src/TD1/point/PointTest.java index c15f8d5..c25b919 100644 --- a/src/TD1/point/PointTest.java +++ b/src/TD1/point/PointTest.java @@ -1,4 +1,4 @@ -package point; +package TD1.point; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/TD1/point/TestPoint.java b/src/TD1/point/TestPoint.java index b2d7435..6b57be0 100644 --- a/src/TD1/point/TestPoint.java +++ b/src/TD1/point/TestPoint.java @@ -1,4 +1,4 @@ -package point; +package TD1.point; public class TestPoint { public static void main(String[] args) diff --git a/src/TD10/input/LectureFichierAffichage.java b/src/TD10/input/LectureFichierAffichage.java index 7f445cc..0169300 100644 --- a/src/TD10/input/LectureFichierAffichage.java +++ b/src/TD10/input/LectureFichierAffichage.java @@ -1,4 +1,4 @@ -package input; +package TD10.input; import java.io.*; diff --git a/src/TD10/input/LectureFichierEcriture.java b/src/TD10/input/LectureFichierEcriture.java index 93c371c..ae71fbe 100644 --- a/src/TD10/input/LectureFichierEcriture.java +++ b/src/TD10/input/LectureFichierEcriture.java @@ -1,5 +1,4 @@ -package input; - +package TD10.input; import java.io.*; public class LectureFichierEcriture { diff --git a/src/TD10/input/LectureFichierEcritureESP.java b/src/TD10/input/LectureFichierEcritureESP.java index 18fc6cc..84e8b5b 100644 --- a/src/TD10/input/LectureFichierEcritureESP.java +++ b/src/TD10/input/LectureFichierEcritureESP.java @@ -1,4 +1,4 @@ -package input; +package TD10.input; import java.io.*; diff --git a/src/TD10/pokemon/Joueur.java b/src/TD10/pokemon/Joueur.java index a7760b2..512e5bd 100644 --- a/src/TD10/pokemon/Joueur.java +++ b/src/TD10/pokemon/Joueur.java @@ -1,4 +1,4 @@ -package pokemon; +package TD10.pokemon; import java.util.*; import java.lang.Math; diff --git a/src/TD10/pokemon/Partie.java b/src/TD10/pokemon/Partie.java index c7daa21..bc67c42 100644 --- a/src/TD10/pokemon/Partie.java +++ b/src/TD10/pokemon/Partie.java @@ -1,4 +1,4 @@ -package pokemon; +package TD10.pokemon; import java.io.*; import java.util.*; diff --git a/src/TD10/pokemon/Pokemon.java b/src/TD10/pokemon/Pokemon.java index 5d69fb1..a4e4267 100644 --- a/src/TD10/pokemon/Pokemon.java +++ b/src/TD10/pokemon/Pokemon.java @@ -1,4 +1,4 @@ -package pokemon; +package TD10.pokemon; public abstract class Pokemon implements Comparable { diff --git a/src/TD10/pokemon/PokemonEAU.java b/src/TD10/pokemon/PokemonEAU.java index e93cc91..5316bd4 100644 --- a/src/TD10/pokemon/PokemonEAU.java +++ b/src/TD10/pokemon/PokemonEAU.java @@ -1,4 +1,4 @@ -package pokemon; +package TD10.pokemon; public class PokemonEAU extends Pokemon{ private int nb_nageoires; diff --git a/src/TD10/pokemon/PokemonELECTRIK.java b/src/TD10/pokemon/PokemonELECTRIK.java index d9aaa15..21936a7 100644 --- a/src/TD10/pokemon/PokemonELECTRIK.java +++ b/src/TD10/pokemon/PokemonELECTRIK.java @@ -1,4 +1,4 @@ -package pokemon; +package TD10.pokemon; public class PokemonELECTRIK extends Pokemon { private int nb_pattes; diff --git a/src/TD10/pokemon/PokemonFEU.java b/src/TD10/pokemon/PokemonFEU.java index 7b1cb6c..8251b22 100644 --- a/src/TD10/pokemon/PokemonFEU.java +++ b/src/TD10/pokemon/PokemonFEU.java @@ -1,4 +1,4 @@ -package pokemon; +package TD10.pokemon; public class PokemonFEU extends Pokemon { private int nb_pattes; diff --git a/src/TD10/pokemon/PokemonPLANTE.java b/src/TD10/pokemon/PokemonPLANTE.java index d3285c1..b26e92e 100644 --- a/src/TD10/pokemon/PokemonPLANTE.java +++ b/src/TD10/pokemon/PokemonPLANTE.java @@ -1,4 +1,4 @@ -package pokemon; +package TD10.pokemon; public class PokemonPLANTE extends Pokemon{ diff --git a/src/TD10/pokemon/TestPokemon.java b/src/TD10/pokemon/TestPokemon.java index db77b4e..612846e 100644 --- a/src/TD10/pokemon/TestPokemon.java +++ b/src/TD10/pokemon/TestPokemon.java @@ -1,4 +1,4 @@ -package pokemon; +package TD10.pokemon; import java.util.*; diff --git a/src/TD10/pokemon/Type.java b/src/TD10/pokemon/Type.java index 898acc6..69e6b27 100644 --- a/src/TD10/pokemon/Type.java +++ b/src/TD10/pokemon/Type.java @@ -1,4 +1,4 @@ -package pokemon; +package TD10.pokemon; enum Type { diff --git a/src/TD2/ensembleEntierBorne/EnsembleEntierBorne.java b/src/TD2/ensembleEntierBorne/EnsembleEntierBorne.java index b811069..a318e35 100644 --- a/src/TD2/ensembleEntierBorne/EnsembleEntierBorne.java +++ b/src/TD2/ensembleEntierBorne/EnsembleEntierBorne.java @@ -1,4 +1,4 @@ -package ensembleEntierBorne; +package TD2.ensembleEntierBorne; public class EnsembleEntierBorne { diff --git a/src/TD2/ensembleEntierBorne/TestEnsembleEntierBorne.java b/src/TD2/ensembleEntierBorne/TestEnsembleEntierBorne.java index 71d86b0..ef2274f 100644 --- a/src/TD2/ensembleEntierBorne/TestEnsembleEntierBorne.java +++ b/src/TD2/ensembleEntierBorne/TestEnsembleEntierBorne.java @@ -1,4 +1,4 @@ -package ensembleEntierBorne; +package TD2.ensembleEntierBorne; public class TestEnsembleEntierBorne { diff --git a/src/TD2/tripletEntier/TestTripletEntier.java b/src/TD2/tripletEntier/TestTripletEntier.java index 2f278f3..b2bb790 100644 --- a/src/TD2/tripletEntier/TestTripletEntier.java +++ b/src/TD2/tripletEntier/TestTripletEntier.java @@ -1,4 +1,4 @@ -package tripletEntier; +package TD2.tripletEntier; public class TestTripletEntier { diff --git a/src/TD2/tripletEntier/TripletEntier.java b/src/TD2/tripletEntier/TripletEntier.java index 9881084..bb1d2d2 100644 --- a/src/TD2/tripletEntier/TripletEntier.java +++ b/src/TD2/tripletEntier/TripletEntier.java @@ -1,4 +1,4 @@ -package tripletEntier; +package TD2.tripletEntier; public class TripletEntier { diff --git a/src/TD3/boite/Boite.java b/src/TD3/boite/Boite.java index 2169f6a..44982da 100644 --- a/src/TD3/boite/Boite.java +++ b/src/TD3/boite/Boite.java @@ -1,4 +1,4 @@ -package boite; +package TD3.boite; import java.awt.Color; diff --git a/src/TD3/boite/Objet.java b/src/TD3/boite/Objet.java index b73c6e7..a1bb89b 100644 --- a/src/TD3/boite/Objet.java +++ b/src/TD3/boite/Objet.java @@ -1,4 +1,4 @@ -package boite; +package TD3.boite; import java.awt.*; diff --git a/src/TD3/boite/testBoite.java b/src/TD3/boite/testBoite.java index e6adbbc..a2fd36d 100644 --- a/src/TD3/boite/testBoite.java +++ b/src/TD3/boite/testBoite.java @@ -1,4 +1,4 @@ -package boite; +package TD3.boite; import java.awt.Color; diff --git a/src/TD3/fleuriste/Bouquet.java b/src/TD3/fleuriste/Bouquet.java index 0d8d6d0..ede321a 100644 --- a/src/TD3/fleuriste/Bouquet.java +++ b/src/TD3/fleuriste/Bouquet.java @@ -1,4 +1,4 @@ -package fleuriste; +package TD3.fleuriste; public class Bouquet { private LotFleurs lot1; diff --git a/src/TD3/fleuriste/Fleur.java b/src/TD3/fleuriste/Fleur.java index cd504d2..372eab2 100644 --- a/src/TD3/fleuriste/Fleur.java +++ b/src/TD3/fleuriste/Fleur.java @@ -1,4 +1,4 @@ -package fleuriste; +package TD3.fleuriste; public class Fleur { String nom; diff --git a/src/TD3/fleuriste/LotFleur.java b/src/TD3/fleuriste/LotFleur.java index 9469250..2f84a50 100644 --- a/src/TD3/fleuriste/LotFleur.java +++ b/src/TD3/fleuriste/LotFleur.java @@ -1,4 +1,4 @@ -package fleuriste; +package TD3.fleuriste; public class LotFleur { diff --git a/src/TD3/fleuriste/LotFleurs.java b/src/TD3/fleuriste/LotFleurs.java index a6b4435..c67fc48 100644 --- a/src/TD3/fleuriste/LotFleurs.java +++ b/src/TD3/fleuriste/LotFleurs.java @@ -1,4 +1,4 @@ -package fleuriste; +package TD3.fleuriste; public class LotFleurs { Fleur fleur; diff --git a/src/TD3/fleuriste/Stock.java b/src/TD3/fleuriste/Stock.java index 2de07bc..56e2079 100644 --- a/src/TD3/fleuriste/Stock.java +++ b/src/TD3/fleuriste/Stock.java @@ -1,4 +1,4 @@ -package fleuriste; +package TD3.fleuriste; public class Stock { Fleur roses; diff --git a/src/TD3/fleuriste/TestBouquet.java b/src/TD3/fleuriste/TestBouquet.java index 65f1cac..29ed345 100644 --- a/src/TD3/fleuriste/TestBouquet.java +++ b/src/TD3/fleuriste/TestBouquet.java @@ -1,4 +1,4 @@ -package fleuriste; +package TD3.fleuriste; public class TestBouquet { public static void main( String[] args) { diff --git a/src/TD3/segment/Segment.java b/src/TD3/segment/Segment.java deleted file mode 100644 index bb31d04..0000000 --- a/src/TD3/segment/Segment.java +++ /dev/null @@ -1,49 +0,0 @@ -package segment; -import point.Point; - -public class Segment { - - public Point origine; - public Point extremite; - - public Segment(Point p1, Point p2) throws Throwable - { - if(p1.equals(p2)) throw new Throwable("Les points sont confondus !"); - this.origine = p1; - this.extremite = p2; - } - - public boolean equals(Object B) - { - Segment s = (Segment) B; - return this.origine.equals(s.origine)&&(this.extremite.equals(s.extremite)) || this.origine.equals(extremite)&&(this.extremite.equals(s.origine)); - } - - public String toString() - { - return "[" + origine + " - " + extremite + "]"; - } - - /*public Object clone() throws Throwable - { - return new Segment((Point)this.origine.clone, (Point)this.extremite.clone); - }*/ - - public double longueur() - { - return origine.getDistance(extremite); - } - - public Segment projX() throws Throwable - { - if(origine.projX().equals(extremite.projX())) throw new Throwable("Les points projetes sont confondus !"); - return new Segment(origine.projX(), extremite.projX()); - } - - public Segment projY() throws Throwable - { - if(origine.projY().equals(extremite.projY())) throw new Throwable("Les points projetes sont confondus !"); - return new Segment(origine.projY(), extremite.projY()); - } - -} diff --git a/src/TD3/segment/TestSegment.java b/src/TD3/segment/TestSegment.java deleted file mode 100644 index 3bb2c68..0000000 --- a/src/TD3/segment/TestSegment.java +++ /dev/null @@ -1,43 +0,0 @@ -package segment; -import point.Point; - -public class TestSegment { - - public static void main(String[] args) { - - Point O = new Point(); - Point I = new Point(1.0, 0.0); - Point J = new Point(0.0, 1.0); - Point A = new Point(1.0, 3.5); - Point B = new Point(8.0, 20.0); - Point C = new Point(-2.0, 3.0); - Point D = new Point(1.0, 1.0); - - Segment AB = null; - Segment BC = null; - Segment OI = null; - Segment OJ = null; - Segment OD = null; - //Segment AA = null; - try { - AB = new Segment(A, B); - BC = new Segment(B, C); - OI = new Segment(O, I); - OJ = new Segment(O, J); - OD = new Segment(O, D); - //AA = new Segment(A, A); - } catch (Throwable t) { - System.out.println("Erreur : " + t); - } - - System.out.println(OI.toString()); - System.out.println(OJ.toString()); - System.out.println(AB.toString()); - System.out.println(BC.toString()); - System.out.println(OD.toString()); - //System.out.println(AA.toString()); - - System.out.println("Hello world !"); - } - -} diff --git a/src/TD3/segments/Segment.java b/src/TD3/segments/Segment.java deleted file mode 100644 index ddb9693..0000000 --- a/src/TD3/segments/Segment.java +++ /dev/null @@ -1,64 +0,0 @@ -package segments; - -import Coords.Coords; - -public class Segment { - private Coords origine; - private Coords extremite; - - - - public Segment(Coords debut, Coords fin) throws RuntimeException { - if (debut.equals(fin) == true) - throw new RuntimeException("Points confondus"); - origine = new Coords(debut); - extremite = new Coords(fin); - } - - public Coords getOrigine() { - return this.origine; - } - - - public Coords getExtremite() { - return this.extremite; - } - - public double length() { - return this.origine.getDistance(this.extremite); - } - - public Segment projX() { - Segment projetX = new Segment(this.origine.projx(), this.extremite.projx()); - return projetX; - } - - public Segment projY() { - Segment projetY = new Segment(this.origine.projY(), this.extremite.projY()); - return projetY; - } - - - public boolean equals(Segment deux) { - if (this.origine.equals(deux.origine) && this.extremite.equals(deux.extremite)) { - return true; - } else if (this.origine.equals(deux.extremite) && this.extremite.equals(deux.origine)){ - return true; - } else { - return false; - } - } - - public Segment clone() { - Segment clonage = new Segment(this.origine, this.extremite); - return clonage; - } - - public String toString() { - return "Le point d'origine à pour coordonnées "+this.origine.toString()+" et le point d'extremite à pour coordonnées "+this.extremite.toString(); - } - - -} - - diff --git a/src/TD3/segments/TestSegment.java b/src/TD3/segments/TestSegment.java deleted file mode 100644 index 093beb0..0000000 --- a/src/TD3/segments/TestSegment.java +++ /dev/null @@ -1,34 +0,0 @@ -package segments; - -import Coords.Coords; - -public class TestSegment { - - public static void main(String[] args) { - Coords p11 = new Coords(12.2, 8.3); - Coords p12 = new Coords(21.1, 6.5); - Coords p32 = new Coords(45.5, 8.6); - Segment s1 = new Segment(p11, p12); - Segment s2 = s1.clone(); - Segment s3 = null; - try { - s3 = new Segment(p11, new Coords(45.5, 8.6)); - } catch (RuntimeException e) { - e.getMessage(); - } - - assert (s1.equals(s2) == true); - assert (s1.equals(s3) == false); - assert (s3.getExtremite().equals(p32) == true); - assert (s3.length() == 33.30135); - - assert (s3.projX().equals(new Segment(p11.projx(), p32.projx()))); - //Segment err = new Segment(p11, p11); - - - - - System.out.println("fin du programme"); - } - -} diff --git a/src/TD4/pointcolore/PointColore.java b/src/TD4/pointcolore/PointColore.java index 9ece927..26114b7 100644 --- a/src/TD4/pointcolore/PointColore.java +++ b/src/TD4/pointcolore/PointColore.java @@ -1,7 +1,7 @@ -package pointcolore; +package TD4.pointcolore; import java.awt.Color; -import point.Point; +import TD1.point.Point; public class PointColore extends Point { diff --git a/src/TD4/pointcolore/TestPointColore.java b/src/TD4/pointcolore/TestPointColore.java index c13abaa..084a70e 100644 --- a/src/TD4/pointcolore/TestPointColore.java +++ b/src/TD4/pointcolore/TestPointColore.java @@ -1,7 +1,7 @@ -package pointcolore; +package TD4.pointcolore; import java.awt.Color; -import point.Point; +import TD1.point.Point; public class TestPointColore { public static void main(String[] args) { diff --git a/src/TD4/vehicule/Avion.java b/src/TD4/vehicule/Avion.java index e219cd9..7954d03 100644 --- a/src/TD4/vehicule/Avion.java +++ b/src/TD4/vehicule/Avion.java @@ -1,4 +1,4 @@ -package vehicule; +package TD4.vehicule; public class Avion extends Vehicule { protected String moteur; diff --git a/src/TD4/vehicule/GestionVehicule.java b/src/TD4/vehicule/GestionVehicule.java index 2d15a8b..d955803 100644 --- a/src/TD4/vehicule/GestionVehicule.java +++ b/src/TD4/vehicule/GestionVehicule.java @@ -1,4 +1,4 @@ -package vehicule; +package TD4.vehicule; import java.util.Calendar; diff --git a/src/TD4/vehicule/Vehicule.java b/src/TD4/vehicule/Vehicule.java index e9ca1d2..de63630 100644 --- a/src/TD4/vehicule/Vehicule.java +++ b/src/TD4/vehicule/Vehicule.java @@ -1,4 +1,4 @@ -package vehicule; +package TD4.vehicule; public class Vehicule { protected String marque; diff --git a/src/TD4/vehicule/Voiture.java b/src/TD4/vehicule/Voiture.java index e4e445d..964456b 100644 --- a/src/TD4/vehicule/Voiture.java +++ b/src/TD4/vehicule/Voiture.java @@ -1,4 +1,4 @@ -package vehicule; +package TD4.vehicule; public class Voiture extends Vehicule { protected double cylindree; diff --git a/src/TD5/pointcolore/PointColore.java b/src/TD5/pointcolore/PointColore.java index 827214f..3780ced 100644 --- a/src/TD5/pointcolore/PointColore.java +++ b/src/TD5/pointcolore/PointColore.java @@ -1,7 +1,7 @@ -package pointcolore; +package TD5.pointcolore; import java.awt.Color; -import point.Point; +import TD1.point.Point; public class PointColore extends Point { diff --git a/src/TD5/pointcolore/TestPointColore.java b/src/TD5/pointcolore/TestPointColore.java index 27792ed..5c41009 100644 --- a/src/TD5/pointcolore/TestPointColore.java +++ b/src/TD5/pointcolore/TestPointColore.java @@ -1,8 +1,7 @@ -package pointcolore; +package TD5.pointcolore; import java.awt.Color; - -import point.Point; +import TD1.point.Point; public class TestPointColore { public static void main(String[] args) { diff --git a/src/TD5/pokemon/Pokemon.java b/src/TD5/pokemon/Pokemon.java index 2868127..69dc500 100644 --- a/src/TD5/pokemon/Pokemon.java +++ b/src/TD5/pokemon/Pokemon.java @@ -1,4 +1,4 @@ -package pokemon; +package TD5.pokemon; public class Pokemon { diff --git a/src/TD5/pokemon/PokemonEAU.java b/src/TD5/pokemon/PokemonEAU.java index 4edaa2a..37a0c28 100644 --- a/src/TD5/pokemon/PokemonEAU.java +++ b/src/TD5/pokemon/PokemonEAU.java @@ -1,4 +1,4 @@ -package pokemon; +package TD5.pokemon; public class PokemonEAU extends Pokemon{ private int nb_nageoires; diff --git a/src/TD5/pokemon/PokemonELECTRIK.java b/src/TD5/pokemon/PokemonELECTRIK.java index fb247ad..d59f815 100644 --- a/src/TD5/pokemon/PokemonELECTRIK.java +++ b/src/TD5/pokemon/PokemonELECTRIK.java @@ -1,4 +1,4 @@ -package pokemon; +package TD5.pokemon; public class PokemonELECTRIK extends Pokemon { private int nb_pattes; diff --git a/src/TD5/pokemon/PokemonFEU.java b/src/TD5/pokemon/PokemonFEU.java index 1380663..12f0d1a 100644 --- a/src/TD5/pokemon/PokemonFEU.java +++ b/src/TD5/pokemon/PokemonFEU.java @@ -1,4 +1,4 @@ -package pokemon; +package TD5.pokemon; public class PokemonFEU extends Pokemon { private int nb_pattes; diff --git a/src/TD5/pokemon/PokemonPLANTE.java b/src/TD5/pokemon/PokemonPLANTE.java index ed683be..8eba19d 100644 --- a/src/TD5/pokemon/PokemonPLANTE.java +++ b/src/TD5/pokemon/PokemonPLANTE.java @@ -1,4 +1,4 @@ -package pokemon; +package TD5.pokemon; public class PokemonPLANTE extends Pokemon{ diff --git a/src/TD5/pokemon/TestPokemon.java b/src/TD5/pokemon/TestPokemon.java index 275f126..506297a 100644 --- a/src/TD5/pokemon/TestPokemon.java +++ b/src/TD5/pokemon/TestPokemon.java @@ -1,4 +1,4 @@ -package pokemon; +package TD5.pokemon; public class TestPokemon { public static void main(String[] args) { diff --git a/src/TD5/pokemon/Type.java b/src/TD5/pokemon/Type.java index 898acc6..db81e5c 100644 --- a/src/TD5/pokemon/Type.java +++ b/src/TD5/pokemon/Type.java @@ -1,4 +1,4 @@ -package pokemon; +package TD5.pokemon; enum Type { diff --git a/src/TD6/pkmA/Attaque.java b/src/TD6/pkmA/Attaque.java deleted file mode 100644 index 78a4e64..0000000 --- a/src/TD6/pkmA/Attaque.java +++ /dev/null @@ -1,5 +0,0 @@ -package pkmA; - -public interface Attaque { - public void attaquer(Object adv); -} diff --git a/src/TD6/pkmA/Pokemon.java b/src/TD6/pkmA/Pokemon.java deleted file mode 100644 index a10b1f4..0000000 --- a/src/TD6/pkmA/Pokemon.java +++ /dev/null @@ -1,58 +0,0 @@ -package pkmA; - -public abstract class Pokemon{ - private String nom; - private double taille; - private double poids; - private int pv; - private int pc; - Type type; - - public Pokemon() { - - } - - public Pokemon(String nom, double taille, double poids, int pv, int pc, Type type) { - if (type != Type.ELECTRIK && type != Type.EAU && type != Type.FEU && type != Type.PLANTE) - throw new RuntimeException("Ce type : "+type.getDescription()+" n'existe pas"); - - try { - this.nom = nom; - this.taille = taille; - this.poids = poids; - this.pv = pv; - this.pc = pc; - this.type = type; - } catch (Exception e) { - e.getMessage(); - } - } - - public String getNom() { - return nom; - } - - public double getTaille() { - return taille; - } - - public double getPoids() { - return poids; - } - - public int getPv() { - return pv; - } - - public int getPc() { - return pc; - } - - public Type getType() { - return type; - } - - public abstract void changePv(int modif); - - public abstract void attaquer(Pokemon adv); -} diff --git a/src/TD6/pkmA/PokemonEAU.java b/src/TD6/pkmA/PokemonEAU.java deleted file mode 100644 index cac3240..0000000 --- a/src/TD6/pkmA/PokemonEAU.java +++ /dev/null @@ -1,76 +0,0 @@ -package pkmA; - -public class PokemonEAU extends Pokemon{ - private String nom; - private double taille; // en m - private double poids; // en kg - private int pv; - private int pc; - Type type; - private int nb_nageoires; - - public PokemonEAU() { - type = Type.EAU; - } - - public PokemonEAU(String n, double t, double p, int v, int c, int g) { - super(n, t, p, v, c, Type.EAU); - this.nom = n; - this.type = Type.EAU; - nb_nageoires = g; - } - - public String getNom() { - return nom; - } - - public double getTaille() { - return taille; - } - - public double getPoids() { - return poids; - } - - public int getPv() { - return pv; - } - - public int getPc() { - return pc; - } - - public Type getType() { - return type; - } - - public int getNb_nageoires() { - return nb_nageoires; - } - - public void changePv(int modif) { - pv = Math.max(0, pv-modif); - } - - public double calculerVitesse() { - return (this.poids*nb_nageoires)/25.0; - } - - public void attaquer(Pokemon adv) { - if (adv.getType() == Type.EAU || adv.getType() == Type.PLANTE) { - adv.changePv(Math.round(super.getPc()/2)); - System.out.println(""+this.getNom()+" inflige "+""+Math.round(super.getPc()/2)+" a "+adv.getNom()); - } else if (adv.getType() == Type.ELECTRIK) { - adv.changePv(super.getPc()); - System.out.println(""+this.getNom()+" inflige "+""+super.getPc()+" a "+adv.getNom()); - } else { - adv.changePv(2*super.getPc()); - System.out.println(""+this.getNom()+" inflige "+""+2*pc+" a "+adv.getNom()); - } - } - - public String toString() { - return "Pokemon "+super.getNom()+" de type "+type.getDescription()+" ("+super.getPoids()+" kg, "+super.getTaille()+" m, "+super.getPv()+" pts de vie, "+super.getPc()+" force de combat), "+nb_nageoires+" nageoires)"; - } - -} diff --git a/src/TD6/pkmA/PokemonELECTRIK.java b/src/TD6/pkmA/PokemonELECTRIK.java deleted file mode 100644 index acf55c6..0000000 --- a/src/TD6/pkmA/PokemonELECTRIK.java +++ /dev/null @@ -1,87 +0,0 @@ -package pkmA; - -public class PokemonELECTRIK extends Pokemon{ - private String nom; - private double taille; // en m - private double poids; // en kg - private int pv; - private int pc; - Type type; - private int nb_pattes; - private int nb_ailes; - private double intensite; - - public PokemonELECTRIK() { - type = Type.ELECTRIK; - } - - public PokemonELECTRIK(String n, double t, double p, int v, int c, int g, int a, double i) { - super(n, t, p, v, c, Type.ELECTRIK); - this.nom = n; - this.type = Type.ELECTRIK; - nb_pattes = g; - nb_ailes = a; - intensite = i; - } - - public String getNom() { - return nom; - } - - public double getTaille() { - return taille; - } - - public double getPoids() { - return poids; - } - - public int getPv() { - return pv; - } - - public int getPc() { - return pc; - } - - public Type getType() { - return type; - } - - public int getPattes() { - return nb_pattes; - } - - public int getAiles() { - return nb_ailes; - } - - public double getIntensite() { - return intensite; - } - - public void changePv(int modif) { - pv = Math.max(0, pv-modif); - } - - public double calculerVitesse() { - return (nb_ailes+nb_pattes) * intensite * 0.05; - } - - public void attaquer(Pokemon adv) { - if (adv.getType() == Type.ELECTRIK || adv.getType() == Type.PLANTE) { - adv.changePv(Math.round(super.getPc()/2)); - System.out.println(""+this.getNom()+" inflige "+""+Math.round(super.getPc()/2)+" a "+adv.getNom()); - } else if (adv.getType() == Type.FEU) { - adv.changePv(super.getPc()); - System.out.println(""+this.getNom()+" inflige "+""+super.getPc()+" a "+adv.getNom()); - } else { - adv.changePv(2*super.getPc()); - System.out.println(""+this.getNom()+" inflige "+""+super.getPc()+" a "+adv.getNom()); - } - } - - public String toString() { - return "Pokemon "+super.getNom()+" de type "+type.getDescription()+" ("+super.getPoids()+" kg, "+super.getTaille()+" m, "+super.getPv()+" pts de vie, "+super.getPc()+" force de combat), "+nb_pattes+" pattes, "+nb_ailes+" ailes, "+intensite+" mA)"; - } -} diff --git a/src/TD6/pkmA/PokemonFEU.java b/src/TD6/pkmA/PokemonFEU.java deleted file mode 100644 index 9e8e1bf..0000000 --- a/src/TD6/pkmA/PokemonFEU.java +++ /dev/null @@ -1,76 +0,0 @@ -package pkmA; - -public class PokemonFEU extends Pokemon{ - private String nom; - private double taille; // en m - private double poids; // en kg - private int pv; - private int pc; - Type type; - private int nb_pattes; - - public PokemonFEU() { - type = Type.FEU; - } - - public PokemonFEU(String n, double t, double p, int v, int c, int g) { - super(n, t, p, v, c, Type.FEU); - this.nom = n; - this.type = Type.FEU; - nb_pattes = g; - } - - public String getNom() { - return nom; - } - - public double getTaille() { - return taille; - } - - public double getPoids() { - return poids; - } - - public int getPv() { - return pv; - } - - public int getPc() { - return pc; - } - - public Type getType() { - return type; - } - - public int getPattes() { - return nb_pattes; - } - - public void changePv(int modif) { - pv = Math.max(0, pv-modif); - } - - public double calculerVitesse() { - return this.getPoids()*nb_pattes* 0.03; - } - - public void attaquer(Pokemon adv) { - if (adv.getType() == Type.EAU || adv.getType() == Type.ELECTRIK) { - adv.changePv(Math.round(super.getPc()/2)); - System.out.println(""+this.getNom()+" inflige "+""+Math.round(super.getPc()/2)+" a "+adv.getNom()); - } else if (adv.getType() == Type.FEU) { - adv.changePv(super.getPc()); - System.out.println(""+this.getNom()+" inflige "+""+super.getPc()+" a "+adv.getNom()); - } else { - adv.changePv(2*super.getPc()); - System.out.println(""+this.getNom()+" inflige "+""+2*super.getPc()+" a "+adv.getNom()); - } - } - - public String toString() { - return "Pokemon "+super.getNom()+" de type "+type.getDescription()+" ("+super.getPoids()+" kg, "+super.getTaille()+" m, "+super.getPv()+" pts de vie, "+super.getPc()+" force de combat), "+nb_pattes+" pattes)"; - } - -} diff --git a/src/TD6/pkmA/PokemonPLANTE.java b/src/TD6/pkmA/PokemonPLANTE.java deleted file mode 100644 index a515c31..0000000 --- a/src/TD6/pkmA/PokemonPLANTE.java +++ /dev/null @@ -1,70 +0,0 @@ -package pkmA; - -public class PokemonPLANTE extends Pokemon{ - private String nom; - private double taille; // en m - private double poids; // en kg - private int pv; - private int pc; - Type type; - - public PokemonPLANTE() { - type = Type.PLANTE; - } - - public PokemonPLANTE(String n, double t, double p, int v, int c) { - super(n, t, p, v, c, Type.PLANTE); - this.nom = n; - this.type = Type.PLANTE; - } - - public String getNom() { - return nom; - } - - public double getTaille() { - return taille; - } - - public double getPoids() { - return poids; - } - - public int getPv() { - return pv; - } - - public int getPc() { - return pc; - } - - public Type getType() { - return type; - } - - public void changePv(int modif) { - pv = Math.max(0, pv-modif); - } - - public double calculerVitesse() { - return 10.0 / (this.getPoids()*this.getTaille()); - } - - public void attaquer(Pokemon adv) { - if (adv.getType() == Type.FEU || adv.getType() == Type.PLANTE) { - adv.changePv(Math.round(super.getPc()/2)); - System.out.println(""+this.getNom()+" inflige "+""+Math.round(super.getPc()/2)+" a "+adv.getNom()); - } else if (adv.getType() == Type.EAU) { - adv.changePv(super.getPc()); - System.out.println(""+this.getNom()+" inflige "+""+super.getPc()+" a "+adv.getNom()); - } else { - adv.changePv(2*super.getPc()); - System.out.println(""+this.getNom()+" inflige "+""+2*super.getPc()+" a "+adv.getNom()); - } - } - - public String toString() { - return "Pokemon "+super.getNom()+" de type "+type.getDescription()+" ("+super.getPoids()+" kg, "+super.getTaille()+" m, "+super.getPv()+" pts de vie, "+super.getPc()+" force de combat),"; - } - -} diff --git a/src/TD6/pkmA/TestPokemon.java b/src/TD6/pkmA/TestPokemon.java deleted file mode 100644 index b56be9f..0000000 --- a/src/TD6/pkmA/TestPokemon.java +++ /dev/null @@ -1,23 +0,0 @@ -package pkmA; - - -public class TestPokemon { - - public static void main(String[] args) { - Pokemon pikachu = new PokemonELECTRIK("Pikachu", 0.9, 5.3, 90, 50, 4, 0, 12); - Pokemon aquali = new PokemonEAU("Aquali", 2.1, 56.3, 140, 90, 3); - - pikachu.attaquer(aquali); - assert aquali.getPv() == 40; - - PokemonELECTRIK voltali = new PokemonELECTRIK("Voltali", 1.8, 47.3, 120, 130, 4, 0, 12); - PokemonPLANTE phylali = new PokemonPLANTE("Phylali", 1.6, 28.5, 130, 70); - Pokemon phyl = phylali; - - phylali.attaquer(voltali); - - aquali.attaquer(phyl); - System.out.println(voltali.toString()); - } - -} diff --git a/src/TD6/pkmA/Type.java b/src/TD6/pkmA/Type.java deleted file mode 100644 index ac65e54..0000000 --- a/src/TD6/pkmA/Type.java +++ /dev/null @@ -1,11 +0,0 @@ -package pkmA; - -enum Type { - EAU ("EAU"), - ELECTRIK ("ELECTRIK"), - FEU ("FEU"), - PLANTE ("PLANTE"); - Type(String s){description = s;} - private String description; - public String getDescription() {return description;} -} diff --git a/src/TD6/pokemon/Pokemon.java b/src/TD6/pokemon/Pokemon.java index d4c8b32..3b9387f 100644 --- a/src/TD6/pokemon/Pokemon.java +++ b/src/TD6/pokemon/Pokemon.java @@ -1,4 +1,4 @@ -package pokemon; +package TD6.pokemon; public abstract class Pokemon { diff --git a/src/TD6/pokemon/PokemonEAU.java b/src/TD6/pokemon/PokemonEAU.java index 4edaa2a..9d84103 100644 --- a/src/TD6/pokemon/PokemonEAU.java +++ b/src/TD6/pokemon/PokemonEAU.java @@ -1,4 +1,4 @@ -package pokemon; +package TD6.pokemon; public class PokemonEAU extends Pokemon{ private int nb_nageoires; diff --git a/src/TD6/pokemon/PokemonELECTRIK.java b/src/TD6/pokemon/PokemonELECTRIK.java index bdbad0f..28354d6 100644 --- a/src/TD6/pokemon/PokemonELECTRIK.java +++ b/src/TD6/pokemon/PokemonELECTRIK.java @@ -1,4 +1,4 @@ -package pokemon; +package TD6.pokemon; public class PokemonELECTRIK extends Pokemon { private int nb_pattes; diff --git a/src/TD6/pokemon/PokemonFEU.java b/src/TD6/pokemon/PokemonFEU.java index 1380663..9e4211d 100644 --- a/src/TD6/pokemon/PokemonFEU.java +++ b/src/TD6/pokemon/PokemonFEU.java @@ -1,4 +1,4 @@ -package pokemon; +package TD6.pokemon; public class PokemonFEU extends Pokemon { private int nb_pattes; diff --git a/src/TD6/pokemon/PokemonPLANTE.java b/src/TD6/pokemon/PokemonPLANTE.java index ed683be..c843346 100644 --- a/src/TD6/pokemon/PokemonPLANTE.java +++ b/src/TD6/pokemon/PokemonPLANTE.java @@ -1,4 +1,4 @@ -package pokemon; +package TD6.pokemon; public class PokemonPLANTE extends Pokemon{ diff --git a/src/TD6/pokemon/TestPokemon.java b/src/TD6/pokemon/TestPokemon.java index 275f126..9417103 100644 --- a/src/TD6/pokemon/TestPokemon.java +++ b/src/TD6/pokemon/TestPokemon.java @@ -1,4 +1,4 @@ -package pokemon; +package TD6.pokemon; public class TestPokemon { public static void main(String[] args) { diff --git a/src/TD6/pokemon/Type.java b/src/TD6/pokemon/Type.java index 898acc6..4aefbe3 100644 --- a/src/TD6/pokemon/Type.java +++ b/src/TD6/pokemon/Type.java @@ -1,4 +1,4 @@ -package pokemon; +package TD6.pokemon; enum Type { diff --git a/src/TD6/vehicule/Avion.java b/src/TD6/vehicule/Avion.java deleted file mode 100644 index e219cd9..0000000 --- a/src/TD6/vehicule/Avion.java +++ /dev/null @@ -1,37 +0,0 @@ -package vehicule; - -public class Avion extends Vehicule { - protected String moteur; - protected int heuresVol; - - public Avion() { - moteur = "Moteur"; - heuresVol = 0; - } - - public Avion(String marque, int date, double prixac, String moteur, int heures) { - this.moteur = moteur; - heuresVol = heures; - this.marque = marque; - dateAchat = date; - prixAchat = prixac; - prixCourant = 0; - } - - public void calculePrix(int annee) { - double pourcentage; - if (moteur == "hélice") { - pourcentage = 10*Math.floor(this.heuresVol/100); - } else { - pourcentage = 10* Math.floor(this.heuresVol/1000); - } - super.prixCourant = super.prixAchat - ((super.prixAchat/100) * pourcentage); - if (super.prixCourant < 0) { - super.prixCourant = 0; - } - } - - public void affiche() { - System.out.println(""+this.marque+" "+this.dateAchat+" "+this.prixAchat+" "+prixCourant+" "+this.moteur+" "+this.heuresVol); - } -} diff --git a/src/TD6/vehiculev2/Camion.java b/src/TD6/vehicule/Camion.java similarity index 97% rename from src/TD6/vehiculev2/Camion.java rename to src/TD6/vehicule/Camion.java index c7754ce..16a54b8 100644 --- a/src/TD6/vehiculev2/Camion.java +++ b/src/TD6/vehicule/Camion.java @@ -1,4 +1,4 @@ -package vehiculev2; +package TD6.vehicule; public class Camion extends VehiculeAMoteur { diff --git a/src/TD6/vehicule/GestionVehicule.java b/src/TD6/vehicule/GestionVehicule.java index 2d15a8b..7eb8449 100644 --- a/src/TD6/vehicule/GestionVehicule.java +++ b/src/TD6/vehicule/GestionVehicule.java @@ -1,29 +1,18 @@ -package vehicule; +package TD6.vehicule; import java.util.Calendar; public class GestionVehicule { - private static int ANNEE_ACTUELLE = Calendar.getInstance().get(Calendar.YEAR); - - public static void main(String[] args) { - Voiture[] garage = new Voiture[3]; - Avion[] hangar = new Avion[2]; - garage[0] = new Voiture("Peugeot", 2005, 13400.00, 1.4, 5, 4.0, 12000); - garage[1] = new Voiture("Porsche", 2010, 160000.00, 3.6, 2, 25.0, 8320); - garage[2] = new Voiture("Fiat", 1999, 8400.00, 1.2, 3, 5.0, 125000); - - hangar[0] = new Avion("Cessna", 1979, 204739.90, "HELICES", 250); - hangar[1] = new Avion("Gulfstream", 1993, 4321098.00, "REACTION", 1300); - - for (int i = 0; i < garage.length; i++) { - garage[i].calculePrix(ANNEE_ACTUELLE); - garage[i].affiche(); - } - - for (int i = 0; i < hangar.length; i++) { - hangar[i].calculePrix(ANNEE_ACTUELLE); - hangar[i].affiche(); - } + public static void main (String [] args) { + Vehicule v1 = new Velo (17); // nb vitesses + Vehicule v2 = new Voiture (40.5, 5); // capacité réservoir, nb Places + Vehicule v3 = new Camion (100.0, 100.0); // capacité réservoir, volume + System.out.println ("Vehicules : "+"\n" +v1 +"\n" +v2 +"\n" +v3 +"\n"); + /* + * v2.approvisionner (35.0) ; // litres d’essence v3.approvisionner (70.0); + * v1.transporter ("Dijon ", "Valence ") ; v2.transporter (5, 300) ; + * v3.transporter (" des tuiles", 1000) ; } + */ } } \ No newline at end of file diff --git a/src/TD6/vehicule/Vehicule.java b/src/TD6/vehicule/Vehicule.java index 75c9e3d..08d8bb8 100644 --- a/src/TD6/vehicule/Vehicule.java +++ b/src/TD6/vehicule/Vehicule.java @@ -1,32 +1,72 @@ -package vehicule; +package TD6.vehicule; public abstract class Vehicule { - protected String marque; - protected int dateAchat; - protected double prixAchat; - protected double prixCourant; - - public Vehicule() { - marque = ""; - dateAchat = 0; - prixAchat = 0; - prixCourant = 0; - } - - public Vehicule(String s, int d, double pA) { - this.marque = s; - dateAchat = d; - prixAchat = pA; - prixCourant = 0; - } - - public void calculPrix(int y) { - int previousY = this.dateAchat - y; - this.prixCourant = this.prixAchat - ((this.prixAchat/100) * previousY); - } - - public void affiche() { - System.out.println(""+this.marque+" "+this.dateAchat+" "+this.prixAchat+" "+prixCourant); - } - + + private static int compteur = 0; + private int id; + private double distance; + +/*==========================================================Getter & Setters====================================================================*/ + + /** + * @return the compteur + */ + public static int getCompteur() { + return compteur; + } + + /** + * @return the distance + */ + public double getDistance() { + return distance; + } + + /** + * @param distance the distance to set + */ + public void setDistance(int distance) { + this.distance = distance; + } + + /** + * @return the id + */ + public int getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(int id) { + this.id = id; + } + + /** + * @param compteur the compteur to set + */ + public static void setCompteur(int compteur) { + Vehicule.compteur = compteur; + } + +/*==============================================================================================================================================*/ + + public Vehicule() { + this.id = compteur; + compteur++; + distance = 0.; + } + + @Override + public String toString() { + return "Le véhicule Numéro " + id + " a parcourru " + distance; + } + + void rouler(double d) { + this.distance = d; + } + + + } diff --git a/src/TD6/vehiculev2/VehiculeAMoteur.java b/src/TD6/vehicule/VehiculeAMoteur.java similarity index 98% rename from src/TD6/vehiculev2/VehiculeAMoteur.java rename to src/TD6/vehicule/VehiculeAMoteur.java index 98dcde1..6f704bd 100644 --- a/src/TD6/vehiculev2/VehiculeAMoteur.java +++ b/src/TD6/vehicule/VehiculeAMoteur.java @@ -1,4 +1,4 @@ -package vehiculev2; +package TD6.vehicule; public abstract class VehiculeAMoteur extends Vehicule { diff --git a/src/TD6/vehiculev2/VehiculeSansMoteur.java b/src/TD6/vehicule/VehiculeSansMoteur.java similarity index 90% rename from src/TD6/vehiculev2/VehiculeSansMoteur.java rename to src/TD6/vehicule/VehiculeSansMoteur.java index 9a55a4b..cfdc5c4 100644 --- a/src/TD6/vehiculev2/VehiculeSansMoteur.java +++ b/src/TD6/vehicule/VehiculeSansMoteur.java @@ -1,4 +1,4 @@ -package vehiculev2; +package TD6.vehicule; public abstract class VehiculeSansMoteur extends Vehicule { diff --git a/src/TD6/vehiculev2/Velo.java b/src/TD6/vehicule/Velo.java similarity index 97% rename from src/TD6/vehiculev2/Velo.java rename to src/TD6/vehicule/Velo.java index 8dc2d43..cb9a97c 100644 --- a/src/TD6/vehiculev2/Velo.java +++ b/src/TD6/vehicule/Velo.java @@ -1,4 +1,4 @@ -package vehiculev2; +package TD6.vehicule; public class Velo extends VehiculeSansMoteur{ diff --git a/src/TD6/vehicule/Voiture.java b/src/TD6/vehicule/Voiture.java index e4e445d..27cd6bd 100644 --- a/src/TD6/vehicule/Voiture.java +++ b/src/TD6/vehicule/Voiture.java @@ -1,58 +1,32 @@ -package vehicule; +package TD6.vehicule; -public class Voiture extends Vehicule { - protected double cylindree; - protected int nbPorte; - protected double puissance; - protected double kilometrage; - - public Voiture() { - cylindree = 0; - nbPorte = 0; - puissance = 0; - kilometrage = 0; - } - - public Voiture(String marque, int date, double prixac, double cyl, int nbP, double pui, double kilo) { - cylindree = cyl; - nbPorte = nbP; - puissance = pui; - kilometrage = kilo; - this.marque = marque; - dateAchat = date; - prixAchat = prixac; - prixCourant = 0; - } - - - public void calculePrix(int annee) { - int anneesPass = (annee - this.dateAchat)*2; - double pourcentagekm = Math.floor(this.kilometrage/10000); - boolean malus = false; - boolean bonus = false; - if (this.marque == "fiat" || this.marque == "renaud") { - malus = true; - } else if (this.marque == "ferrari" || this.marque == "mclaren") { - bonus = true; - } - - this.prixCourant = this.prixAchat - ((this.prixAchat/100) * anneesPass); - this.prixCourant -= ((this.prixAchat/100)*(pourcentagekm*5)); - if (malus) - this.prixCourant -= (this.prixAchat/100)*10; - - if (bonus) - this.prixCourant += (this.prixAchat/100)*20; - - if (this.prixCourant < 0) { - this.prixCourant = 0; - } else if (this.prixCourant > this.prixAchat) { - this.prixCourant = this.prixAchat; - } - - } - - public void affiche() { - System.out.println("Marque : "+this.marque+" Date: "+this.dateAchat+" Prix d'achat "+this.prixAchat+" Prix Courant :"+this.prixCourant+" Cylindree "+this.cylindree+" Nb Portes "+this.nbPorte+" Puissance "+this.puissance+" Kilometrage "+this.kilometrage); - } +public class Voiture extends VehiculeAMoteur { + + private int nombrePlace; + + +/*==========================================================Getter & Setters====================================================================*/ + /** + * @return the nombrePlace + */ + public int getNombrePlace() { + return nombrePlace; + } + + /** + * @param nombrePlace the nombrePlace to set + */ + public void setNombrePlace(int nombrePlace) { + this.nombrePlace = nombrePlace; + } +/*==========================================================Getter & Setters====================================================================*/ + + public Voiture(double c, int nb) { + super(c); + this.nombrePlace = nb; + } + + public String toString() { + return super.toString() + " et " + this.nombrePlace + "places dans la voiture."; + } } diff --git a/src/TD6/vehiculev2/GestionVehicule.java b/src/TD6/vehiculev2/GestionVehicule.java deleted file mode 100644 index 897c495..0000000 --- a/src/TD6/vehiculev2/GestionVehicule.java +++ /dev/null @@ -1,18 +0,0 @@ -package vehiculev2; - -import java.util.Calendar; - -public class GestionVehicule { - - public static void main (String [] args) { - Vehicule v1 = new Velo (17); // nb vitesses - Vehicule v2 = new Voiture (40.5, 5); // capacité réservoir, nb Places - Vehicule v3 = new Camion (100.0, 100.0); // capacité réservoir, volume - System.out.println ("Vehicules : "+"\n" +v1 +"\n" +v2 +"\n" +v3 +"\n"); - /* - * v2.approvisionner (35.0) ; // litres d’essence v3.approvisionner (70.0); - * v1.transporter ("Dijon ", "Valence ") ; v2.transporter (5, 300) ; - * v3.transporter (" des tuiles", 1000) ; } - */ - } -} \ No newline at end of file diff --git a/src/TD6/vehiculev2/Vehicule.java b/src/TD6/vehiculev2/Vehicule.java deleted file mode 100644 index 43f72b0..0000000 --- a/src/TD6/vehiculev2/Vehicule.java +++ /dev/null @@ -1,72 +0,0 @@ -package vehiculev2; - -public abstract class Vehicule { - - private static int compteur = 0; - private int id; - private double distance; - -/*==========================================================Getter & Setters====================================================================*/ - - /** - * @return the compteur - */ - public static int getCompteur() { - return compteur; - } - - /** - * @return the distance - */ - public double getDistance() { - return distance; - } - - /** - * @param distance the distance to set - */ - public void setDistance(int distance) { - this.distance = distance; - } - - /** - * @return the id - */ - public int getId() { - return id; - } - - /** - * @param id the id to set - */ - public void setId(int id) { - this.id = id; - } - - /** - * @param compteur the compteur to set - */ - public static void setCompteur(int compteur) { - Vehicule.compteur = compteur; - } - -/*==============================================================================================================================================*/ - - public Vehicule() { - this.id = compteur; - compteur++; - distance = 0.; - } - - @Override - public String toString() { - return "Le véhicule Numéro " + id + " a parcourru " + distance; - } - - void rouler(double d) { - this.distance = d; - } - - - -} diff --git a/src/TD6/vehiculev2/Voiture.java b/src/TD6/vehiculev2/Voiture.java deleted file mode 100644 index befe777..0000000 --- a/src/TD6/vehiculev2/Voiture.java +++ /dev/null @@ -1,32 +0,0 @@ -package vehiculev2; - -public class Voiture extends VehiculeAMoteur { - - private int nombrePlace; - - -/*==========================================================Getter & Setters====================================================================*/ - /** - * @return the nombrePlace - */ - public int getNombrePlace() { - return nombrePlace; - } - - /** - * @param nombrePlace the nombrePlace to set - */ - public void setNombrePlace(int nombrePlace) { - this.nombrePlace = nombrePlace; - } -/*==========================================================Getter & Setters====================================================================*/ - - public Voiture(double c, int nb) { - super(c); - this.nombrePlace = nb; - } - - public String toString() { - return super.toString() + " et " + this.nombrePlace + "places dans la voiture."; - } -} diff --git a/src/TD7/ip/IP.java b/src/TD7/ip/IP.java index 4b7c654..e5ddba4 100644 --- a/src/TD7/ip/IP.java +++ b/src/TD7/ip/IP.java @@ -1,4 +1,4 @@ -package ip; +package TD7.ip; public class IP { private String ip; diff --git a/src/TD7/ip/MainIp.java b/src/TD7/ip/MainIp.java index 8cce7bd..0e41b28 100644 --- a/src/TD7/ip/MainIp.java +++ b/src/TD7/ip/MainIp.java @@ -1,4 +1,4 @@ -package ip; +package TD7.ip; public class MainIp { diff --git a/src/TD7/monney/Monnaie.java b/src/TD7/monney/Monnaie.java index 8a21320..6414d84 100644 --- a/src/TD7/monney/Monnaie.java +++ b/src/TD7/monney/Monnaie.java @@ -1,4 +1,4 @@ -package monney; +package TD7.monney; public class Monnaie { diff --git a/src/TD7/premierTest/MaClasse.java b/src/TD7/premierTests/MaClasse.java similarity index 90% rename from src/TD7/premierTest/MaClasse.java rename to src/TD7/premierTests/MaClasse.java index 829d223..c68af5d 100644 --- a/src/TD7/premierTest/MaClasse.java +++ b/src/TD7/premierTests/MaClasse.java @@ -1,4 +1,4 @@ -package premierTest; +package TD7.premierTests; public class MaClasse { diff --git a/src/TD7/premierTest/MaClasseTest.java b/src/TD7/premierTests/MaClasseTest.java similarity index 95% rename from src/TD7/premierTest/MaClasseTest.java rename to src/TD7/premierTests/MaClasseTest.java index 0a81727..143e592 100644 --- a/src/TD7/premierTest/MaClasseTest.java +++ b/src/TD7/premierTests/MaClasseTest.java @@ -1,4 +1,4 @@ -package premierTest; +package TD7.premierTests; import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; diff --git a/src/TD8/parking/Parking.java b/src/TD8/parking/Parking.java index 42d79fd..077eb1b 100644 --- a/src/TD8/parking/Parking.java +++ b/src/TD8/parking/Parking.java @@ -1,5 +1,5 @@ -package parking; -import vehicule.Voiture; +package TD8.parking; +import TD6.vehicule.Voiture; import java.util.HashMap; public class Parking { @@ -16,7 +16,7 @@ public class Parking { if(parking.get(place)==null) { parking.put(place, v); }else { - throw new IllegalStateException("Place occupé"); + throw new IllegalStateException("Place occup�"); } } public Voiture liberer(int place) throws IndexOutOfBoundsException{ @@ -25,14 +25,14 @@ public class Parking { return voit; } public int chercher(Voiture v) throws IllegalStateException { - for (int i = 0; i < parking.size(); i++) { + for (int i = 0; i < parking.size();) { if(parking.get(i).equals(v)) { return i; }else { throw new IllegalStateException("Place inexistante"); } } - System.out.println("Voiture non présente"); + System.out.println("Voiture non pr�sente"); return 0; } diff --git a/src/TD8/parking/ParkingTest.java b/src/TD8/parking/ParkingTest.java index 14bda99..5ec4caa 100644 --- a/src/TD8/parking/ParkingTest.java +++ b/src/TD8/parking/ParkingTest.java @@ -1,11 +1,13 @@ -package parking; +package TD8.parking; +/* import java.util.HashMap; -import vehicule.Voiture; +import TD6.vehicule.Voiture; +*/ public class ParkingTest { public static void main(String[] args) { - HashMap carpark = new HashMap(); + /*HashMap carpark = new HashMap(); Voiture v1 = new Voiture("Peugeot", 2005, 13400.00, 1.4, 5, 4.0, 12000); Voiture v2 = new Voiture("Porsche", 2010, 160000.00, 3.6, 2, 25.0, 8320); Voiture v3 = new Voiture("Fiat", 1999, 8400.00, 1.2, 3, 5.0, 125000); @@ -22,6 +24,6 @@ public class ParkingTest { }catch(IllegalStateException e) { System.out.println(e.getMessage()); } - P1.toString(); + P1.toString();*/ } } diff --git a/src/TD8/parking/Voiture.java b/src/TD8/parking/Voiture.java index f62754b..00cfd09 100644 --- a/src/TD8/parking/Voiture.java +++ b/src/TD8/parking/Voiture.java @@ -1,4 +1,4 @@ -package parking; +package TD8.parking; public class Voiture { private int nbPorte; diff --git a/src/TD8/pokemon/Joueur.java b/src/TD8/pokemon/Joueur.java index 68a5969..7010258 100644 --- a/src/TD8/pokemon/Joueur.java +++ b/src/TD8/pokemon/Joueur.java @@ -1,4 +1,4 @@ -package pokemon; +package TD8.pokemon; import java.util.*; import java.lang.Math; diff --git a/src/TD8/pokemon/Pokemon.java b/src/TD8/pokemon/Pokemon.java index 60decc9..6521b01 100644 --- a/src/TD8/pokemon/Pokemon.java +++ b/src/TD8/pokemon/Pokemon.java @@ -1,4 +1,4 @@ -package pokemon; +package TD8.pokemon; public abstract class Pokemon { diff --git a/src/TD8/pokemon/PokemonEAU.java b/src/TD8/pokemon/PokemonEAU.java index e93cc91..1abd7fb 100644 --- a/src/TD8/pokemon/PokemonEAU.java +++ b/src/TD8/pokemon/PokemonEAU.java @@ -1,4 +1,4 @@ -package pokemon; +package TD8.pokemon; public class PokemonEAU extends Pokemon{ private int nb_nageoires; diff --git a/src/TD8/pokemon/PokemonELECTRIK.java b/src/TD8/pokemon/PokemonELECTRIK.java index d9aaa15..555615e 100644 --- a/src/TD8/pokemon/PokemonELECTRIK.java +++ b/src/TD8/pokemon/PokemonELECTRIK.java @@ -1,4 +1,4 @@ -package pokemon; +package TD8.pokemon; public class PokemonELECTRIK extends Pokemon { private int nb_pattes; diff --git a/src/TD8/pokemon/PokemonFEU.java b/src/TD8/pokemon/PokemonFEU.java index 7b1cb6c..ff32c6e 100644 --- a/src/TD8/pokemon/PokemonFEU.java +++ b/src/TD8/pokemon/PokemonFEU.java @@ -1,4 +1,4 @@ -package pokemon; +package TD8.pokemon; public class PokemonFEU extends Pokemon { private int nb_pattes; diff --git a/src/TD8/pokemon/PokemonPLANTE.java b/src/TD8/pokemon/PokemonPLANTE.java index d3285c1..af975f4 100644 --- a/src/TD8/pokemon/PokemonPLANTE.java +++ b/src/TD8/pokemon/PokemonPLANTE.java @@ -1,4 +1,4 @@ -package pokemon; +package TD8.pokemon; public class PokemonPLANTE extends Pokemon{ diff --git a/src/TD8/pokemon/TestPokemon.java b/src/TD8/pokemon/TestPokemon.java index d6321cb..5c4fe88 100644 --- a/src/TD8/pokemon/TestPokemon.java +++ b/src/TD8/pokemon/TestPokemon.java @@ -1,4 +1,4 @@ -package pokemon; +package TD8.pokemon; public class TestPokemon { @SuppressWarnings("unused") diff --git a/src/TD8/pokemon/Type.java b/src/TD8/pokemon/Type.java index 898acc6..66aaca8 100644 --- a/src/TD8/pokemon/Type.java +++ b/src/TD8/pokemon/Type.java @@ -1,4 +1,4 @@ -package pokemon; +package TD8.pokemon; enum Type { diff --git a/src/TD8/services/TestExercices.java b/src/TD8/service/TestExercices.java similarity index 97% rename from src/TD8/services/TestExercices.java rename to src/TD8/service/TestExercices.java index cc97d01..7eea804 100644 --- a/src/TD8/services/TestExercices.java +++ b/src/TD8/service/TestExercices.java @@ -1,4 +1,4 @@ -package services; +package TD8.service; import java.util.*; diff --git a/src/TD9/comparable/ComparetoDepNom.java b/src/TD9/comparable/ComparetoDepNom.java index 5ee182e..0fc3535 100644 --- a/src/TD9/comparable/ComparetoDepNom.java +++ b/src/TD9/comparable/ComparetoDepNom.java @@ -1,4 +1,4 @@ -package comparable; +package TD9.comparable; public class ComparetoDepNom /*implements comparator*/ { diff --git a/src/TD9/comparable/Enseignant.java b/src/TD9/comparable/Enseignant.java index 40ae1e2..eabf57a 100644 --- a/src/TD9/comparable/Enseignant.java +++ b/src/TD9/comparable/Enseignant.java @@ -1,4 +1,4 @@ -package comparable; +package TD9.comparable; public class Enseignant extends Personne{ diff --git a/src/TD9/comparable/Etudiant.java b/src/TD9/comparable/Etudiant.java index 3589782..e2fae9c 100644 --- a/src/TD9/comparable/Etudiant.java +++ b/src/TD9/comparable/Etudiant.java @@ -1,4 +1,4 @@ -package comparable; +package TD9.comparable; public class Etudiant extends Personne{ diff --git a/src/TD9/comparable/Personne.java b/src/TD9/comparable/Personne.java index 57e0600..8fafb35 100644 --- a/src/TD9/comparable/Personne.java +++ b/src/TD9/comparable/Personne.java @@ -1,4 +1,4 @@ -package comparable; +package TD9.comparable; public abstract class Personne implements Comparable{ diff --git a/src/TD9/comparable/main.java b/src/TD9/comparable/main.java index 36111e8..fb7ee6d 100644 --- a/src/TD9/comparable/main.java +++ b/src/TD9/comparable/main.java @@ -1,4 +1,4 @@ -package comparable; +package TD9.comparable; import java.util.*; diff --git a/src/TD9/pokemon/Joueur.java b/src/TD9/pokemon/Joueur.java index a7760b2..eeacd90 100644 --- a/src/TD9/pokemon/Joueur.java +++ b/src/TD9/pokemon/Joueur.java @@ -1,4 +1,4 @@ -package pokemon; +package TD9.pokemon; import java.util.*; import java.lang.Math; diff --git a/src/TD9/pokemon/Pokemon.java b/src/TD9/pokemon/Pokemon.java index 5d69fb1..2bb5176 100644 --- a/src/TD9/pokemon/Pokemon.java +++ b/src/TD9/pokemon/Pokemon.java @@ -1,4 +1,4 @@ -package pokemon; +package TD9.pokemon; public abstract class Pokemon implements Comparable { diff --git a/src/TD9/pokemon/PokemonEAU.java b/src/TD9/pokemon/PokemonEAU.java index e93cc91..b0ad1dd 100644 --- a/src/TD9/pokemon/PokemonEAU.java +++ b/src/TD9/pokemon/PokemonEAU.java @@ -1,4 +1,4 @@ -package pokemon; +package TD9.pokemon; public class PokemonEAU extends Pokemon{ private int nb_nageoires; diff --git a/src/TD9/pokemon/PokemonELECTRIK.java b/src/TD9/pokemon/PokemonELECTRIK.java index d9aaa15..1fb324e 100644 --- a/src/TD9/pokemon/PokemonELECTRIK.java +++ b/src/TD9/pokemon/PokemonELECTRIK.java @@ -1,4 +1,4 @@ -package pokemon; +package TD9.pokemon; public class PokemonELECTRIK extends Pokemon { private int nb_pattes; diff --git a/src/TD9/pokemon/PokemonFEU.java b/src/TD9/pokemon/PokemonFEU.java index 7b1cb6c..fa0cdf9 100644 --- a/src/TD9/pokemon/PokemonFEU.java +++ b/src/TD9/pokemon/PokemonFEU.java @@ -1,4 +1,4 @@ -package pokemon; +package TD9.pokemon; public class PokemonFEU extends Pokemon { private int nb_pattes; diff --git a/src/TD9/pokemon/PokemonPLANTE.java b/src/TD9/pokemon/PokemonPLANTE.java index d3285c1..8191429 100644 --- a/src/TD9/pokemon/PokemonPLANTE.java +++ b/src/TD9/pokemon/PokemonPLANTE.java @@ -1,4 +1,4 @@ -package pokemon; +package TD9.pokemon; public class PokemonPLANTE extends Pokemon{ diff --git a/src/TD9/pokemon/TestPokemon.java b/src/TD9/pokemon/TestPokemon.java index db77b4e..8d0ef2a 100644 --- a/src/TD9/pokemon/TestPokemon.java +++ b/src/TD9/pokemon/TestPokemon.java @@ -1,4 +1,4 @@ -package pokemon; +package TD9.pokemon; import java.util.*; diff --git a/src/TD9/pokemon/Type.java b/src/TD9/pokemon/Type.java index 898acc6..d24fc44 100644 --- a/src/TD9/pokemon/Type.java +++ b/src/TD9/pokemon/Type.java @@ -1,4 +1,4 @@ -package pokemon; +package TD9.pokemon; enum Type { diff --git a/src/TDPokemon/CompareAlpha.java b/src/TDPokemons/CompareAlpha.java similarity index 90% rename from src/TDPokemon/CompareAlpha.java rename to src/TDPokemons/CompareAlpha.java index eaed09f..c00d505 100644 --- a/src/TDPokemon/CompareAlpha.java +++ b/src/TDPokemons/CompareAlpha.java @@ -1,4 +1,4 @@ -package pokemons; +package TDPokemons; import java.util.Comparator; diff --git a/src/TDPokemon/CompareNiveau.java b/src/TDPokemons/CompareNiveau.java similarity index 91% rename from src/TDPokemon/CompareNiveau.java rename to src/TDPokemons/CompareNiveau.java index 35bec86..625b443 100644 --- a/src/TDPokemon/CompareNiveau.java +++ b/src/TDPokemons/CompareNiveau.java @@ -1,4 +1,4 @@ -package pokemons; +package TDPokemons; import java.util.Comparator; public class CompareNiveau implements Comparator { diff --git a/src/TDPokemon/IAttaque.java b/src/TDPokemons/IAttaque.java similarity index 74% rename from src/TDPokemon/IAttaque.java rename to src/TDPokemons/IAttaque.java index a57642a..3e17ca5 100644 --- a/src/TDPokemon/IAttaque.java +++ b/src/TDPokemons/IAttaque.java @@ -1,4 +1,4 @@ -package pokemons; +package TDPokemons; public interface IAttaque { void attaque(Pokemon p); diff --git a/src/TDPokemon/Joueur.java b/src/TDPokemons/Joueur.java similarity index 88% rename from src/TDPokemon/Joueur.java rename to src/TDPokemons/Joueur.java index b399d8a..939b350 100644 --- a/src/TDPokemon/Joueur.java +++ b/src/TDPokemons/Joueur.java @@ -1,4 +1,4 @@ -package pokemons; +package TDPokemons; import java.util.*; public class Joueur { @@ -32,15 +32,15 @@ public class Joueur { return nbPoints; } - //méthodes + //m�thodes public void attraperPokemon(Pokemon p) { this.collection.add(p); - System.out.println(this.nom + " à attraper " + p.getNom()); + System.out.println(this.nom + " � attraper " + p.getNom()); } public void transfererPokemon(Pokemon p) { this.collection.remove(p); - System.out.println(this.nom + " à transférer " + p.getNom()); + System.out.println(this.nom + " � transf�rer " + p.getNom()); } public double vitesseMoyenne() { @@ -65,7 +65,7 @@ public class Joueur { public String toString() { System.out.println("Joueur " + this.nom + ", niveau " + this.niveau + "\rNombre de points : " + this.nbPoints + - "\rPossède : "); + "\rPoss�de : "); for (int i=0; i pokemons= new ArrayList(); @@ -61,7 +61,7 @@ public class Partie { public void ajouterJoueur(Joueur j) { ArrayList joueurs= new ArrayList(); joueurs.add(j); - this.joueurs = joueurs; + this.setJoueurs(joueurs); System.out.println(joueurs.toString()); } @@ -73,4 +73,12 @@ public class Partie { } return ""; } + + public ArrayList getJoueurs() { + return joueurs; + } + + public void setJoueurs(ArrayList joueurs) { + this.joueurs = joueurs; + } } diff --git a/src/TDPokemon/PokeCentre.java b/src/TDPokemons/PokeCentre.java similarity index 85% rename from src/TDPokemon/PokeCentre.java rename to src/TDPokemons/PokeCentre.java index 524276c..f500f7a 100644 --- a/src/TDPokemon/PokeCentre.java +++ b/src/TDPokemons/PokeCentre.java @@ -1,4 +1,4 @@ -package pokemons; +package TDPokemons; import java.io.FileNotFoundException; import java.io.IOException; import java.util.*; @@ -24,7 +24,7 @@ public class PokeCentre { System.out.println(p.toString()); - //Choix des pokémons + //Choix des pok�mons //pour j1 for (int j=0; j<5; j++) { System.out.println(j1.getNom() + " entrez le nom d'un pokemon que vous souhaitez attraper"); @@ -34,13 +34,13 @@ public class PokeCentre { j1.attraperPokemon(p.getPokemons().get(i)); } } - System.out.println("Voulez-vous ajouter un autre Pokémon ? (oui/non)"); + System.out.println("Voulez-vous ajouter un autre Pok�mon ? (oui/non)"); String reponse = sc.next(); if (reponse.equals("non")) { j = 6; } } - System.out.println(j1.getNom() + " votre collection de Pokemon est complète !"); + System.out.println(j1.getNom() + " votre collection de Pokemon est compl�te !"); System.out.println(j1.toString()); System.out.println(); @@ -53,28 +53,28 @@ public class PokeCentre { j2.attraperPokemon(p.getPokemons().get(i)); } } - System.out.println("Voulez-vous ajouter un autre Pokémon ? (oui/non)"); + System.out.println("Voulez-vous ajouter un autre Pok�mon ? (oui/non)"); String reponse = sc.next(); if (reponse.equals("non")) { j = 6; } } - System.out.println(j2.getNom() + " votre collection de Pokemon est complète !"); + System.out.println(j2.getNom() + " votre collection de Pokemon est compl�te !"); System.out.println(j2.toString()); System.out.println(); //Combats !!! - System.out.println("Le combat peut commencé !!!"); + System.out.println("Le combat peut commenc� !!!"); Pokemon attaquant = null; Pokemon deffenseur = null; - System.out.println(j1.getNom() + " quel pokémon voulez-vous mettre en jeux ? "); + System.out.println(j1.getNom() + " quel pok�mon voulez-vous mettre en jeux ? "); String p1 = sc.next(); for (int i=0; i < j1.getCollection().size(); i++) { if (j1.getCollection().get(i).getNom().equals(p1)) { attaquant = j1.getCollection().get(i); } } - System.out.println(j2.getNom() + " quel pokémon voulez-vous mettre en jeux ?"); + System.out.println(j2.getNom() + " quel pok�mon voulez-vous mettre en jeux ?"); String p2 = sc.next(); for (int j=0; j < j2.getCollection().size(); j++) { if (j2.getCollection().get(j).getNom().equals(p2)) { @@ -97,7 +97,7 @@ public class PokeCentre { System.out.println(); j1.getCollection().remove(attaquant); if (j1.getCollection().size() > 0) { - System.out.println(j1.getNom() + " quel pokémon voulez-vous remettre en jeux ?"); + System.out.println(j1.getNom() + " quel pok�mon voulez-vous remettre en jeux ?"); String pokemon = sc.next(); for (int i=0; i < j1.getCollection().size(); i++) { if (j1.getCollection().get(i).getNom().equals(pokemon)) { @@ -112,7 +112,7 @@ public class PokeCentre { System.out.println(); j2.getCollection().remove(deffenseur); if (j2.getCollection().size() > 0) { - System.out.println(j2.getNom() + " quel pokémon voulez-vous remettre en jeux ?"); + System.out.println(j2.getNom() + " quel pok�mon voulez-vous remettre en jeux ?"); String pokemon = sc.next(); for (int i=0; i < j2.getCollection().size(); i++) { if (j2.getCollection().get(i).getNom().equals(pokemon)) { diff --git a/src/TDPokemon/Pokemon.java b/src/TDPokemons/Pokemon.java similarity index 96% rename from src/TDPokemon/Pokemon.java rename to src/TDPokemons/Pokemon.java index 49b2bfb..b9001a7 100644 --- a/src/TDPokemon/Pokemon.java +++ b/src/TDPokemons/Pokemon.java @@ -1,5 +1,4 @@ -package pokemons; -import java.util.*; +package TDPokemons; public abstract class Pokemon implements IAttaque, Comparable { //attributs @@ -39,7 +38,7 @@ public abstract class Pokemon implements IAttaque, Comparable { return type; } - //Méthodes + //M�thodes public String toString() { return "Pokemon "+nom +" de type "+ type.getDescription() diff --git a/src/TDPokemon/PokemonEAU.java b/src/TDPokemons/PokemonEAU.java similarity index 96% rename from src/TDPokemon/PokemonEAU.java rename to src/TDPokemons/PokemonEAU.java index b593b29..bd047d7 100644 --- a/src/TDPokemon/PokemonEAU.java +++ b/src/TDPokemons/PokemonEAU.java @@ -1,4 +1,4 @@ -package pokemons; +package TDPokemons; public class PokemonEAU extends Pokemon { //attribut @@ -16,7 +16,7 @@ public class PokemonEAU extends Pokemon { return nb_nageoires; } - //méthodes + //m�thodes @Override public double calculerVitesse() { return (super.getPoids()*nb_nageoires)/25.0; diff --git a/src/TDPokemon/PokemonELECTRIK.java b/src/TDPokemons/PokemonELECTRIK.java similarity index 96% rename from src/TDPokemon/PokemonELECTRIK.java rename to src/TDPokemons/PokemonELECTRIK.java index 1fd06d1..b9fd190 100644 --- a/src/TDPokemon/PokemonELECTRIK.java +++ b/src/TDPokemons/PokemonELECTRIK.java @@ -1,4 +1,4 @@ -package pokemons; +package TDPokemons; public class PokemonELECTRIK extends Pokemon { //attributs @@ -26,7 +26,7 @@ public class PokemonELECTRIK extends Pokemon { return intensite; } - //méthodes + //m�thodes @Override public double calculerVitesse() { return (nb_ailes+nb_pattes) * intensite * 0.05; diff --git a/src/TDPokemon/PokemonFEU.java b/src/TDPokemons/PokemonFEU.java similarity index 96% rename from src/TDPokemon/PokemonFEU.java rename to src/TDPokemons/PokemonFEU.java index f490c43..0823fb2 100644 --- a/src/TDPokemon/PokemonFEU.java +++ b/src/TDPokemons/PokemonFEU.java @@ -1,4 +1,4 @@ -package pokemons; +package TDPokemons; public class PokemonFEU extends Pokemon { //attributs @@ -17,7 +17,7 @@ public class PokemonFEU extends Pokemon { return nb_pattes; } - //méthodes + //m�thodes @Override public double calculerVitesse() { return this.getPoids()*nb_pattes* 0.03; diff --git a/src/TDPokemon/PokemonPLANTE.java b/src/TDPokemons/PokemonPLANTE.java similarity index 95% rename from src/TDPokemon/PokemonPLANTE.java rename to src/TDPokemons/PokemonPLANTE.java index 29d58db..c49459e 100644 --- a/src/TDPokemon/PokemonPLANTE.java +++ b/src/TDPokemons/PokemonPLANTE.java @@ -1,4 +1,4 @@ -package pokemons; +package TDPokemons; public class PokemonPLANTE extends Pokemon { @@ -8,7 +8,7 @@ public class PokemonPLANTE extends Pokemon { type = Type.PLANTE; } - //méthodes + //m�thodes @Override public double calculerVitesse() { return 10.0 / (this.getPoids()*this.getTaille()); diff --git a/src/TDPokemon/Type.java b/src/TDPokemons/Type.java similarity index 91% rename from src/TDPokemon/Type.java rename to src/TDPokemons/Type.java index 23b7e2a..6504ece 100644 --- a/src/TDPokemon/Type.java +++ b/src/TDPokemons/Type.java @@ -1,4 +1,4 @@ -package pokemons; +package TDPokemons; enum Type { EAU ("EAU"), diff --git a/src/TD2/test/TestTriplet.java b/tests/TD2/tripletEntier/TestTriplet.java similarity index 98% rename from src/TD2/test/TestTriplet.java rename to tests/TD2/tripletEntier/TestTriplet.java index 34a53e6..58c101c 100644 --- a/src/TD2/test/TestTriplet.java +++ b/tests/TD2/tripletEntier/TestTriplet.java @@ -1,5 +1,4 @@ -package test; -import tripletEntier.TripletEntier; +package TD2.tripletEntier; import static org.junit.jupiter.api.Assertions.*; diff --git a/tests/TD7/ip/IPTest.java b/tests/TD7/ip/IPTest.java index 716175b..995f02a 100644 --- a/tests/TD7/ip/IPTest.java +++ b/tests/TD7/ip/IPTest.java @@ -1,4 +1,5 @@ -package ip; +package TD7.ip; + //import static org.junit.Assert.assertEquals; //import static org.junit.jupiter.api.Assertions.*; diff --git a/tests/TD7/MonnaieTest.java b/tests/TD7/monney/MonnaieTest.java similarity index 88% rename from tests/TD7/MonnaieTest.java rename to tests/TD7/monney/MonnaieTest.java index 3de0a0e..b826afb 100644 --- a/tests/TD7/MonnaieTest.java +++ b/tests/TD7/monney/MonnaieTest.java @@ -1,11 +1,13 @@ -import monney.Monnaie; +package TD7.monney; import static org.junit.Assert.assertEquals; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + public class MonnaieTest { diff --git a/tests/TD8/testJoueurs.java b/tests/TD8/pokemon/testJoueurs.java similarity index 91% rename from tests/TD8/testJoueurs.java rename to tests/TD8/pokemon/testJoueurs.java index 2beeb2d..abd5337 100644 --- a/tests/TD8/testJoueurs.java +++ b/tests/TD8/pokemon/testJoueurs.java @@ -1,10 +1,6 @@ -import static org.junit.jupiter.api.Assertions.*; +package TD8.pokemon; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; - -import pokemon.*; - import org.junit.jupiter.api.Test; class testJoueurs { diff --git a/tests/TDPokemon/testPokemon.java b/tests/TDPokemons/testPokemon.java similarity index 86% rename from tests/TDPokemon/testPokemon.java rename to tests/TDPokemons/testPokemon.java index 2da5990..c3dd13b 100644 --- a/tests/TDPokemon/testPokemon.java +++ b/tests/TDPokemons/testPokemon.java @@ -1,12 +1,8 @@ -import static org.junit.jupiter.api.Assertions.*; +package TDPokemons; -import org.junit.jupiter.api.*; +import static org.junit.jupiter.api.Assertions.assertEquals; -import pokemons.Joueur; -import pokemons.PokemonEAU; -import pokemons.PokemonELECTRIK; -import pokemons.PokemonFEU; -import pokemons.PokemonPLANTE; +import org.junit.jupiter.api.Test; class testPokemon { //test Pokemons