Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
park-jiyeong committed Aug 7, 2024
2 parents 716457f + 17417dd commit 97508e0
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 7 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<td> Python : 3&nbsp&nbsp&nbsp&nbspJava : 0&nbsp&nbsp&nbsp&nbspC : 0&nbsp&nbsp&nbsp&nbsp&nbspC++ : 0&nbsp&nbsp&nbsp&nbsp&nbspC# : 0</td>
</tr> <tr>
<td> 김성원 </td>
<td> 54 </td>
<td> 54 </td>
<td> 46 </td>
<td> -46000 </td>
<td> Python : 54&nbsp&nbsp&nbsp&nbspJava : 0&nbsp&nbsp&nbsp&nbspC : 0&nbsp&nbsp&nbsp&nbsp&nbspC++ : 0&nbsp&nbsp&nbsp&nbsp&nbspC# : 0</td>
<td> 55 </td>
<td> 55 </td>
<td> 45 </td>
<td> -45000 </td>
<td> Python : 55&nbsp&nbsp&nbsp&nbspJava : 0&nbsp&nbsp&nbsp&nbspC : 0&nbsp&nbsp&nbsp&nbsp&nbspC++ : 0&nbsp&nbsp&nbsp&nbsp&nbspC# : 0</td>
</tr> <tr>
<td> 김희수 </td>
<td> 14 </td>
Expand Down Expand Up @@ -71,7 +71,7 @@
<td> Python : 12&nbsp&nbsp&nbsp&nbspJava : 0&nbsp&nbsp&nbsp&nbspC : 0&nbsp&nbsp&nbsp&nbsp&nbspC++ : 0&nbsp&nbsp&nbsp&nbsp&nbspC# : 0</td>
</tr></table>
<br>
총 Push 횟수 : 142회
총 Push 횟수 : 143회

# 업로드 방법
### 1. 파일명
Expand Down
26 changes: 26 additions & 0 deletions SWKIM/51to60/55.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
def solution(arr1, arr2):
answer = []
pointer1 = 0
pointer2 = 0

# 두 배열을 순회하면서 오름차순 정렬 실행
while pointer1 < len(arr1) and pointer2 < len(arr2):
if arr1[pointer1] < arr2[pointer2]:
answer.append(arr1[pointer1])
pointer1 += 1
else:
answer.append(arr2[pointer2])
pointer2 += 1

# 아직 남은 값들을 추가
while pointer1 < len(arr1):
answer.append(arr1[pointer1])
pointer1 += 1

while pointer2 < len(arr2):
answer.append(arr2[pointer2])
pointer2 += 1

return answer

print(solution([1,2,3], [4,5,6]))
2 changes: 1 addition & 1 deletion total_push_cnt.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
142
143

0 comments on commit 97508e0

Please sign in to comment.