From cb180a0be489e97fbdf8dbcde576c7a54dd6f192 Mon Sep 17 00:00:00 2001 From: acp059 Date: Tue, 21 Apr 2020 17:04:34 +0200 Subject: [PATCH 1/5] Update scope --- scope.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/scope.md b/scope.md index 0f56d24..90e55b5 100644 --- a/scope.md +++ b/scope.md @@ -6,4 +6,54 @@ header: Programmieren 1 **Tutorium** footer: Henri Burau und Eva Meinen --> +#scope + += Sichtbarkeit = Gültigkeitsbereich + +Bereich in dem auf die Variable zugegriffen werden kann + +--- + +```java +int zahl = 3; +addierer(zahl); +System.out.printf(zahl); // Konsolenausgabe? +public void addierer(int zahl) { + zahl++; +} +``` +--- + +```java +public class TestFrame{ + int zahl; + + public void m(){ + zahl = 3; + } + public void m2(){ + System.out.printf(zahl); +}} +``` + +--- +```java +public class TestFrame { + public int num; + + public void m(int zahl){ + System.out.printf("1. %d %n", num); + num++; + int num = 4; + System.out.printf("2. %d %n", num); + num++; + System.out.printf("3. %d %n", num); + } + public void m2(){ + num = 3; + System.out.printf("4. %d %n", num); + m(3); + System.out.printf("5. %d %n", num); +}} +``` From 17c8bff5edd8b6e10c829d1765ac92231861a04a Mon Sep 17 00:00:00 2001 From: acp059 Date: Tue, 21 Apr 2020 17:26:00 +0200 Subject: [PATCH 2/5] Update Scope --- img/referenz1.PNG | Bin 0 -> 7248 bytes referenzvariablen.md | 25 +++++++++++++++++++++++++ scope.md | 5 +++-- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 img/referenz1.PNG diff --git a/img/referenz1.PNG b/img/referenz1.PNG new file mode 100644 index 0000000000000000000000000000000000000000..56102bc0d63dc217c46c7904a4cc5627808b69f3 GIT binary patch literal 7248 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 pE=@<5FU!D9ch2x1qph@gJm+4}4j5h + +# Referenzvariablen + +## Referenz- vs. Typvariablen + +![bg 60%](https://git.haw-hamburg.de/pm1-tutorium/slides/-/raw/master/img/referenz1.PNG) + +--- + +```java +public class Person{ + public int age; + public Person(int age) {age = age;} +} + +Person Henri = new Person(0); +Person Eva = new Person(0); +``` + +--- + +```java +boolean bool1 = Eva == Henri; +boolean bool2 = Eva.equals(Henri); +``` \ No newline at end of file diff --git a/scope.md b/scope.md index 90e55b5..064ff05 100644 --- a/scope.md +++ b/scope.md @@ -6,11 +6,11 @@ header: Programmieren 1 **Tutorium** footer: Henri Burau und Eva Meinen --> -#scope +# scope = Sichtbarkeit = Gültigkeitsbereich -Bereich in dem auf die Variable zugegriffen werden kann += Bereich in dem auf die Variable zugegriffen werden kann --- @@ -18,6 +18,7 @@ Bereich in dem auf die Variable zugegriffen werden kann int zahl = 3; addierer(zahl); System.out.printf(zahl); // Konsolenausgabe? + public void addierer(int zahl) { zahl++; } From bd24ef76632d5a94276e903da61868dfbf2b17b6 Mon Sep 17 00:00:00 2001 From: acp059 Date: Tue, 21 Apr 2020 17:33:55 +0200 Subject: [PATCH 3/5] Add image --- img/referenz2.svg | 3 +++ referenzvariablen.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 img/referenz2.svg diff --git a/img/referenz2.svg b/img/referenz2.svg new file mode 100644 index 0000000..4aff491 --- /dev/null +++ b/img/referenz2.svg @@ -0,0 +1,3 @@ + + +
   Henri
   Henri
   Eva
   Eva
Referenz
Referenz
Referenz
Referenz
:Henri
- age : 0
:Henri- age : 0
:Eva
- age : 0
:Eva- age : 0Viewer does not support full SVG 1.1 \ No newline at end of file diff --git a/referenzvariablen.md b/referenzvariablen.md index 11f019e..c64ee61 100644 --- a/referenzvariablen.md +++ b/referenzvariablen.md @@ -29,4 +29,6 @@ Person Eva = new Person(0); ```java boolean bool1 = Eva == Henri; boolean bool2 = Eva.equals(Henri); -``` \ No newline at end of file +``` + +![bg 50%](https://git.haw-hamburg.de/pm1-tutorium/slides/-/raw/master/img/referenz2.PNG) \ No newline at end of file From 95a94e6f36be8e1db5f08032844344a6ff007cf0 Mon Sep 17 00:00:00 2001 From: acp059 Date: Tue, 21 Apr 2020 17:35:55 +0200 Subject: [PATCH 4/5] Add Fixes --- arrays.md | 2 +- referenzvariablen.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arrays.md b/arrays.md index 3f8afcf..c1cf879 100644 --- a/arrays.md +++ b/arrays.md @@ -29,7 +29,7 @@ for(int i = 0; i < array1.length ; i++){ --- ## Mehrdimensionale Arrays -![bg right:61% 100%](https://git.haw-hamburg.de/pm1-tutorium/slides/-/raw/master/img/arrays2.PNG) +![bg 80%](https://git.haw-hamburg.de/pm1-tutorium/slides/-/raw/master/img/arrays2.PNG) * m[0][0][0] diff --git a/referenzvariablen.md b/referenzvariablen.md index c64ee61..493ec13 100644 --- a/referenzvariablen.md +++ b/referenzvariablen.md @@ -31,4 +31,4 @@ boolean bool1 = Eva == Henri; boolean bool2 = Eva.equals(Henri); ``` -![bg 50%](https://git.haw-hamburg.de/pm1-tutorium/slides/-/raw/master/img/referenz2.PNG) \ No newline at end of file +![bg 50%](https://git.haw-hamburg.de/pm1-tutorium/slides/-/raw/master/img/Referenz2.svg) \ No newline at end of file From 2332543f5c816b16930679582324bbc8776b8220 Mon Sep 17 00:00:00 2001 From: acp059 Date: Tue, 21 Apr 2020 17:38:29 +0200 Subject: [PATCH 5/5] Add Fixes --- arrays.md | 2 +- referenzvariablen.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arrays.md b/arrays.md index c1cf879..3f8afcf 100644 --- a/arrays.md +++ b/arrays.md @@ -29,7 +29,7 @@ for(int i = 0; i < array1.length ; i++){ --- ## Mehrdimensionale Arrays -![bg 80%](https://git.haw-hamburg.de/pm1-tutorium/slides/-/raw/master/img/arrays2.PNG) +![bg right:61% 100%](https://git.haw-hamburg.de/pm1-tutorium/slides/-/raw/master/img/arrays2.PNG) * m[0][0][0] diff --git a/referenzvariablen.md b/referenzvariablen.md index 493ec13..ff0f579 100644 --- a/referenzvariablen.md +++ b/referenzvariablen.md @@ -31,4 +31,4 @@ boolean bool1 = Eva == Henri; boolean bool2 = Eva.equals(Henri); ``` -![bg 50%](https://git.haw-hamburg.de/pm1-tutorium/slides/-/raw/master/img/Referenz2.svg) \ No newline at end of file +![bg 50%](https://git.haw-hamburg.de/pm1-tutorium/slides/-/raw/master/img/referenz2.svg) \ No newline at end of file