From 15404a69b7e79c91ea8db21343a20889250c04d8 Mon Sep 17 00:00:00 2001 From: "tp0145@naver.com" Date: Tue, 2 Jul 2019 14:36:35 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=BB=A4=EB=B0=8B=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8(=EC=97=84=EC=9C=A4=EC=98=A4)?= 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 02891051a1e016549c09437e0cf4d6c47a210768 Mon Sep 17 00:00:00 2001 From: "tp0145@naver.com" Date: Tue, 2 Jul 2019 21:09:32 +0900 Subject: [PATCH 2/5] =?UTF-8?q?M1=20:=20=EB=8D=B8=ED=8C=8C=EC=9D=B4=20?= =?UTF-8?q?=EB=AC=B8=EB=B2=95(=EC=97=84=EC=9C=A4=EC=98=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 20_Task/M1/10_Variable/VariableForm.pas | 8 ++++--- 20_Task/M1/20_Function/FunctionForm.pas | 30 ++++++++++++++++++++++--- 20_Task/M1/30_Array/ArrayForm.pas | 26 ++++++++++++++++++++- 3 files changed, 57 insertions(+), 7 deletions(-) diff --git a/20_Task/M1/10_Variable/VariableForm.pas b/20_Task/M1/10_Variable/VariableForm.pas index 9774c93..8fcfe93 100644 --- a/20_Task/M1/10_Variable/VariableForm.pas +++ b/20_Task/M1/10_Variable/VariableForm.pas @@ -2,8 +2,6 @@ interface -//깃허브 테스트 - uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls; @@ -20,6 +18,7 @@ TForm1 = class(TForm) // 이 폼(유닛)에서만 사용하는 변수와 함수를 선언 { TODO : (1) 정수 형 FSum 변수를 선언하세요. } + FSum : integer; function AddNum(ANum: Integer): Integer; public @@ -34,11 +33,14 @@ implementation {$R *.dfm} function TForm1.AddNum(ANum: Integer): Integer; +var +Num, Sum : integer; begin { TODO : (2) FSum 변수에 파라메터 ANum 값을 더합니다. FSum 변수 반환 } - Result := 0; + FSum := FSum + ANum; + Result := FSum; end; procedure TForm1.Button1Click(Sender: TObject); diff --git a/20_Task/M1/20_Function/FunctionForm.pas b/20_Task/M1/20_Function/FunctionForm.pas index f9f7a4d..879856f 100644 --- a/20_Task/M1/20_Function/FunctionForm.pas +++ b/20_Task/M1/20_Function/FunctionForm.pas @@ -26,6 +26,8 @@ TForm2 = class(TForm) function GetNameMsg(AName: string): string; function GetAgeMsg(AName: string; AAge: Integer): string; + + function GetUserInfoMsg(AName: string; AAge: Integer; A : boolean): string; { TODO : (2-1) GetUserInfoMsg 함수를 선언 파라메터: 이름(문자), 나이(숫자), 남자여부(Boolean) @@ -53,12 +55,32 @@ function TForm2.GetNameMsg(AName: string): string; Result := Msg; end; +function TForm2.GetUserInfoMsg(AName: string; AAge: Integer; + A: boolean): string; + var Aman,Msg : string; +begin + AMan := '남자'; + if A = false then + AMan := '여자'; + Msg := GetAgeMsg(AName, AAge ); + + Msg := Msg + #13#10 + AName + '님은 ' + AMan + '입니다.' ; + + result := Msg; +end; + function TForm2.GetAgeMsg(AName: string; AAge: Integer): string; var - Msg, Adult: string; -begin + Msg: string; + Adult : string; + begin + Adult := '미성년'; + if AAge >= 20 then + Adult := '성인'; + + Msg := GetNameMsg(AName); // 인사말 표시는 재사용 - Msg := Msg + #13#10; // 한줄 내려쓰기(일명 캐리지리턴) + Msg := Msg + #13#10 + AName + '님은 ' + inttostr(AAge) + '세로 ' + Adult + '입니다.' ; // 한줄 내려쓰기(일명 캐리지리턴) { TODO : (1) Msg 변수에 '(AName)님은 (AAge)세로 (성인/미성년)입니다.' 메시지 추가 @@ -70,6 +92,7 @@ function TForm2.GetAgeMsg(AName: string; AAge: Integer): string; Result := Msg; end; + procedure TForm2.Button1Click(Sender: TObject); var Name, Msg: string; @@ -104,6 +127,7 @@ procedure TForm2.Button3Click(Sender: TObject); Age := StrToInt(edtAge.Text); IsMan := rdoMan.Checked; + MSg := GetUserInfoMsg(Name, Age, IsMan); { TODO : (2) 인사말 + 성인여부 확인 + 성별확인 메시지를 반환하는 함수(GetUserInfoMsg)를 작성하세요 diff --git a/20_Task/M1/30_Array/ArrayForm.pas b/20_Task/M1/30_Array/ArrayForm.pas index c495570..1d0aabc 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 + // 배열의 합 Sum := GetArraySum; @@ -65,6 +66,11 @@ procedure TForm3.Button1Click(Sender: TObject); 배열의 크기 변경되도 동작하도록 반복의 끝은 Length(FNumArr) - 1로 설정 예> for I := 0 to Length(FNumArr) - 1 do } + for I := 0 to Length(FNumArr) - 1 do + begin + Memo1.Lines.Add('-'+ inttostr(Fnumarr[i])); + end; + Memo1.Lines.Add('배열의 합은 ' + IntToStr(Sum) + ' 입니다.'); Memo1.Lines.Add('배열의 최대값은 ' + IntToStr(MaxNum) + ' 입니다.'); end; @@ -75,7 +81,10 @@ function TForm3.GetArraySum: Integer; begin Sum := 0; { TODO : (2) for 문을 이용해 배열의 값을 모두 더해 반환하도록 구현 } - + for I := 0 to Length(FNumArr) - 1 do + begin + Sum := sum+fnumarr[i]; + end; Result := Sum; end; @@ -87,6 +96,12 @@ function TForm3.GetArrayMaxNum: Integer; { TODO : (3) for 문을 이용해 배열의 값 중 가장 큰 값을 반환하도록 구현 if 문을 이용해 숫자를 비교 } + for I := 0 to Length(FNumArr) - 1 do + begin + if FNumArr[i] >= maxnum then + maxnum := fnumarr[i]; + end; + Result := MaxNum; end; @@ -103,6 +118,15 @@ 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 + begin + countover := countover+1; + end + + else countunder := countunder+1; + end; Memo1.Lines.Add('50 이상인 수의 갯수: ' + IntToStr(CountOver)); Memo1.Lines.Add('50 미만인 수의 갯수: ' + IntToStr(CountUnder)); From 2973091fc86a75a0b86f128d2b3063dceeea18fa Mon Sep 17 00:00:00 2001 From: "tp0145@naver.com" Date: Tue, 2 Jul 2019 21:16:36 +0900 Subject: [PATCH 3/5] =?UTF-8?q?M1=20:=20=EB=8D=B8=ED=8C=8C=EC=9D=B4=20?= =?UTF-8?q?=EB=AC=B8=EB=B2=95(=EC=97=84=EC=9C=A4=EC=98=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 20_Task/M1/10_Variable/VariableForm.pas | 1 + 1 file changed, 1 insertion(+) diff --git a/20_Task/M1/10_Variable/VariableForm.pas b/20_Task/M1/10_Variable/VariableForm.pas index 8fcfe93..757f96c 100644 --- a/20_Task/M1/10_Variable/VariableForm.pas +++ b/20_Task/M1/10_Variable/VariableForm.pas @@ -39,6 +39,7 @@ function TForm1.AddNum(ANum: Integer): Integer; { TODO : (2) FSum 변수에 파라메터 ANum 값을 더합니다. FSum 변수 반환 } + Result := 0; FSum := FSum + ANum; Result := FSum; end; From a9910ddaaff60b01d51e0751c4b377ac7bbf3c7d Mon Sep 17 00:00:00 2001 From: "tp0145@naver.com" Date: Wed, 3 Jul 2019 12:40:42 +0900 Subject: [PATCH 4/5] =?UTF-8?q?M1=20:=20=EB=8D=B8=ED=8C=8C=EC=9D=B4=20?= =?UTF-8?q?=EB=AC=B8=EB=B2=95(=EC=97=84=EC=9C=A4=EC=98=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 20_Task/M1/10_Variable/VariableForm.pas | 1 + 20_Task/M1/20_Function/FunctionForm.pas | 3 ++- 20_Task/M1/30_Array/ArrayForm.pas | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/20_Task/M1/10_Variable/VariableForm.pas b/20_Task/M1/10_Variable/VariableForm.pas index 757f96c..1448616 100644 --- a/20_Task/M1/10_Variable/VariableForm.pas +++ b/20_Task/M1/10_Variable/VariableForm.pas @@ -39,6 +39,7 @@ function TForm1.AddNum(ANum: Integer): Integer; { TODO : (2) FSum 변수에 파라메터 ANum 값을 더합니다. FSum 변수 반환 } + Result := 0; FSum := FSum + ANum; Result := FSum; diff --git a/20_Task/M1/20_Function/FunctionForm.pas b/20_Task/M1/20_Function/FunctionForm.pas index 879856f..d4bd2ec 100644 --- a/20_Task/M1/20_Function/FunctionForm.pas +++ b/20_Task/M1/20_Function/FunctionForm.pas @@ -57,7 +57,8 @@ function TForm2.GetNameMsg(AName: string): string; function TForm2.GetUserInfoMsg(AName: string; AAge: Integer; A: boolean): string; - var Aman,Msg : string; +var + Aman,Msg : string; begin AMan := '남자'; if A = false then diff --git a/20_Task/M1/30_Array/ArrayForm.pas b/20_Task/M1/30_Array/ArrayForm.pas index 1d0aabc..ebffbb2 100644 --- a/20_Task/M1/30_Array/ArrayForm.pas +++ b/20_Task/M1/30_Array/ArrayForm.pas @@ -118,6 +118,7 @@ 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 From 6771a353be84be393eccfa31a635f04e1ff2ec99 Mon Sep 17 00:00:00 2001 From: "tp0145@naver.com" Date: Wed, 3 Jul 2019 12:46:34 +0900 Subject: [PATCH 5/5] =?UTF-8?q?M1=20:=20=EB=8D=B8=ED=8C=8C=EC=9D=B4=20?= =?UTF-8?q?=EB=AC=B8=EB=B2=95=20=EA=B3=BC=EC=A0=9C(=EC=97=84=EC=9C=A4?= =?UTF-8?q?=EC=98=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 20_Task/M1/10_Variable/VariableForm.pas | 6 ++++-- 20_Task/M1/20_Function/FunctionForm.pas | 4 ++++ 20_Task/M1/30_Array/ArrayForm.pas | 7 +++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/20_Task/M1/10_Variable/VariableForm.pas b/20_Task/M1/10_Variable/VariableForm.pas index 1448616..c5ba42d 100644 --- a/20_Task/M1/10_Variable/VariableForm.pas +++ b/20_Task/M1/10_Variable/VariableForm.pas @@ -14,6 +14,7 @@ TForm1 = class(TForm) edtSum: TEdit; Label2: TLabel; procedure Button1Click(Sender: TObject); + private // 이 폼(유닛)에서만 사용하는 변수와 함수를 선언 @@ -35,19 +36,20 @@ implementation function TForm1.AddNum(ANum: Integer): Integer; var Num, Sum : integer; + begin { TODO : (2) FSum 변수에 파라메터 ANum 값을 더합니다. FSum 변수 반환 } - Result := 0; FSum := FSum + ANum; Result := FSum; end; procedure TForm1.Button1Click(Sender: TObject); var - Num, Sum: Integer; // 이곳에 선언된 변수는 이 함수에서만 사용합니다. + Num, Sum: Integer; + // 이곳에 선언된 변수는 이 함수에서만 사용합니다. begin Num := StrToInt(edtNum.Text); Sum := AddNum(Num); diff --git a/20_Task/M1/20_Function/FunctionForm.pas b/20_Task/M1/20_Function/FunctionForm.pas index d4bd2ec..d6b2531 100644 --- a/20_Task/M1/20_Function/FunctionForm.pas +++ b/20_Task/M1/20_Function/FunctionForm.pas @@ -28,6 +28,7 @@ TForm2 = class(TForm) function GetAgeMsg(AName: string; AAge: Integer): string; function GetUserInfoMsg(AName: string; AAge: Integer; A : boolean): string; + { TODO : (2-1) GetUserInfoMsg 함수를 선언 파라메터: 이름(문자), 나이(숫자), 남자여부(Boolean) @@ -59,6 +60,7 @@ function TForm2.GetUserInfoMsg(AName: string; AAge: Integer; A: boolean): string; var Aman,Msg : string; + begin AMan := '남자'; if A = false then @@ -97,6 +99,7 @@ function TForm2.GetAgeMsg(AName: string; AAge: Integer): string; procedure TForm2.Button1Click(Sender: TObject); var Name, Msg: string; + begin Name := edtName.Text; @@ -109,6 +112,7 @@ procedure TForm2.Button2Click(Sender: TObject); var Name, Msg: string; Age: Integer; + begin Name := edtName.Text; Age := StrToInt(edtAge.Text); diff --git a/20_Task/M1/30_Array/ArrayForm.pas b/20_Task/M1/30_Array/ArrayForm.pas index ebffbb2..3a32139 100644 --- a/20_Task/M1/30_Array/ArrayForm.pas +++ b/20_Task/M1/30_Array/ArrayForm.pas @@ -20,6 +20,7 @@ TForm3 = class(TForm) procedure InitArray; function GetArraySum: Integer; function GetArrayMaxNum: Integer; + public { Public declarations } end; @@ -32,6 +33,7 @@ implementation {$R *.dfm} procedure TForm3.FormCreate(Sender: TObject); + begin InitArray; end; @@ -40,6 +42,7 @@ procedure TForm3.FormCreate(Sender: TObject); procedure TForm3.InitArray; var I: Integer; + begin // 배열(FNumArr)의 길이만큼 반복하며 임의의 값(1~100)을 설정 for I := 0 to Length(FNumArr) - 1 do @@ -50,6 +53,7 @@ procedure TForm3.Button1Click(Sender: TObject); var I: Integer; Sum, MaxNum: Integer; + begin // 배열의 합 @@ -78,6 +82,7 @@ procedure TForm3.Button1Click(Sender: TObject); function TForm3.GetArraySum: Integer; var I, Sum: Integer; + begin Sum := 0; { TODO : (2) for 문을 이용해 배열의 값을 모두 더해 반환하도록 구현 } @@ -91,6 +96,7 @@ function TForm3.GetArraySum: Integer; function TForm3.GetArrayMaxNum: Integer; var I, MaxNum: Integer; + begin MaxNum := 0; { TODO : @@ -110,6 +116,7 @@ procedure TForm3.Button2Click(Sender: TObject); var I, CountOver, CountUnder: Integer; + begin CountOver := 0; CountUnder := 0;