diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..ce2251c80ad64a74a6876f84870e30a7e827f4ac --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +# Binaires +.class + + +#Fichiers +.jar +.tar.gz + +#Divers +.vscode +/doc/* + + + + diff --git a/README.md b/README.md deleted file mode 100644 index 6d7dc7617983e8e11652686beb87f0ba3c4dc5a5..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,93 +0,0 @@ -# dev-oo-v2 - - - -## Getting started - -To make it easy for you to get started with GitLab, here's a list of recommended next steps. - -Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! - -## Add your files - -- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: - -``` -cd existing_repo -git remote add origin https://gitlab.univ-lille.fr/malori.alvarez.etu/dev-oo-v2.git -git branch -M main -git push -uf origin main -``` - -## Integrate with your tools - -- [ ] [Set up project integrations](https://gitlab.univ-lille.fr/malori.alvarez.etu/dev-oo-v2/-/settings/integrations) - -## Collaborate with your team - -- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/) -- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) -- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) -- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/) -- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html) - -## Test and Deploy - -Use the built-in continuous integration in GitLab. - -- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html) -- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/) -- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html) -- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/) -- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html) - -*** - -# Editing this README - -When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template. - -## Suggestions for a good README - -Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information. - -## Name -Choose a self-explaining name for your project. - -## Description -Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors. - -## Badges -On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge. - -## Visuals -Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method. - -## Installation -Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection. - -## Usage -Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README. - -## Support -Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc. - -## Roadmap -If you have ideas for releases in the future, it is a good idea to list them in the README. - -## Contributing -State if you are open to contributions and what your requirements are for accepting them. - -For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self. - -You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser. - -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. - -## License -For open source projects, say how it is licensed. - -## Project status -If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers. diff --git a/bin/tp1/Book.class b/bin/tp1/Book.class new file mode 100644 index 0000000000000000000000000000000000000000..835f60a95e1b88f2903392a399f61d96774ebf63 Binary files /dev/null and b/bin/tp1/Book.class differ diff --git a/bin/tp1/Irregular.class b/bin/tp1/Irregular.class new file mode 100644 index 0000000000000000000000000000000000000000..41cf157dfbe388fc911cd3ad5df51d52f0b8f67b Binary files /dev/null and b/bin/tp1/Irregular.class differ diff --git a/bin/tp1/Parameter.class b/bin/tp1/Parameter.class new file mode 100644 index 0000000000000000000000000000000000000000..545dbd5921720084b26cae17251dd5de3a4bf835 Binary files /dev/null and b/bin/tp1/Parameter.class differ diff --git a/bin/tp1/UseBook.class b/bin/tp1/UseBook.class new file mode 100644 index 0000000000000000000000000000000000000000..87846e806704d9b03e59836bf24ba8fb1b1e330d Binary files /dev/null and b/bin/tp1/UseBook.class differ diff --git a/bin/tp1/UseIrregular.class b/bin/tp1/UseIrregular.class new file mode 100644 index 0000000000000000000000000000000000000000..568bad5b6dcf690f1120d590d7c27007dcdd5f98 Binary files /dev/null and b/bin/tp1/UseIrregular.class differ diff --git a/bin/tp2/Competitor.class b/bin/tp2/Competitor.class new file mode 100644 index 0000000000000000000000000000000000000000..874254688fb84d8744931e47006b29b8bc5c3a14 Binary files /dev/null and b/bin/tp2/Competitor.class differ diff --git a/bin/tp2/Dice.class b/bin/tp2/Dice.class new file mode 100644 index 0000000000000000000000000000000000000000..f58d367ccd78673d3f935debb8bbc10875314d84 Binary files /dev/null and b/bin/tp2/Dice.class differ diff --git a/bin/tp2/DicePlayer.class b/bin/tp2/DicePlayer.class new file mode 100644 index 0000000000000000000000000000000000000000..ca31e0620c601ee2bb5a89c54d8d631779d2c937 Binary files /dev/null and b/bin/tp2/DicePlayer.class differ diff --git a/bin/tp2/Main.class b/bin/tp2/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..00911c5bde634f0f3bac66a77b66703d19d08d84 Binary files /dev/null and b/bin/tp2/Main.class differ diff --git a/bin/tp2/NDicePlayerGame.class b/bin/tp2/NDicePlayerGame.class new file mode 100644 index 0000000000000000000000000000000000000000..44da49f51ff37e235a71f80b3fa4d7a69ca5e9fa Binary files /dev/null and b/bin/tp2/NDicePlayerGame.class differ diff --git a/bin/tp2/OneDicePlayerGame.class b/bin/tp2/OneDicePlayerGame.class new file mode 100644 index 0000000000000000000000000000000000000000..01928344100a4acf8bb1d2e624a40c00b9aa8d3d Binary files /dev/null and b/bin/tp2/OneDicePlayerGame.class differ diff --git a/bin/tp2/TwoDicePlayerGame.class b/bin/tp2/TwoDicePlayerGame.class new file mode 100644 index 0000000000000000000000000000000000000000..94f5c053bed0620742f3fdbbb2da16dace1cc506 Binary files /dev/null and b/bin/tp2/TwoDicePlayerGame.class differ diff --git a/bin/tp3/Card.class b/bin/tp3/Card.class new file mode 100644 index 0000000000000000000000000000000000000000..2539756a185e7defca62f374f6f0415db277d062 Binary files /dev/null and b/bin/tp3/Card.class differ diff --git a/bin/tp3/Color.class b/bin/tp3/Color.class new file mode 100644 index 0000000000000000000000000000000000000000..6e8f2d60a482d9ec7c7fe62126ad5e87dbeb139b Binary files /dev/null and b/bin/tp3/Color.class differ diff --git a/bin/tp3/Rank.class b/bin/tp3/Rank.class new file mode 100644 index 0000000000000000000000000000000000000000..b42710564eb0026b25343fd8e2bb61ad9738a0af Binary files /dev/null and b/bin/tp3/Rank.class differ diff --git a/bin/tp3/Task.class b/bin/tp3/Task.class new file mode 100644 index 0000000000000000000000000000000000000000..856d7869bfd36b34ffdc9ae9110d5f260afca7b6 Binary files /dev/null and b/bin/tp3/Task.class differ diff --git a/bin/tp3/TaskStatus.class b/bin/tp3/TaskStatus.class new file mode 100644 index 0000000000000000000000000000000000000000..4a8beba530ced299ca695299f585a61e57545d20 Binary files /dev/null and b/bin/tp3/TaskStatus.class differ diff --git a/bin/tp3/ToDoList.class b/bin/tp3/ToDoList.class new file mode 100644 index 0000000000000000000000000000000000000000..f9858798919563b47a1e9ec74df13d99f60b11ba Binary files /dev/null and b/bin/tp3/ToDoList.class differ diff --git a/bin/tp3/UseCard.class b/bin/tp3/UseCard.class new file mode 100644 index 0000000000000000000000000000000000000000..dc2c1e61129a64e6127c6ae10eb63a51cdd32136 Binary files /dev/null and b/bin/tp3/UseCard.class differ diff --git a/bin/tp3/UseLocalDate.class b/bin/tp3/UseLocalDate.class new file mode 100644 index 0000000000000000000000000000000000000000..fa04a1f0283adc2e4134748af353740ac90cd99e Binary files /dev/null and b/bin/tp3/UseLocalDate.class differ diff --git a/bin/tp4/PendingCaseQueue.class b/bin/tp4/PendingCaseQueue.class new file mode 100644 index 0000000000000000000000000000000000000000..9c838c9068ad504e27fde6cc5a68d6c6bd67cf31 Binary files /dev/null and b/bin/tp4/PendingCaseQueue.class differ diff --git a/bin/tp4/Person.class b/bin/tp4/Person.class new file mode 100644 index 0000000000000000000000000000000000000000..461afa9d72f8bdf7c505c328bb1904baaeca46eb Binary files /dev/null and b/bin/tp4/Person.class differ diff --git a/bin/tp4/Student.class b/bin/tp4/Student.class new file mode 100644 index 0000000000000000000000000000000000000000..46b066ba4a2837b4168f2911f8e9a159bc814536 Binary files /dev/null and b/bin/tp4/Student.class differ diff --git a/bin/tp4/StudentAbs.class b/bin/tp4/StudentAbs.class new file mode 100644 index 0000000000000000000000000000000000000000..99fe408ea4a3068a4e7c8cfbd1bf3be5a13988f1 Binary files /dev/null and b/bin/tp4/StudentAbs.class differ diff --git a/bin/tp4/UsePendingCaseQueue.class b/bin/tp4/UsePendingCaseQueue.class new file mode 100644 index 0000000000000000000000000000000000000000..f580ea00246d8c124f0473c4cb45744b36a97c39 Binary files /dev/null and b/bin/tp4/UsePendingCaseQueue.class differ diff --git a/bin/tp4/UsePerson.class b/bin/tp4/UsePerson.class new file mode 100644 index 0000000000000000000000000000000000000000..9e4b5bc426a9185d1cc57f540f704dfaef3e9d23 Binary files /dev/null and b/bin/tp4/UsePerson.class differ diff --git a/bin/tp4/UseStudent.class b/bin/tp4/UseStudent.class new file mode 100644 index 0000000000000000000000000000000000000000..33f0251fa0c470bd237dfa89f9140b77501fbb2f Binary files /dev/null and b/bin/tp4/UseStudent.class differ diff --git a/bin/tp4/UseYearGroup.class b/bin/tp4/UseYearGroup.class new file mode 100644 index 0000000000000000000000000000000000000000..50b83a0fa48d8aa72a9ba7f7389be6bc8271eec4 Binary files /dev/null and b/bin/tp4/UseYearGroup.class differ diff --git a/bin/tp4/YearGroup.class b/bin/tp4/YearGroup.class new file mode 100644 index 0000000000000000000000000000000000000000..865793e37019953c6ec41ab019691fea63c0f245 Binary files /dev/null and b/bin/tp4/YearGroup.class differ diff --git a/bin/tpqu02/WarriorCard.class b/bin/tpqu02/WarriorCard.class new file mode 100644 index 0000000000000000000000000000000000000000..a66ba1db34f05fc980c43c9507c76cbc0afee481 Binary files /dev/null and b/bin/tpqu02/WarriorCard.class differ diff --git a/src/tpqu02/WarriorCard.java b/src/tpqu02/WarriorCard.java index dbcd7185251f1ed4fa24335a59a4f426764b848f..2d32c55ad72513f258038f6657d8ea466a5fbe1f 100644 --- a/src/tpqu02/WarriorCard.java +++ b/src/tpqu02/WarriorCard.java @@ -4,18 +4,14 @@ public class WarriorCard { private int strength; private int agility; - //** - /* <b>Cartes de combats</b> - */ + /** <b>Cartes de combats</b>*/ public WarriorCard(String name,int strength,int agility){ this.name = name; this.strength = strength; this.agility = agility; } - //** - /* Vérifie l'égalité - */ + /** Vérifie l'égalités*/ public boolean equals(Object objet){ if(this==objet)return true; if(objet==null)return false; @@ -30,27 +26,20 @@ public class WarriorCard { return true; } //equals de string; pas de de lui-même - //** - /* Compare la <b>force</b> de deux guerriers - */ + /** Compare la <b>force</b> de deux guerriers */ public int compareStrength(WarriorCard other){ return this.strength-other.strength; } - //** - /* Compare l'<b>agilité</b> de deux guerriers - */ + /** Compare l'<b>agilité</b> de deux guerriers */ public int compareAgility(WarriorCard other){ return this.agility-other.agility; } - //** - /* Renvoie les <b>stats</b> et le nom du guerrier - */ + /** Renvoie les <b>stats</b> et le nom du guerrier*/ public String toString(){ return this.name+"[S="+this.strength+",A="+agility+"]."; } - - + //5 error 8 warning, je pète ma bière, ma lubullule } \ No newline at end of file