Merge remote-tracking branch 'origin/na/bhtalgorithmus' into na/bhtalgorithmus

HelloWorld.py

-print("HelloWorld")

Instructions.txt

-
-source ~/.cache/pypoetry/virtualenvs/comp-sci-project-SyZqYvRp-py3.11/bin/activate
-
---to create a branch:
-git checkout -b <name of the branch>
-
---put the branch online
-git push --set-upstream origin na/bhtalgorithmus
-
---Create the file
-git add <File name>
-git commit -m "comment"
-git push
-
---please update your local branch by following these commands:
-
-
-git checkout main
-git pull --rebase
-git checkout -
-git rebase main
-
---man kann auch brauchen:
-
---solve the conflict
-git add <file name of conflict>
-git rebase --continue
-git push --force
-
---Please try out these commands asap!
-
---rebase between different branches:
---Go to the branch you want to transfer to
-git rebase <branch to rebase from>
-git push
-
-----------
-git pull origin Nicola
-
------------
-In case:
-
-nicolaalnicola@LAPTOP-A0GOD546:/mnt/c/Users/nicol/comp-sci-project$ git push
-To git.imp.fu-berlin.de:nguyed99/comp-sci-project.git
- ! [rejected]        na/bhtalgorithmus -> na/bhtalgorithmus (non-fast-forward)
-error: failed to push some refs to 'git.imp.fu-berlin.de:nguyed99/comp-sci-project.git'
-hint: Updates were rejected because the tip of your current branch is behind
-hint: its remote counterpart. Integrate the remote changes (e.g.
-hint: 'git pull ...') before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-
-Do the following to keep your local branch up to date before pushing:
-
-git fetch origin
-git checkout <branchname>
-git merge origin/<branchname>
---press Exceute than exit 
-git pull origion <branchname>
-
---now you can push again

Instructions2.txt

-Comments for @Natii and all:
-1. Please don't change poetry.lock by hand. You should only modify pyproject.toml to add dependencies and their versions. Please check out the use of the 2 commands (https://python-poetry.org/docs/cli/):
-	poetry update 
-	poetry install
-2. Please don't add, commit, and push files in _pycache_
-3. Please stick to the repo structure. Implementing integrators is not a complete task. It's a job and the integrators will be called in tasks/src/direct_simulation.py
-Therefore, tasks/src/integrators/integrators.py -> jobs/src/integrators.py
-4. Simulation is the time evolution of the n-body system, result of which are the time-dependent positions (r) and momenta (p) of the bodies. Visualization is the plotting of the corresponding trajectories either in phase space (r,p) or real space.
-5. We run simulations in these 2 scripts tasks/src/direct_simulation.py and tasks/src/ff_simulation.py. Files in jobs/src should only contain functions and dataclasses.
-6. Test scripts should look like tests. Please see jobs/tests/test_a_job.py for reference. 
-7. (!Very important!) Please open an MR so I can comment on your commits directly there. Also it's good for tracking, feedback, updates, etc.
-8. Please use docstrings for Python functions, description of module

hallo.txt

-kkkkk

helloword

-print("hello world")