From 2a08a106d14f0f26305bd7b74994a39088cbe587 Mon Sep 17 00:00:00 2001 From: "qkrdudrb4@gmail.com" Date: Tue, 2 Jul 2019 19:11:37 +0900 Subject: [PATCH 1/4] =?UTF-8?q?commit=20test(=EB=B0=95=EC=98=81=EA=B7=9C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 20_Task/M1/10_Variable/VariableForm.pas | 2 ++ 1 file changed, 2 insertions(+) diff --git a/20_Task/M1/10_Variable/VariableForm.pas b/20_Task/M1/10_Variable/VariableForm.pas index ce9d2fe..9774c93 100644 --- a/20_Task/M1/10_Variable/VariableForm.pas +++ b/20_Task/M1/10_Variable/VariableForm.pas @@ -2,6 +2,8 @@ interface +//깃허브 테스트 + uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls; From 31696012d1f31e6687ff57f4bc11e20070ea27a7 Mon Sep 17 00:00:00 2001 From: "qkrdudrb4@gmail.com" Date: Tue, 2 Jul 2019 20:47:41 +0900 Subject: [PATCH 2/4] hi --- 20_Task/M1/10_Variable/VariableForm.pas | 13 ++++++------ 20_Task/M1/20_Function/FunctionForm.pas | 27 ++++++++++++++++++++----- 20_Task/M1/30_Array/ArrayForm.pas | 24 ++++++++++++++++++++++ 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/20_Task/M1/10_Variable/VariableForm.pas b/20_Task/M1/10_Variable/VariableForm.pas index 9774c93..cb5c379 100644 --- a/20_Task/M1/10_Variable/VariableForm.pas +++ b/20_Task/M1/10_Variable/VariableForm.pas @@ -1,9 +1,7 @@ unit VariableForm; interface - -//깃허브 테스트 - + //깃허브 테스트 uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls; @@ -18,9 +16,9 @@ TForm1 = class(TForm) procedure Button1Click(Sender: TObject); private // 이 폼(유닛)에서만 사용하는 변수와 함수를 선언 - + var + FSum:integer; { TODO : (1) 정수 형 FSum 변수를 선언하세요. } - function AddNum(ANum: Integer): Integer; public // 다른 유닛에서 참조할 수 있는 변수와 함수 선언 @@ -38,7 +36,8 @@ function TForm1.AddNum(ANum: Integer): Integer; { TODO : (2) FSum 변수에 파라메터 ANum 값을 더합니다. FSum 변수 반환 } - Result := 0; +FSum:=FSum+ANum; +Result := FSum; end; procedure TForm1.Button1Click(Sender: TObject); @@ -47,8 +46,8 @@ procedure TForm1.Button1Click(Sender: TObject); begin Num := StrToInt(edtNum.Text); Sum := AddNum(Num); - edtSum.Text := IntToStr(Sum); end; end. + diff --git a/20_Task/M1/20_Function/FunctionForm.pas b/20_Task/M1/20_Function/FunctionForm.pas index f9f7a4d..83dcd5c 100644 --- a/20_Task/M1/20_Function/FunctionForm.pas +++ b/20_Task/M1/20_Function/FunctionForm.pas @@ -24,8 +24,8 @@ TForm2 = class(TForm) private // 이 폼(유닛)에서 사용하는 변수와 함수를 선언 function GetNameMsg(AName: string): string; - function GetAgeMsg(AName: string; AAge: Integer): string; + function GetUserInfoMsg(AName:string; AAge:Integer; AGender:Boolean):string; { TODO : (2-1) GetUserInfoMsg 함수를 선언 파라메터: 이름(문자), 나이(숫자), 남자여부(Boolean) @@ -47,26 +47,31 @@ function TForm2.GetNameMsg(AName: string): string; var Msg: string; begin - Msg := '안녕하세요. '; + Msg := '반갑습니다. '; Msg := Msg + AName + '님'; Result := Msg; end; + + function TForm2.GetAgeMsg(AName: string; AAge: Integer): string; var Msg, Adult: string; begin Msg := GetNameMsg(AName); // 인사말 표시는 재사용 Msg := Msg + #13#10; // 한줄 내려쓰기(일명 캐리지리턴) - { TODO : (1) Msg 변수에 '(AName)님은 (AAge)세로 (성인/미성년)입니다.' 메시지 추가 if 문을 이용해 20세 이상(>=)인 경우 성인으로 판단 문자열과 변수를 조합(더하기) 하세요. 정수는 문자로 변환(IntToStr)하세요. } - + if AAge>=20 then + Adult:='성인' + else + Adult:='미성년'; + Msg := Msg + AName+'님은 '+INTTOSTR(AAge)+'세로 ('+Adult+')입니다.'; Result := Msg; end; @@ -109,7 +114,7 @@ procedure TForm2.Button3Click(Sender: TObject); 반환하는 함수(GetUserInfoMsg)를 작성하세요 Msg := GetUserInfoMsg(Name, Age, IsMan); } - + Msg := GetUserInfoMsg(Name, Age, IsMan); ShowMessage(Msg); end; @@ -118,4 +123,16 @@ procedure TForm2.Button3Click(Sender: TObject); 인사말 + 성인여부 확인 + 성별확인 메시지를 반환하도록 작성하세요. 이미 구현된 GetNameMsg, GetAgeMsg 등을 재사용하세요. } +function TForm2.GetUserInfoMsg(AName: string; AAge: Integer; AGender: Boolean): string; + var + Msg, Gender:string; +begin + Msg:=GetAgeMsg(AName, AAge)+#13#10;; + if AGender then + Gender:='남자' + else + Gender:='여자'; + Msg:= Msg + AName+'님은 '+Gender+'입니다.'; + result:=Msg; +end; end. diff --git a/20_Task/M1/30_Array/ArrayForm.pas b/20_Task/M1/30_Array/ArrayForm.pas index c495570..015c044 100644 --- a/20_Task/M1/30_Array/ArrayForm.pas +++ b/20_Task/M1/30_Array/ArrayForm.pas @@ -51,6 +51,7 @@ procedure TForm3.Button1Click(Sender: TObject); I: Integer; Sum, MaxNum: Integer; begin + InitArray; // 배열의 합 Sum := GetArraySum; @@ -65,6 +66,10 @@ procedure TForm3.Button1Click(Sender: TObject); 배열의 크기 변경되도 동작하도록 반복의 끝은 Length(FNumArr) - 1로 설정 예> for I := 0 to Length(FNumArr) - 1 do } + + for I := 0 to Length(FNumArr)-1 do + Memo1.Lines.Add(' - '+inttostr(FNumArr[I])); + Memo1.Lines.Add('배열의 합은 ' + IntToStr(Sum) + ' 입니다.'); Memo1.Lines.Add('배열의 최대값은 ' + IntToStr(MaxNum) + ' 입니다.'); end; @@ -76,6 +81,10 @@ function TForm3.GetArraySum: Integer; Sum := 0; { TODO : (2) for 문을 이용해 배열의 값을 모두 더해 반환하도록 구현 } + + for I := 0 to Length(FNumArr)-1 do + Sum := Sum+FNumArr[i]; + Result := Sum; end; @@ -87,6 +96,11 @@ function TForm3.GetArrayMaxNum: Integer; { TODO : (3) for 문을 이용해 배열의 값 중 가장 큰 값을 반환하도록 구현 if 문을 이용해 숫자를 비교 } + for I := 0 to Length(FNumArr)-1 do + begin + if(MaxNum<=FNumArr[I]) then + MaxNum:= FNumArr[I]; + end; Result := MaxNum; end; @@ -103,9 +117,19 @@ procedure TForm3.Button2Click(Sender: TObject); 50 이상(>=)인 경우 CountOver 1 증가 50 미만(<)인 경우 CountUnder 1 증가 하도록 구현 } + for I := 0 to Length(FNumArr)-1 do + begin + if FNumArr[i]>=50 then + inc(CountOver) + else if FNumArr[i]<50 then + inc(CountUnder); + + end; + Memo1.Lines.Add('50 이상인 수의 갯수: ' + IntToStr(CountOver)); Memo1.Lines.Add('50 미만인 수의 갯수: ' + IntToStr(CountUnder)); end; end. + From 810e82ea2d83ca13a3ea1a38cbe37ade03e3becb Mon Sep 17 00:00:00 2001 From: "qkrdudrb4@gmail.com" Date: Sat, 13 Jul 2019 01:02:05 +0900 Subject: [PATCH 3/4] comi --- 20_Task/M2/readme.md | 0 30_Test/readme.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 20_Task/M2/readme.md delete mode 100644 30_Test/readme.md diff --git a/20_Task/M2/readme.md b/20_Task/M2/readme.md deleted file mode 100644 index e69de29..0000000 diff --git a/30_Test/readme.md b/30_Test/readme.md deleted file mode 100644 index e69de29..0000000 From 50cee7496b510561ec3ac3884a6a2c96ed86ccae Mon Sep 17 00:00:00 2001 From: "qkrdudrb4@gmail.com" Date: Wed, 24 Jul 2019 15:00:27 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=B4=88=EA=B8=B0=20=EC=97=85=EB=A1=9C?= =?UTF-8?q?=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 40_Project/YG/Source/gd.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 40_Project/YG/Source/gd.txt diff --git a/40_Project/YG/Source/gd.txt b/40_Project/YG/Source/gd.txt new file mode 100644 index 0000000..e69de29