Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e114169
Első commit címe
Sep 12, 2022
2366a2f
Saját commit
Agicka Sep 12, 2022
72b60ed
Második commit címe
Sep 12, 2022
2593c9c
Második commit
LMNikoletta Sep 12, 2022
92128c7
Merge pull request #3 from Albert-Jonas/nikolett_branch
Albert-Jonas Sep 12, 2022
0a487b2
Saját commit 2
Agicka Sep 12, 2022
aa62280
Merge branch 'main' into Agi_branch
Albert-Jonas Sep 12, 2022
55ffef9
calculate függvény hozzáadva
Sep 17, 2022
a2ad6a2
Függvényesítés első kör
Sep 12, 2022
03c0008
Első teszt - túl erősen van beágyazva a függvény
Sep 13, 2022
ec6e9a8
Első átalakítás - függvényt kompakttá tesszük, de még az eredeti modu…
Sep 13, 2022
732cfe3
Második átalakítás - saját modulba helyezzük a függvényt (de van benn…
Sep 13, 2022
9ba5ce5
Harmadik átalakítás - Hibák javítása (keressétek meg őket!)
Sep 13, 2022
fcf5cf8
Teszt átalakítás - Bukik a teszt, javítjuk
Sep 13, 2022
acc0824
Mocking hozzáadva
Sep 14, 2022
1971f64
Hozzáadva 8 másik teszt
Sep 14, 2022
62d47f9
Hibajavítás: döntetlen eset kezelve
Sep 14, 2022
a2229ed
Hibajavítás: duplikált hívás javítva
Sep 14, 2022
acb6cc3
Függvényként kiemelve a menü
Sep 14, 2022
fa71f11
Merge branch 'Albert_branche' of https://github.com/Albert-Jonas/5-Py…
Agicka Sep 19, 2022
16dae90
payment test
Agicka Sep 19, 2022
3ffc8d1
payment test elnevezve
Agicka Sep 19, 2022
4e3a6ae
anagram.py létrehozva
Agicka Sep 21, 2022
7a33ee0
anagram függvényesítés
Agicka Sep 21, 2022
7375993
anagram függvény javítva
Agicka Sep 22, 2022
ebff3cf
tesztesetek
Agicka Sep 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# 5-Python-Projects-For-Beginners
# 5-Python-Projects-For-Beginners

Első commit tartalma, és a második commit tartalma
7 changes: 7 additions & 0 deletions anagram.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
str1 = input("Enter the First String = ")
str2 = input("Enter the Second String = ")

if(sorted(str1) == sorted(str2)):
print("Two Strings are Anagrams.")
else:
print("Two Strings are not Anagrams.")
5 changes: 5 additions & 0 deletions anagram_fuggveny.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
def anagram_fuggveny():
if(sorted(str1) == sorted(str2)):
return "Two Strings are Anagrams."
else:
return "Two Strings are not Anagrams."
32 changes: 32 additions & 0 deletions game.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import rps_match
from rps_match import options


def game():
user_wins = 0
computer_wins = 0

while True:
user_input = input("Type Rock/Paper/Scissors or Q to quit: ").lower()
if user_input == "q":
break

if user_input not in options:
continue

result = rps_match.rps_match(user_input)

if result == "user_wins":
print("You won!")
user_wins += 1

elif result == "computer_wins":
print("You lost!")
computer_wins += 1
else:
print("Nobody wins!")

print("You won", user_wins, "times.")
print("The computer won", computer_wins, "times.")
print("Goodbye!")

6 changes: 6 additions & 0 deletions monthly_payment_calculator.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# calculate monthly payment
def calculate(p: int, months: int, rate: float):
return (rate/12) * (1/(1-(1+rate/12)**(-months)))*p



40 changes: 2 additions & 38 deletions rock_paper_scissors.py
Original file line number Diff line number Diff line change
@@ -1,39 +1,3 @@
import random
import game

user_wins = 0
computer_wins = 0

options = ["rock", "paper", "scissors"]

while True:
user_input = input("Type Rock/Paper/Scissors or Q to quit: ").lower()
if user_input == "q":
break

if user_input not in options:
continue

random_number = random.randint(0, 2)
# rock: 0, paper: 1, scissors: 2
computer_pick = options[random_number]
print("Computer picked", computer_pick + ".")

if user_input == "rock" and computer_pick == "scissors":
print("You won!")
user_wins += 1

elif user_input == "paper" and computer_pick == "rock":
print("You won!")
user_wins += 1

elif user_input == "scissors" and computer_pick == "paper":
print("You won!")
user_wins += 1

else:
print("You lost!")
computer_wins += 1

print("You won", user_wins, "times.")
print("The computer won", computer_wins, "times.")
print("Goodbye!")
game.game()
24 changes: 24 additions & 0 deletions rps_match.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import random

options = ["rock", "paper", "scissors"]


def rps_match(user_input_param):

random_number = random.randint(0, 2)
# rock: 0, paper: 1, scissors: 2
computer_pick = options[random_number]
print("Computer picked", computer_pick + ".")

if user_input_param == "rock" and computer_pick == "scissors":
return "user_wins"

elif user_input_param == "paper" and computer_pick == "rock":
return "user_wins"

elif user_input_param == "scissors" and computer_pick == "paper":
return "user_wins"
elif user_input_param == computer_pick:
return "nobody wins"
else:
return "computer_wins"
11 changes: 11 additions & 0 deletions test_anagram_fuggveny.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
def test_anagram_fuggveny():
str1 = "vér"
str2 = "rév"
assert "Two Strings are Anagrams."


def test_anagram_fuggveny():
str1 = "vér"
str2 = "alma"
assert "Two Strings are not Anagrams."

5 changes: 5 additions & 0 deletions test_monthly_payment_calculator.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from monthly_payment_calculator import calculate


def test_calculate_egymillio_negyev_tizszazalek():
assert round(calculate(1000000, 48, 0.1)) == 25363
50 changes: 50 additions & 0 deletions test_rock_paper_scissors.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import rps_match
import random

from unittest.mock import MagicMock


def test_rps_match_paper_rock():
random.randint = MagicMock(return_value=0)
assert rps_match.rps_match("paper") == "user_wins"


def test_rps_match_paper_paper():
random.randint = MagicMock(return_value=1)
assert rps_match.rps_match("paper") == "nobody wins"


def test_rps_match_paper_scissors():
random.randint = MagicMock(return_value=2)
assert rps_match.rps_match("paper") == "computer_wins"


def test_rps_match_scissors_rock():
random.randint = MagicMock(return_value=0)
assert rps_match.rps_match("scissors") == "computer_wins"


def test_rps_match_scissors_paper():
random.randint = MagicMock(return_value=1)
assert rps_match.rps_match("scissors") == "user_wins"


def test_rps_match_scissors_scissors():
random.randint = MagicMock(return_value=2)
assert rps_match.rps_match("scissors") == "nobody wins"


def test_rps_match_rock_rock():
random.randint = MagicMock(return_value=0)
assert rps_match.rps_match("rock") == "nobody wins"


def test_rps_match_rock_paper():
random.randint = MagicMock(return_value=1)
assert rps_match.rps_match("rock") == "computer_wins"


def test_rps_match_rock_scissors():
random.randint = MagicMock(return_value=2)
assert rps_match.rps_match("rock") == "user_wins"