From 2ece235fcba1d7ee34c0a33818d490cc7ef9a795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janis=20Voigtl=C3=A4nder?= Date: Sun, 16 Jun 2024 20:12:34 +0200 Subject: [PATCH] various post-corrections --- Uebungen/Blatt02/Exercise02-Task1a-en.sbv | 2 +- Uebungen/Blatt02/Exercise02-Task1b-de.sbv | 4 +- Uebungen/Blatt02/Exercise02-Task1b-en.sbv | 2 +- Uebungen/Blatt02/Exercise02-Task2-en.sbv | 58 +++++++++---------- Uebungen/Blatt03/Exercise03-Task1a-de.sbv | 2 +- Uebungen/Blatt03/Exercise03-Task2-en.sbv | 20 +++---- Uebungen/Blatt03/Exercise03-Task3-en.sbv | 10 ++-- Uebungen/Blatt04/Exercise04-Task1-en.sbv | 38 ++++++------ Uebungen/Blatt04/Exercise04-Task2-en.sbv | 46 +++++++-------- Uebungen/Blatt05/Exercise05-Task1-en.sbv | 4 +- Uebungen/Blatt05/Exercise05-Task2a-en.sbv | 12 ++-- Uebungen/Blatt05/Exercise05-Task2b-en.sbv | 4 +- .../Blatt05/Exercise05-Task3-XModeler-en.sbv | 6 +- Uebungen/Blatt05/Exercise05-Task3-en.sbv | 2 +- Uebungen/Blatt06/Exercise06-Task2-de.sbv | 4 +- Uebungen/Blatt07/Exercise07-Task1-en.sbv | 4 +- Uebungen/Blatt07/Exercise07-Task2-en.sbv | 2 +- Uebungen/Blatt07/Exercise07-Task3-de.sbv | 8 +-- Uebungen/Blatt08/Exercise08-Task1-en.sbv | 6 +- Uebungen/Blatt08/Exercise08-Task3-en.sbv | 2 +- 20 files changed, 118 insertions(+), 118 deletions(-) diff --git a/Uebungen/Blatt02/Exercise02-Task1a-en.sbv b/Uebungen/Blatt02/Exercise02-Task1a-en.sbv index b5de702..5527e8e 100644 --- a/Uebungen/Blatt02/Exercise02-Task1a-en.sbv +++ b/Uebungen/Blatt02/Exercise02-Task1a-en.sbv @@ -309,7 +309,7 @@ the father, and we have his two daughters. 0:06:11.130,0:06:14.690 You might separate the daughters into two -notes here, +nodes here, 0:06:14.690,0:06:18.009 but that is not strictly necessary here. diff --git a/Uebungen/Blatt02/Exercise02-Task1b-de.sbv b/Uebungen/Blatt02/Exercise02-Task1b-de.sbv index a1db1e6..392c734 100644 --- a/Uebungen/Blatt02/Exercise02-Task1b-de.sbv +++ b/Uebungen/Blatt02/Exercise02-Task1b-de.sbv @@ -716,7 +716,7 @@ Für diesen Zustand haben wir jetzt auch alle Fälle abgedeckt, der Vater kann rüberfahren 0:21:01.399,0:21:03.509 -mit dem Boot und das Kind. +mit dem Boot und dem Kind. 0:21:03.509,0:21:10.710 Das waren die genannten Fälle, die hier jeweils @@ -811,7 +811,7 @@ Möglichkeit, der Vater setzt mit dem Boot über, andere Möglichkeit. 0:24:16.950,0:24:25.849 -Und schließlich kann auch ein Kind noch +Und schließlich kann auch ein Kind noch mit übersetzen. 0:24:25.849,0:24:37.470 diff --git a/Uebungen/Blatt02/Exercise02-Task1b-en.sbv b/Uebungen/Blatt02/Exercise02-Task1b-en.sbv index 3e6b54c..ec4a722 100644 --- a/Uebungen/Blatt02/Exercise02-Task1b-en.sbv +++ b/Uebungen/Blatt02/Exercise02-Task1b-en.sbv @@ -191,7 +191,7 @@ is always possible to go back to the previous state. 0:03:39.670,0:03:42.090 -There is no other possibilities from here. +There are no other possibilities from here. 0:03:42.090,0:03:46.769 So, we move on with the other possibilities diff --git a/Uebungen/Blatt02/Exercise02-Task2-en.sbv b/Uebungen/Blatt02/Exercise02-Task2-en.sbv index 06fdd1f..377ab81 100644 --- a/Uebungen/Blatt02/Exercise02-Task2-en.sbv +++ b/Uebungen/Blatt02/Exercise02-Task2-en.sbv @@ -65,7 +65,7 @@ Because the type does not match. 0:01:12.700,0:01:21.229 For B we have a “move” which expects something -of type picture and 2 more parameters, +of type Picture and 2 more parameters, 0:01:21.229,0:01:24.340 determining by how much it is moved. @@ -75,7 +75,7 @@ And here we have a print("no") composited with “circle” which returns 0:01:31.200,0:01:32.200 -something of type picture. +something of type Picture. 0:01:32.200,0:01:37.869 So, the first argument here is correct and @@ -102,7 +102,7 @@ And here we have the first argument which is long rotate here which returns something 0:02:08.770,0:02:11.060 -of type picture, which is correct for the +of type Picture, which is correct for the first argument. 0:02:11.060,0:02:15.890 @@ -130,7 +130,7 @@ inside of which we have a “move” which goes up to the closing parenthesis down here. 0:02:38.400,0:02:39.900 -This is all of the type pictures. +This is all of the type Picture. 0:02:39.900,0:02:42.620 So, this is correct for the first argument. @@ -144,7 +144,7 @@ So, this outer scale at least is correct. 0:02:50.069,0:02:56.670 So, moving further inside we have this “move” -which expects something of type picture, which +which expects something of type Picture, which 0:02:56.670,0:02:58.060 this “color” here provides. @@ -168,7 +168,7 @@ correct. 0:03:09.590,0:03:15.140 Because the first argument needs to be of -type picture for “color” operation which +type Picture for “color” operation which 0:03:15.140,0:03:16.970 this second argument provides. @@ -189,7 +189,7 @@ Moving on to E we have a “rectangle” with the correct type and number of arguments. 0:03:38.700,0:03:43.569 -Creating something of type picture for the +Creating something of type Picture for the composition operator here as the first argument 0:03:43.569,0:03:44.840 @@ -200,7 +200,7 @@ And we have “rotate” with a “rectangle” inside and by how much it is rotated creates 0:03:49.510,0:03:53.480 -something of type picture as well which is +something of type Picture as well which is correct for this composition operator second 0:03:53.480,0:03:54.480 @@ -211,7 +211,7 @@ So, this entire first part here is correct. 0:03:57.230,0:04:03.150 And for the second composition our operator -expects something of type picture at first +expects something of type Picture at first 0:04:03.150,0:04:06.269 which this first composition operator provides. @@ -234,7 +234,7 @@ And we can move on to F. F gives us a “rotate” with a “rectangle” being rotated. 0:04:25.270,0:04:28.870 -Here we have to watch out for the parenthesis, +Here we have to watch out for the parentheses, where they are. 0:04:28.870,0:04:33.300 @@ -245,10 +245,10 @@ entire “rotate” thing which is correct. For this composition operator. 0:04:35.230,0:04:38.090 -So, this is something of type picture. +So, this is something of type Picture. 0:04:38.090,0:04:42.530 -But there is something of type picture inside +But there is something of type Picture inside and the correct arguments here. 0:04:42.530,0:04:46.789 @@ -257,22 +257,22 @@ all the way till the end. 0:04:46.789,0:04:52.610 This is our second argument for this composition -operator also of type picture, “scale” +operator also of type Picture, “scale” 0:04:52.610,0:04:56.320 -provides the first argument of type picture +provides the first argument of type Picture which is correct for “move”. 0:04:56.320,0:05:02.050 -And 2 more arguments that are “float” -by how much it is moved by, so this outer +And 2 more arguments that are of type Float, +by how much it is moved, so this outer 0:05:02.050,0:05:07.440 “move” here is correct, we can step further inside, this “scale” expects something 0:05:07.440,0:05:11.060 -of type picture which “print” provides +of type Picture which “print” provides and by how much it is scaled. 0:05:11.060,0:05:13.520 @@ -320,13 +320,13 @@ up to the last comma back here. 0:05:57.830,0:06:01.790 So, this is the first argument providing something -of type picture. +of type Picture. 0:06:01.790,0:06:05.780 Because we have a “move” here. 0:06:05.780,0:06:11.550 -And then, we have a “float” back here +And then, we have a Float back here that 64 which provides by how much it is rotated 0:06:11.550,0:06:12.550 @@ -341,7 +341,7 @@ Now, we can step further inside, we can look at “move” which gets something of type 0:06:21.380,0:06:26.330 -picture provided by this composition operator +Picture provided by this composition operator and this “scale” here. 0:06:26.330,0:06:32.900 @@ -360,7 +360,7 @@ So, we have from “circle” up to this 6.2 closing parenthesis, being the first argument 0:06:48.349,0:06:49.889 -being of type picture. +being of type Picture. 0:06:49.889,0:06:54.050 And then 2 more parameters telling us how @@ -380,7 +380,7 @@ This “circle” is pretty easy. This is correct. 0:07:00.810,0:07:04.569 -This creates something of type picture for +This creates something of type Picture for the composition operator. 0:07:04.569,0:07:10.150 @@ -388,11 +388,11 @@ And the second argument here is “scale” up to the closing parenthesis which is something 0:07:10.150,0:07:12.600 -of type picture and has the correct arguments. +of type Picture and has the correct arguments. 0:07:12.600,0:07:17.599 -“Rotate” creates something of type picture -and 2 more floats here for determining how +“Rotate” creates something of type Picture +and 2 more Floats here for determining how 0:07:17.599,0:07:18.599 much it is scaled by. @@ -402,7 +402,7 @@ This is correct. 0:07:19.930,0:07:27.639 This “rotate” needs something of type -picture which the circle(5) provides +Picture which the circle(5) provides 0:07:27.639,0:07:31.060 and by how much it is rotated by so this is @@ -424,7 +424,7 @@ And finally, we have H with an outer “rotate” this “rotate” gets, as the first parameter, 0:07:56.360,0:08:02.940 -something of type picture which starts by +something of type Picture which starts by this “scale“ here, up to this last comma 0:08:02.940,0:08:03.940 @@ -432,7 +432,7 @@ back here. 0:08:03.940,0:08:07.819 This is the entire first argument, something -of type picture which is correct. +of type Picture which is correct. 0:08:07.819,0:08:10.600 And the second argument is correct as well. @@ -450,7 +450,7 @@ from here to back over here. 0:08:22.180,0:08:27.909 This is one long “scale”, inside of “scale” -there is something of type picture this “move”, +there is something of type Picture this “move”, 0:08:27.909,0:08:32.849 together with the composition operator and diff --git a/Uebungen/Blatt03/Exercise03-Task1a-de.sbv b/Uebungen/Blatt03/Exercise03-Task1a-de.sbv index 13c6e48..7dab0b3 100644 --- a/Uebungen/Blatt03/Exercise03-Task1a-de.sbv +++ b/Uebungen/Blatt03/Exercise03-Task1a-de.sbv @@ -131,7 +131,7 @@ alle Seiten dieselbe Länge. 0:02:38.340,0:02:42.969 Also, warum geben wir nicht einfach als Parameter -die Länge dieser Seite zum Beispiel an? +zum Beispiel die Länge dieser Seite an? 0:02:42.969,0:02:45.849 Das wäre auch vollkommen möglich. diff --git a/Uebungen/Blatt03/Exercise03-Task2-en.sbv b/Uebungen/Blatt03/Exercise03-Task2-en.sbv index 27fd23b..f571268 100644 --- a/Uebungen/Blatt03/Exercise03-Task2-en.sbv +++ b/Uebungen/Blatt03/Exercise03-Task2-en.sbv @@ -70,7 +70,7 @@ that are required for this class. 0:02:07.659,0:02:15.480 And these are given here, in this case -it’s just model. +it’s just a model. 0:02:15.480,0:02:23.140 We can ignore the methods that are given, @@ -118,7 +118,7 @@ we can choose the name ourselves. The bicycle is a rentable vehicle. 0:03:31.890,0:03:38.650 -That’s why we have to consider both attributes, +That’s why we have to consider both sets of attributes, those of RentableVehicle and those of Bicycle 0:03:38.650,0:03:41.040 @@ -189,10 +189,10 @@ just to start with- let’s just say it’s 0:05:43.310,0:05:49.259 an “escooter” that we want -to construct here. +to construct here, 0:05:49.259,0:06:04.470 -And this is a MotorizedVehicle and increase +and this is a MotorizedVehicle, and increase the size a bit. 0:06:04.470,0:06:06.530 @@ -217,7 +217,7 @@ a RentableVehicle. And we also require a license plate. 0:06:36.820,0:06:37.820 -Please note, that +Please note that 0:06:37.820,0:06:44.810 we do not require the attributes of bicycle @@ -244,7 +244,7 @@ here and instead I added the license plate 0:07:11.250,0:07:23.039 and for our license plate, we can choose any -value that is String, for instance we could +value that is a String, for instance we could 0:07:23.039,0:07:25.500 say our license plate @@ -254,7 +254,7 @@ could look something like this, it contains numbers and letters. 0:07:34.730,0:07:39.160 -Maybe this is also a valid license plate but yeah. +Maybe this is also a valid license plate, but yeah. 0:07:39.160,0:07:49.430 The important thing is that we fulfill the requirements @@ -373,11 +373,11 @@ So, as what was introduced in the lecture like this could say the value is like this or we actually state 0:11:17.560,0:11:20.720 -that this is a float by adding a dot here. +that this is a Float by adding a dot here. 0:11:20.720,0:11:32.339 And saying it’s 2500.0 so, that’s clearer, -that we are having floats here. +that we are having Floats here. 0:11:32.339,0:11:37.760 And as the last class, we are missing the @@ -407,7 +407,7 @@ Please note. 0:12:16.910,0:12:22.060 We have a weight for the transporter as well, -altough we do not inherit from the +although we do not inherit from the 0:12:22.060,0:12:23.970 MotorizedVehicle. diff --git a/Uebungen/Blatt03/Exercise03-Task3-en.sbv b/Uebungen/Blatt03/Exercise03-Task3-en.sbv index 4689ab6..184c7be 100644 --- a/Uebungen/Blatt03/Exercise03-Task3-en.sbv +++ b/Uebungen/Blatt03/Exercise03-Task3-en.sbv @@ -113,7 +113,7 @@ sentence. 0:03:16.170,0:03:21.150 Where it states that of course students and examiners -as persons. +are persons. 0:03:21.150,0:03:28.950 So, we have another class called “person”. @@ -138,7 +138,7 @@ persons. 0:04:02.819,0:04:09.819 But we also have info about the students which -was, that they are aged. +was that they are aged. 0:04:09.819,0:04:21.610 So, we also have the age for the students. @@ -152,7 +152,7 @@ This is important. 0:04:45.110,0:04:51.330 Because if they would have the age then we -would have to define the age within person. +would have to define the age within Person. 0:04:51.330,0:05:00.160 But the ages are only stored for the students, @@ -233,13 +233,13 @@ This implies that we should have an inheritance here. 0:07:09.440,0:07:13.460 -So, students should inherit from person. +So, students should inherit from Person. 0:07:13.460,0:07:14.919 But also, the examiners. 0:07:14.919,0:07:23.050 -So, we can draw an inheritance to person +So, we can draw an inheritance to Person from both of them. 0:07:23.050,0:07:32.800 diff --git a/Uebungen/Blatt04/Exercise04-Task1-en.sbv b/Uebungen/Blatt04/Exercise04-Task1-en.sbv index 0e77d14..1000bcc 100644 --- a/Uebungen/Blatt04/Exercise04-Task1-en.sbv +++ b/Uebungen/Blatt04/Exercise04-Task1-en.sbv @@ -31,7 +31,7 @@ are no such objects. That's why we could consider the other classes. Circle, Rectangle, and 0:01:21.509,0:01:30.350 -Path are all also pictures because they inherit +Path are all also Pictures because they inherit from the Picture class. And that is why they 0:01:30.350,0:01:38.100 @@ -72,18 +72,18 @@ the methods which we've got in this class 0:02:57.740,0:03:06.459 here. And this function always takes a Picture -and then more arguments and returns a picture. +and then more arguments and returns a Picture. 0:03:06.459,0:03:13.540 In our case, we've got the object-oriented view - of this now. And we've got a Picture +of this now. And we've got a Picture 0:03:13.540,0:03:24.360 already. On the specific Picture, we call such methods. So, we will call scale on a 0:03:24.360,0:03:33.070 -specific picture. And when we do that, we +specific Picture. And when we do that, we require further arguments. But we change the 0:03:33.070,0:03:39.700 @@ -104,10 +104,10 @@ type that we've got from here already, which 0:04:10.020,0:04:18.019 we require here as a type for our arguments. -So, this is a float. And the same goes for +So, this is a Float. And the same goes for 0:04:18.019,0:04:29.340 -our y argument, which is also a float. So, +our y argument, which is also a Float. So, this should all be within the box. I just 0:04:29.340,0:04:39.090 @@ -127,7 +127,7 @@ scale to the Picture at hand and change the Picture. We do not get a copy of any Picture 0:05:05.360,0:05:11.199 -or an additional picture. We change the original +or an additional Picture. We change the original Picture. And that's the difference to the 0:05:11.199,0:05:20.030 @@ -144,14 +144,14 @@ color of the Picture and therefore requires a 0:05:32.750,0:05:45.430 color. Let's call it C. And then we've got -rotate, which takes a picture and a float +rotate, which takes a Picture and a Float 0:05:45.430,0:05:54.170 as we rotate the Picture itself. This would -be just float for an angle. So, let's call +be just Float for an angle. So, let's call 0:05:54.170,0:06:04.680 -it angle. And you we require a float. Once +it angle. And we require a Float. Once again, we do not require a return type of 0:06:04.680,0:06:10.650 @@ -188,14 +188,14 @@ already, but there we have the example again. 0:07:20.940,0:07:31.860 And there is extent defined as returning a -float value for Picture. So, we could think +Float value for Picture. So, we could think 0:07:31.860,0:07:37.550 -about this like, we've got a picture already, +about this like, we've got a Picture already, and when we call extent on it, we just want 0:07:37.550,0:07:45.020 -to return the float value. So, this is different +to return the Float value. So, this is different from the other functions and also the other 0:07:45.020,0:07:51.090 @@ -204,7 +204,7 @@ So, that's why we have an opening and closing 0:07:51.090,0:07:57.740 bracket simply. And then the return type is -really important. Because this is a float +really important. Because this is a Float 0:07:57.740,0:08:04.430 in this case. And this was already mentioned @@ -223,8 +223,8 @@ which was defined within the introduction to the vector graphics example. Here it is. 0:08:39.030,0:08:48.339 -So, it combines two pictures and results in -a picture. If we want to realize this within +So, it combines two Pictures and results in +a Picture. If we want to realize this within 0:08:48.339,0:08:59.830 the domain of object orientation within this @@ -232,10 +232,10 @@ class diagram, we could extend our Picture 0:08:59.830,0:09:10.579 here and realize this as well. When we think -about it, we can realize it by adding a picture +about it, we can realize it by adding a Picture 0:09:10.579,0:09:21.810 -to another picture. So, this way, we could +to another Picture. So, this way, we could combine or change one Picture by adding another 0:09:21.810,0:09:31.050 @@ -244,7 +244,7 @@ it like this we have an ampersand function 0:09:31.050,0:09:41.190 that takes one argument, which is the other -Picture. So, let's call it p. And this of +Picture. So, let's call it p. And it is of 0:09:41.190,0:09:56.710 type Picture. And it will change the Picture diff --git a/Uebungen/Blatt04/Exercise04-Task2-en.sbv b/Uebungen/Blatt04/Exercise04-Task2-en.sbv index f7f68f8..e16b6bd 100644 --- a/Uebungen/Blatt04/Exercise04-Task2-en.sbv +++ b/Uebungen/Blatt04/Exercise04-Task2-en.sbv @@ -28,7 +28,7 @@ way, makes the most sense in this case. 0:00:43.740,0:00:49.980 Now looking at the other classes, we have Client -and server, which are pretty distinct use cases +and Server, which are pretty distinct use cases 0:00:49.980,0:00:55.740 for a Computer. So, we can use that immediately @@ -59,7 +59,7 @@ we can put a label on it that says use-cases, making this our use-cases generalization group. 0:01:40.800,0:01:45.900 -Next up, we have a laptop and tablet remaining. +Next up, we have Laptop and Tablet remaining. We need to think about whether they can be part 0:01:45.900,0:01:51.720 @@ -67,7 +67,7 @@ of this generalization group as well. Well, not really because Laptop and Tablet aren't use-cases 0:01:51.720,0:01:56.580 -of a computer. They are kinds of computers. +of a Computer. They are kinds of Computers. So, it would make more sense to create a new 0:01:56.580,0:02:03.360 @@ -88,19 +88,19 @@ Client and, in turn, that inherits from Computer 0:02:24.180,0:02:29.760 as well. So, Laptop and Tablet are still kinds of -computers, but they are primary kinds of clients. +Computers, but they are primarily kinds of Clients. 0:02:32.160,0:02:40.800 Of course, you can model them as direct -types of computers because, technically, +types of Computers because, technically, 0:02:40.800,0:02:48.180 -Laptop and Tablet could also be servers. So, it +Laptop and Tablet could also be Servers. So, it would make sense to have it directly inherit 0:02:48.180,0:02:56.340 from Computer and not directly related to -Client and server in any way. If we do that, +Client and Server in any way. If we do that, 0:02:57.720,0:03:06.780 we have our second generalization @@ -140,7 +140,7 @@ be in the generalization group but that 0:03:59.400,0:04:07.620 are not included in the model right now. So, for -use-cases here, for Client and server, normally, +use-cases here, for Client and Server, normally, 0:04:07.620,0:04:14.640 a computer is either a client to something or a @@ -156,7 +156,7 @@ anything. You are not a server for anything. You 0:04:27.300,0:04:32.280 just play offline games, for example. Then your -Computer is neither a client nor a server. So, +computer is neither a client nor a server. So, 0:04:32.280,0:04:38.880 this would be an incomplete generalization group. @@ -171,11 +171,11 @@ client for something. Because how did you get the game? These days you normally downloaded it. 0:04:49.860,0:04:55.800 -So, at some point, your Computer was +So, at some point, your computer was a client. So, let's say, in this case, this is a 0:04:55.800,0:04:59.880 -complete generalization group because your Computer +complete generalization group because your computer is going to be either a client or a server. 0:05:03.720,0:05:10.980 @@ -232,18 +232,18 @@ technically. So, this is definitely an overlapping 0:06:35.160,0:06:42.960 generalization group. Because you have these sort -of hybrid devices. And for Client and server, +of hybrid devices. And for Client and Server, 0:06:46.440,0:06:52.140 it comes down to how you argue your case here once again because technically, 0:06:52.140,0:06:58.800 -your Computer can run a server software and be a +your computer can run a server software and be a client to something else at the same time, making 0:06:58.800,0:07:09.000 -your Computer technically both. So, that would +your computer technically both. So, that would be a case where it's overlapping. Or we could go 0:07:09.000,0:07:12.840 @@ -304,10 +304,10 @@ make sense. Because your tablet is going to 0:08:50.520,0:08:55.740 have some kind of CPU with a number of cores. -Your Computer is going to have a CPU with some +Your computer is going to have a CPU with some 0:08:55.740,0:08:59.700 -number of cores. Your Client and server as +number of cores. Any client or server as well. So, just putting this attribute here 0:08:59.700,0:09:07.200 @@ -347,12 +347,12 @@ a client will have a screen normally. Server, not necessarily. But a client will definitely 0:09:57.060,0:10:02.940 -have a screen most of the time. Tablet will have +have a screen most of the time. A tablet will have a screen. So, putting a screen attribute in Laptop 0:10:02.940,0:10:08.160 doesn't really make sense. What else can we put -for a Laptop that wouldn't work for any of these +for Laptop that wouldn't work for any of these 0:10:08.160,0:10:18.120 other ones? For example, you could say the number @@ -387,8 +387,8 @@ For the third attribute, we could come up with something for a tablet, for example, 0:11:04.320,0:11:10.920 -and say touchscreen sensitivity. And -that would be a float value. Determining +say touchscreen sensitivity. And +that would be a Float value. Determining 0:11:12.000,0:11:19.380 how accurate your pointer is going to be @@ -399,7 +399,7 @@ from where you actually touch. So, let's say sensitivity or something or touch sensitivity. 0:11:32.520,0:11:39.960 -And we put that as a float value because we want +And we put that as a Float value because we want to have that to be really exact. So, this would be 0:11:39.960,0:11:46.680 @@ -408,14 +408,14 @@ of keys in Laptop, Tablet has touch sensitivity. 0:11:48.960,0:11:54.420 And for this one, also going over it for a -moment. The Laptop normally wouldn't have touch +moment. A laptop normally wouldn't have touch 0:11:54.420,0:12:00.540 sensitivity. The Computer doesn't necessarily have touch functionality at all. So, it doesn't 0:12:00.540,0:12:06.840 -make sense being here. And for the Client, it's +make sense being here. And for a client, it's the same case. A client could have a touchscreen, 0:12:06.840,0:12:11.700 diff --git a/Uebungen/Blatt05/Exercise05-Task1-en.sbv b/Uebungen/Blatt05/Exercise05-Task1-en.sbv index 11dda1b..67d8875 100644 --- a/Uebungen/Blatt05/Exercise05-Task1-en.sbv +++ b/Uebungen/Blatt05/Exercise05-Task1-en.sbv @@ -15,8 +15,8 @@ them. So, we do not have to look at attributes and methods here. We can assume that these 0:00:44.400,0:00:53.820 -classes are well-tiered. For instance, this -A class here shall be treated as a valid class, +classes are well-formed. For instance, this A +class here shall be treated as a valid class, 0:00:53.820,0:01:01.440 and we just have to look at the connections diff --git a/Uebungen/Blatt05/Exercise05-Task2a-en.sbv b/Uebungen/Blatt05/Exercise05-Task2a-en.sbv index 029883f..5c99cac 100644 --- a/Uebungen/Blatt05/Exercise05-Task2a-en.sbv +++ b/Uebungen/Blatt05/Exercise05-Task2a-en.sbv @@ -56,10 +56,10 @@ We can't really do anything with that yet because 0:01:24.240,0:01:29.340 we don't have other classes. But we're told, -each room, the room is also underlined so this +each room (the room is also underlined, so this 0:01:29.340,0:01:36.660 -is going to be a class as well, has a name and +is going to be a class as well) has a name and each seat has a number. So, we have room and seat. 0:01:36.660,0:01:42.780 @@ -140,7 +140,7 @@ So, we are going to make that a composition, 0:03:35.640,0:03:44.220 connecting theater to room. And the composition -arrow we get from the drawio here already +arrow we get from the DrawIo here already 0:03:44.220,0:03:49.920 has some multiplicity here, at least one, @@ -241,7 +241,7 @@ joined in the middle here and then just one arrow 0:06:57.960,0:07:04.740 to the event. But this works as well. We can get -rid of these extent labels. Drawio adds these +rid of these extent labels. DrawIo adds these 0:07:04.740,0:07:09.300 automatically. But the arrow already means that @@ -480,7 +480,7 @@ Speaking of that specific room, the text says a room where it happens. So, not multiple rooms. So, 0:14:18.120,0:14:24.480 -this is implicated the multiplicity of one +this is implied by the multiplicity of one here. You can just leave that as the one here. 0:14:24.480,0:14:31.980 @@ -624,7 +624,7 @@ is going to be one to however many. 0:18:23.100,0:18:30.240 And we can remove this multiplicity down here that -drawio added. +DrawIo added. 0:18:32.400,0:18:39.660 Because there's no indication that one seat diff --git a/Uebungen/Blatt05/Exercise05-Task2b-en.sbv b/Uebungen/Blatt05/Exercise05-Task2b-en.sbv index 6186aa2..2bb4d04 100644 --- a/Uebungen/Blatt05/Exercise05-Task2b-en.sbv +++ b/Uebungen/Blatt05/Exercise05-Task2b-en.sbv @@ -146,7 +146,7 @@ So, we're just going to pull a single line here 0:04:54.900,0:05:09.360 for which we can copy this. Didn't copy all of it. -There we go. Drawio is a little fiddly sometimes. So, +There we go. DrawIo is a little fiddly sometimes. So, 0:05:09.360,0:05:16.560 this is the date of this film. So, this is our @@ -261,7 +261,7 @@ very fiddly. 0:09:14.400,0:09:22.860 I'm not sure what's doing that. But this sort -of works. There we go. If you're using drawio, +of works. There we go. If you're using DrawIo, 0:09:22.860,0:09:26.880 you need to be careful to hit these little diff --git a/Uebungen/Blatt05/Exercise05-Task3-XModeler-en.sbv b/Uebungen/Blatt05/Exercise05-Task3-XModeler-en.sbv index a3e9da2..21b5abd 100644 --- a/Uebungen/Blatt05/Exercise05-Task3-XModeler-en.sbv +++ b/Uebungen/Blatt05/Exercise05-Task3-XModeler-en.sbv @@ -223,7 +223,7 @@ fine. Now let's do class diagram D, the fourth class diagram, we have A, C, D. Right 0:12:58.680,0:13:16.990 -so, this one fits to everything's fine. Let's +so, this one fits, so everything's fine. Let's do the last one. We have A, D, D, we have 0:13:16.990,0:13:52.960 @@ -291,8 +291,8 @@ have. It does not accept. You see it? So, it wants us to create another D. 0:21:19.750,0:21:29.300 -And then it's says B requires a link to an instance at level 0 -so we choose the d1 this new d. And now it stops complaining. +And then it says B requires a link to an instance at level 0, +so we choose the d1, this new d. And now it stops complaining. 0:21:29.300,0:21:36.270 But now it's already different from what we diff --git a/Uebungen/Blatt05/Exercise05-Task3-en.sbv b/Uebungen/Blatt05/Exercise05-Task3-en.sbv index 4d3878c..e2209c4 100644 --- a/Uebungen/Blatt05/Exercise05-Task3-en.sbv +++ b/Uebungen/Blatt05/Exercise05-Task3-en.sbv @@ -244,7 +244,7 @@ why it can have a connection to D. That is fine. 0:09:55.020,0:09:59.820 And there are no further connections, -but there is also no further connections +but there are also no further connections 0:09:59.820,0:10:05.580 required in our class diagram. So, this diff --git a/Uebungen/Blatt06/Exercise06-Task2-de.sbv b/Uebungen/Blatt06/Exercise06-Task2-de.sbv index c87e776..fed383e 100644 --- a/Uebungen/Blatt06/Exercise06-Task2-de.sbv +++ b/Uebungen/Blatt06/Exercise06-Task2-de.sbv @@ -1,6 +1,6 @@ 0:00:00.610,0:00:06.520 In dieser Aufgabe geht es darum, dass wir -eine mathematische Notation eines Petrinetzes +die mathematische Notation eines Petrinetzes 0:00:06.520,0:00:12.070 haben und die in ein Petrinetz übersetzen @@ -15,7 +15,7 @@ Ich zeige das einmal in den Vorlesungsfolien. 0:00:23.390,0:00:36.870 Hier steht ein Petrinetz ist ein Tupel bestehend -aus N = (S,T,*(),()*,,m0), wobei S eine endliche, +aus N = (S,T,*(),()*,m0), wobei S eine endliche, 0:00:36.870,0:00:41.910 nichtleere Menge von Stellen und T eine endliche, diff --git a/Uebungen/Blatt07/Exercise07-Task1-en.sbv b/Uebungen/Blatt07/Exercise07-Task1-en.sbv index c68f78b..54f8f93 100644 --- a/Uebungen/Blatt07/Exercise07-Task1-en.sbv +++ b/Uebungen/Blatt07/Exercise07-Task1-en.sbv @@ -117,7 +117,7 @@ and also the same for customer in space one. 0:03:41.290,0:03:52.560 So, that means when the customer for this -transaction, when the customer is waiting +place, when the customer is waiting, 0:03:52.560,0:03:59.950 it has to become either again waiting or busy, @@ -231,7 +231,7 @@ waiting, and the place two of the conveyor belt is not empty. 0:07:38.470,0:07:45.319 -So this means this transaction should probably +So this means this place should probably represent this state, so the cashier is 0:07:45.319,0:07:53.820 diff --git a/Uebungen/Blatt07/Exercise07-Task2-en.sbv b/Uebungen/Blatt07/Exercise07-Task2-en.sbv index 578815f..fc3a041 100644 --- a/Uebungen/Blatt07/Exercise07-Task2-en.sbv +++ b/Uebungen/Blatt07/Exercise07-Task2-en.sbv @@ -306,7 +306,7 @@ So I can put this token back in here and we add a token in S4. 0:10:59.200,0:11:19.230 -And this, i'll call it T3, and we could now either +And this, I'll call it T3, and we could now either fire T1 or T2 because both just require a 0:11:19.230,0:11:27.180 diff --git a/Uebungen/Blatt07/Exercise07-Task3-de.sbv b/Uebungen/Blatt07/Exercise07-Task3-de.sbv index 0f9f75c..37302b7 100644 --- a/Uebungen/Blatt07/Exercise07-Task3-de.sbv +++ b/Uebungen/Blatt07/Exercise07-Task3-de.sbv @@ -68,7 +68,7 @@ Dann schreiben wir das auf. 0:01:49.890,0:02:00.590 Wir haben jetzt also eine Marke in s1, eine -Marke in s2, und null Marken in s3 und s4 +Marke in s2, und null Marken in s3 und s4. 0:02:00.590,0:02:06.300 t1 kann nochmal feuern, warum nicht? @@ -99,7 +99,7 @@ Was ich vorhin vergessen habe, wir müssen natürlich an die Übergänge immer dranschreiben, 0:02:41.450,0:02:42.700 -welche Transaktion geschaltet hat. +welche Transition geschaltet hat. 0:02:42.700,0:02:52.459 Also hier in dem Fall hat t1 geschaltet und @@ -157,13 +157,13 @@ an Stelle s3 und null an Stelle s4. 0:03:58.459,0:04:04.640 Wir zeichnen wieder einen Pfeil dahin und -schreiben dran, welche Transaktion, nämlich +schreiben dran, welche Transition, nämlich 0:04:04.640,0:04:07.380 t2, geschaltet hat. 0:04:07.380,0:04:11.540 -Jetzt können wir gucken, welche Transaktion +Jetzt können wir gucken, welche Transition von s3 aus schalten kann. 0:04:11.540,0:04:12.870 diff --git a/Uebungen/Blatt08/Exercise08-Task1-en.sbv b/Uebungen/Blatt08/Exercise08-Task1-en.sbv index 57debdb..97bb2dd 100644 --- a/Uebungen/Blatt08/Exercise08-Task1-en.sbv +++ b/Uebungen/Blatt08/Exercise08-Task1-en.sbv @@ -50,7 +50,7 @@ this table here. 0:01:30.560,0:01:40.880 But I will talk about the reasons why -I fill in the table they way I'll do. +I fill in the table the way I'll do. 0:01:40.880,0:01:53.320 Let's have a look at the first Petri net and @@ -169,7 +169,7 @@ although it is not strongly live. 0:04:45.320,0:05:03.660 And for this property, we check if -the reachibility graph contains all the transitions. +the reachability graph contains all the transitions. 0:05:03.660,0:05:08.240 We have t1 in the reachability graph. @@ -337,7 +337,7 @@ node, which contains more tokens than two. 0:09:47.260,0:09:56.589 And because when we check all these numbers -here, we have only 0's, 1's and 2's +here, we have only 0s, 1s and 2s 0:09:56.589,0:10:08.510 for all these nodes in the reachability graph diff --git a/Uebungen/Blatt08/Exercise08-Task3-en.sbv b/Uebungen/Blatt08/Exercise08-Task3-en.sbv index 0e4cb1f..9bf0531 100644 --- a/Uebungen/Blatt08/Exercise08-Task3-en.sbv +++ b/Uebungen/Blatt08/Exercise08-Task3-en.sbv @@ -18,7 +18,7 @@ for Petri net N1. 0:00:44.950,0:01:03.700 This is for Petri net N1, and then we have -the causalties on the right-hand side. +the causalities on the right-hand side. 0:01:03.700,0:01:14.299 Left are the transitions and right are the