Skip to content

Commit 591b5ed

Browse files
Merge pull request #51 from KoyanagiHitoshi/dev
Dev
2 parents 3f20a43 + a057152 commit 591b5ed

File tree

170 files changed

+533
-511
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+533
-511
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions

code/answer_2-2-12.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
a, b = map(int, input().split())
2-
c, d = map(int, input().split())
3-
print(a*d-b*c)
1+
a, b = map(int, input().split("x"))
2+
print(a*b)

code/answer_2-2-13.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
a, b, c, d = map(int, input().split())
2-
print((a+b)*(c-d))
3-
print("Takahashi")
1+
a, b = map(int, input().split("x"))
2+
print(a*b)

code/answer_2-2-14.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
R = int(input())
2-
print(2*3.14*R)
1+
a, b = map(int, input().split())
2+
c, d = map(int, input().split())
3+
print(a*d-b*c)

code/answer_2-2-15.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
A, B, C = map(int, input().split())
2-
print(2*(A*B+B*C+C*A))
1+
a, b, c, d = map(int, input().split())
2+
print((a+b)*(c-d))
3+
print("Takahashi")

code/answer_2-2-16.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
N = int(input())
2-
A = int(input())
3-
print(N*N-A)
1+
R = int(input())
2+
print(2*3.14*R)

code/answer_2-2-17.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
n, m = map(int, input().split())
2-
print((n-1)*(m-1))
1+
A, B, C = map(int, input().split())
2+
print(2*(A*B+B*C+C*A))

code/answer_2-2-18.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
A, B = map(int, input().split())
2-
print(A*B-(A+B-1))
1+
N = int(input())
2+
A = int(input())
3+
print(N*N-A)

code/answer_2-2-19.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
H, W = map(int, input().split())
2-
h, w = map(int, input().split())
3-
print((H-h)*(W-w))
1+
n, m = map(int, input().split())
2+
print((n-1)*(m-1))

code/answer_2-2-20.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
R = int(input())
2-
G = int(input())
3-
print(2*G-R)
1+
A, B = map(int, input().split())
2+
print(A*B-(A+B-1))

0 commit comments

Comments
 (0)