Merge branch 'kacey-lab03-number-phrases' of https://github.com/PdxCodeGuild/class_HB2 into kacey-lab03-number-phrases

Author: demolishen

1 Python/labs/02 Unit Converter

@@ -6,7 +6,6 @@ Ask the user for the number of feet, and print out the equivalent distance in me
 
 > what is the distance in feet? 12
 > 12 ft is 3.6576 m
-
 Version 2
 Allow the user to also enter the units. Then depending on the units, convert the distance into meters. The units we'll allow are feet, miles, meters, and kilometers.
 
@@ -19,23 +18,21 @@ Below is some sample input/output:
 > what is the distance? 100
 > what are the units? mi
 > 100 mi is 160934 m
-
-> Version 3
-> Add support for yards, and inches.
+Version 3
+Add support for yards, and inches.
 
 1 yard is 0.9144 m
 1 inch is 0.0254 m
-
 Version 4 - optional
 Now we'll ask the user for the distance, the starting units, and the units to convert to.
 
 You can think of the values for the conversions as elements in a matrix, where the rows will be the units you're converting from, and the columns will be the units you're converting to. Along the horizontal, the values will be 1 (1 meter is 1 meter, 1 foot is 1 foot, etc).
 
-ft mi m km
-ft 1 0.3048
-mi 1 1609.34
-m 1/0.3048 1/1609.34 1 1/1000
-km 1000 1
+ft	mi	m	km
+ft	1		0.3048	
+mi		1	1609.34	
+m	1/0.3048	1/1609.34	1	1/1000
+km			1000	1
 But instead of filling out that matrix, and checking for each pair of units (if from_units == 'mi' and to_units == 'km'), we can just convert any unit to meters, then convert the distance in meters to any other unit.
 
 Furthermore you can convert them from meters by dividing a distance (in meters) by those same values used above. So first convert from the input units to meters, then convert from meters to the output units.
@@ -45,11 +42,10 @@ Below is some sample input/output:
 > what is the distance? 100
 > what are the input units? ft
 > what are the output units? mi
-> 100 ft is 0.0189394 mi
-
-<!-- > Turning in your lab
-> Make sure you are still on your lab branch with git status. This will also show you a list of files that have been modified.
-> Add any files you want git to keep track of using git add filename. Replace filename with the name of your file. You can also use git add . to add everything within the current folder.
-> Commit your work using git commit -m "Your commit message". Make sure your commit message is descriptive and describes what has been changed during this commit.
-> Finally we can run the command git push to send our files up to Github. This may throw an error, but worry not, there will be a suggested command to run, simply copy and paste that command and you should be good to go.
-> Don't forget to visit Github and create a pull request to submit your work for review. -->
+100 ft is 0.0189394 mi
+Turning in your lab
+Make sure you are still on your lab branch with git status. This will also show you a list of files that have been modified.
+Add any files you want git to keep track of using git add filename. Replace filename with the name of your file. You can also use git add . to add everything within the current folder.
+Commit your work using git commit -m "Your commit message". Make sure your commit message is descriptive and describes what has been changed during this commit.
+Finally we can run the command git push to send our files up to Github. This may throw an error, but worry not, there will be a suggested command to run, simply copy and paste that command and you should be good to go.
+Don't forget to visit Github and create a pull request to submit your work for review.

code/kaceyb/python/lab02/lab_02.py

@@ -4,7 +4,7 @@
 #         VERSION 1           #
 
 
-from inspect import formatannotation
+
 
 
 conversion_list = {
@@ -131,4 +131,4 @@
     print(f"{users_distance_input} {users_unit_input} is {result}")
 
     user = False
-    
+