Made some adjustments for this weeks exercises

27555e5e · Jöran Frey · b0a838b6 · 27555e5e
Commit 27555e5e authored 5 months ago by Jöran Frey
--- a/unit-2/Exersices/Week_3/30_Week_3 - Control structures.ipynb
+++ b/unit-2/Exersices/Week_3/30_Week_3 - Control structures.ipynb
@@ -24,26 +24,20 @@
   "metadata": {},
   "source": [
    "### 1.1 print Function\n",
-    "Given a variable a with the value 20, write a line of code to print:\n",
+    "Given is a variable \"a\" with the value 20, write a line of code that prints:\n",
    "``The value of a is 20`` <br>\n",
    "by combining the text and the variable in the print() function.\n"
   ]
  },
  {
   "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
   "id": "1a2fb499",
   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "The value of a is 20\n"
-     ]
-    }
-   ],
-   "source": []
+   "outputs": [],
+   "source": [
+    "a = 20"
+   ]
  },
  {
   "cell_type": "markdown",
@@ -58,21 +52,10 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": null,
   "id": "c918530d",
   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "15\n",
-      "5\n",
-      "50\n",
-      "2.0\n"
-     ]
-    }
-   ],
+   "outputs": [],
   "source": [
    "a = 10\n",
    "b = 5"
@@ -90,18 +73,10 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
   "id": "a16c6da4",
   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Hello test\n"
-     ]
-    }
-   ],
+   "outputs": [],
   "source": []
  },
  {
@@ -219,28 +194,20 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 22,
+   "execution_count": 3,
   "id": "73e37cc2",
   "metadata": {},
   "outputs": [],
   "source": [
-    "number = 4"
+    "number = 3"
   ]
  },
  {
   "cell_type": "code",
-   "execution_count": 64,
+   "execution_count": null,
   "id": "273fc6d1",
   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Die Zahl ist gerade.\n"
-     ]
-    }
-   ],
+   "outputs": [],
   "source": []
  },
  {
@@ -254,18 +221,10 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 22,
+   "execution_count": 10,
   "id": "811d885d",
   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "The number is positive\n"
-     ]
-    }
-   ],
+   "outputs": [],
   "source": []
  },
  {
@@ -292,18 +251,10 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": null,
   "id": "d54646c1",
   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "can view content\n"
-     ]
-    }
-   ],
+   "outputs": [],
   "source": []
  },
  {

 %% Cell type:markdown id:becc5c8b tags:

 # Exercise 2: Applying previous knowledge to Python



 %% Cell type:markdown id:d4b93396 tags:

 ## 1 The basics

 %% Cell type:markdown id:424d40de tags:

 ### 1.1 print Function
-Given a variable a with the value 20, write a line of code to print:
+Given is a variable "a" with the value 20, write a line of code that prints:
 ``The value of a is 20`` <br>
 by combining the text and the variable in the print() function.

 %% Cell type:code id:1a2fb499 tags:

 ``` python
+a = 20
 ```

-%% Output
-
-    The value of a is 20
-
 %% Cell type:markdown id:ec7048ce tags:

 ### 1.2 print Function and basic operations

 Write a Python program to add, subtract, multiply, and divide two variables a and b.
 Print the result of all Operations

 %% Cell type:code id:c918530d tags:

 ``` python
 a = 10
 b = 5
 ```

-%% Output
-
-    15
-    5
-    50
-    2.0
-
 %% Cell type:markdown id:fbe9dd35 tags:

 ### 1.3 Input from User
 Write a program that asks the user for their name and greets them. <br>
 > Use the Function ``input("text for user")`` to give a user input to a variable

 %% Cell type:code id:a16c6da4 tags:

 ``` python
 ```

-%% Output
-
-    Hello test
-
 %% Cell type:markdown id:4cd048de tags:


 ### 1.2 type casting
 Create variables with basic data types with the following names, which can store the corresponding value:

 | Name | Value         |
 | ---- | ------------- |
 | a    | 30492         |
 | b    | 'X'           |
 | c    | 87.432        |
 | d    | "Hello World" |
 | e    | True          |

 %% Cell type:code id:cb7b2da4 tags:

 ``` python
 ```

 %% Cell type:markdown id:72ea9ad1 tags:

 Run the following script to test if your solution is correct

 %% Cell type:code id:28745df1 tags:

 ``` python
 def check_types(a, b, c, d, e):
    if isinstance(a, int) and isinstance(b, str) and isinstance(c, float) and isinstance(d, str) and isinstance(e, bool):
        return "Your result is correct"
    else:
        return "There is an error"

 result = check_types(a, b, c, d, e)
 print(result)
 ```

 %% Output

    Your result is correct

 %% Cell type:markdown id:cb931520 tags:

 ### 1.3 comparing variables

 Write a program that compares whether a is greater than b and prints ``True`` or ``False``

 %% Cell type:code id:d0f961d8 tags:

 ``` python
 a = 10
 b = 5
 ```

 %% Output

    True

 %% Cell type:markdown id:be4e3737 tags:

 ### 2 Control structures

 %% Cell type:markdown id:a0122eba tags:

 ### 2.1 if and else statements

 %% Cell type:markdown id:e9e1fa12 tags:

 #### 2.1.1 even number
 Write a program that checks a number and outputs whether it is even or odd.

 %% Cell type:code id:73e37cc2 tags:

 ``` python
-number = 4
+number = 3
 ```

 %% Cell type:code id:273fc6d1 tags:

 ``` python
 ```

-%% Output
-
-    Die Zahl ist gerade.
-
 %% Cell type:markdown id:e2fc0c01 tags:

 ## 2.1.2 Simple Conditional
 Write a program that checks a number from a user input to see whether it is positive, negative or zero.

 %% Cell type:code id:811d885d tags:

 ``` python
 ```

-%% Output
-
-    The number is positive
-
 %% Cell type:markdown id:eb66c676 tags:

 #### 2.1.3 User roles
 Write a program that checks the role of a user and issues the corresponding authorizations.<br><br>
 **Admin** has all authorizations <br>
 **Editor** can edit content <br>
 **User** can view content <br>

 %% Cell type:code id:4ad521c7 tags:

 ``` python
 role =input("what's your role")
 ```

 %% Cell type:code id:d54646c1 tags:

 ``` python
 ```

-%% Output
-
-    can view content
-
 %% Cell type:markdown id:d79ce120 tags:

 #### 2.1.4  Leap year check
 Write a program that checks whether a year is a leap year. A year is a leap year if it is dividable by 4, but not by 100, unless it is also dividable by 400.

 %% Cell type:code id:92455593 tags:

 ``` python
 year = input("What year should be checked")
 ```

 %% Cell type:code id:d7d6109b tags:

 ``` python
 ```

 %% Output

    2001 is not a leap year