Updated files.

irsol · irsol · commit fdceb1761dbe · 2019-02-04T16:46:01.000+01:00
diff --git a/boolean_practice/boolean_exercises.py b/boolean_practice/boolean_exercises.py
@@ -1,57 +1,67 @@
-#3.1. Expression that evaluates to True in both variables are True
+# 3.1. Expression that evaluates to True if both variables are True
 # and that evaluates to False otherwise
+
 x = True
 y = True
 print(x and y)
 
-#3.2. Expression that evaluates to True if x is False and evaluates
+# 3.2. Expression that evaluates to True if x is False and evaluates
 # to False otherwise
+
 x = False
 y = True
 print(not x)
 
-#3.3. Expression that evaluates to True if at least one of the variables is True
+# 3.3. Expression that evaluates to True if at least one of the variables is True
 # and evaluates to False otherwise
+
 x = True
 y = False
 print(x or y)
 
-#4. Expression that evaluates to True if at most one of the variables is True
+# 4. Expression that evaluates to True if at most one of the variables is True
 # and evaluates to False otherwise
+
 full = True
 empty = False
 print(not full or empty)
 
-#5. True if the light level is less than 0.01 or if the temperature
+# 5. True if the light level is less than 0.01 or if the temperature
 # is above freezing, but not if both condition are true
 
 
 def automate_camera(light, temperature):
     return (light < 0.01) != (temperature > 0.0)
 
+
 automate_camera(0.01, -2)
 
 
 # exclusive or
+
 def automate_camera(light, temperature):
     if (light < 0.01) != (temperature > 0.0):
         return True
     else:
         return False
+
+
 automate_camera(0.00, -2)
 
-#6.
+# 6.
 
 
-#7. The function returns True if a and b refer to different values and
+# 7. The function returns True if a and b refer to different values and
 # returns False otherwise
+
 def different(a, b):
     return a != b
 
+
 different(2, 2)
 
 
-#8. You are given two float variables, population and land_area.
+# 8. You are given two float variables, population and land_area.
 # a. Write an if statement that will print the population if it is less than
 # 10,000,000
 
@@ -60,26 +70,23 @@ def different(a, b):
 land_area = 1222.33
 
 if population < 10000000:
-    print("{: f}".format(population))
+    print(f"{population} million")
 
 
 # b. Write an if statement that will print the population if it is between
 # 10,000,000 and 35,000,000
 
-population = 36.000000
+population = 33.000000
 land_area = 1222.33
 
 if 10.000000 < population < 35.000000:
-    print("{: f}".format(population))
-
-else:
-    print(None)
+    print(f"{population} millions")
 
 
 # c. Write an if statement that will print "Densely populated" if the land
 # density(number of people per unit of area) is greater than 100.
 # d. Write an if statement that will print "Densely populated!" if the land
-# density print is greter than 100 and that will print "Sparsely populated"
+# density print is greater than 100 and that will print "Sparsely populated"
 # otherwise.
 
 density = 90
@@ -90,19 +97,23 @@ def different(a, b):
     print("Sparsely populated")
 
 
-#9. Function convert_tempretures converts temperature t from source units
+# 9. Function convert_temperature converts temperature t from source units
 # to target units using. Function convert_to_celsius convert all source units
 # to celsius, than function convert_from_celsius converts celsius to target
 # units and returns result.
+
 def convert_to_celsius(t, source):
     if source == "F":
-        return t - 32 * 5.0/9.0
+        return (t - 32 * 5.0/9.0).__round__(2)
     elif source == "K":
-        return t - 273.15
+        return (t - 273.15).__round__(2)
     elif source == 'C':
         return t
 
 
+convert_to_celsius(32, "K")
+
+
 def convert_from_celsius(t, target):
     if target == "F":
         return t + 32 * 9.0/5.0
@@ -112,6 +123,9 @@ def convert_from_celsius(t, target):
         return t
 
 
+convert_from_celsius(32, "F")
+
+
 def convert_temperatures(t, source, target):
     print('step 1', t, source, target)
     celsius = convert_to_celsius(t, source)
@@ -120,3 +134,19 @@ def convert_temperatures(t, source, target):
     print('step 3', result, celsius, t, source, target)
     return result
 
+
+# 10. If ph value is below 3.0 - very acidic, between 3 and 7 - acidic
+
+user_input = input("Enter an acidity level: \n")
+
+if len(user_input) > 0:
+    ph = float(user_input)
+    if 3.0 < ph < 7.0:
+        print(f"{ph} is acidic.")
+    elif ph < 3.0:
+        print(f"{ph} is VERY acidic! Be careful!")
+else:
+    print("No ph value was given!")
+
+
+# 11.
diff --git a/boolean_practice/boolean_expressions.py b/boolean_practice/boolean_expressions.py
@@ -1,25 +1,25 @@
 # For each of the expressions, what value will the expression give?
 
 
-1. True and not False
+True and not False
 # True
 
 
-2. True or True and False
+True or True and False
 # True
 
 
-3. not True or not False
+not True or not False
 # True
 
 
-4. True and not 0
+True and not 0
 # True
 
 
-5. 1 + 55 < 55.2
+1 + 55 < 55.2
 # False
 
 
-6. 4 != 4.0
+4 != 4.0
 # False
diff --git a/boolean_practice/boolean_test.py b/boolean_practice/boolean_test.py
@@ -0,0 +1 @@
+
diff --git a/boolean_practice/storing_conditionals.py b/boolean_practice/storing_conditionals.py
@@ -15,6 +15,8 @@ def heart_risk(age, bmi):
     elif not young and not slim:
         risk = 'high'
     return risk
+
+
 heart_risk(45, 15)
 heart_risk(42, 20)
 heart_risk(18, 23)
@@ -29,4 +31,6 @@ def calculate_heart_risk(age, bmi):
     heavy = bmi >= 22.0
     risk = table[young][heavy]
     return risk
+
+
 calculate_heart_risk(23, 32)
