MVP

src/cityreader/cityreader.py

@@ -1,6 +1,14 @@
 # Create a class to hold a city location. Call the class "City". It should have
 # fields for name, lat and lon (representing latitude and longitude).
 
+class City:
+  def __init__(self, name, lat, lon):
+    self.name = name
+    self.lat = float(lat)
+    self.lon = float(lon)
+
+  def __str__(self):
+    return f"name: {self.name}, lat: {self.lat}, lon: {self.lon}"
 
 # We have a collection of US cities with population over 750,000 stored in the
 # file "cities.csv". (CSV stands for "comma-separated values".)
@@ -21,10 +29,22 @@ def cityreader(cities=[]):
   # Ensure that the lat and lon valuse are all floats
   # For each city record, create a new City instance and add it to the 
   # `cities` list
+
+    import csv
+
+    from os.path import dirname, join
+    current_dir = dirname(__file__)
+    file_path = join(current_dir, "cities.csv")
+    with open(file_path, 'r') as csv_file:
+        csv_reader = csv.reader(csv_file, delimiter=',')
+        next(csv_reader)
+        for row in csv_reader:
+          created_city = City(row[0], row[3], row[4])
+          cities.append(created_city)
 
     return cities
 
-cityreader(cities)
+print(cityreader(cities))
 
 # Print the list of cities (name, lat, lon), 1 record per line.
 for c in cities:
@@ -68,4 +88,4 @@ def cityreader_stretch(lat1, lon1, lat2, lon2, cities=[]):
   # Go through each city and check to see if it falls within 
   # the specified coordinates.
 
-  return within
+  return within

src/comp/comp.py

@@ -24,48 +24,50 @@ def __repr__(self):
 # Write a list comprehension that creates a list of names of everyone
 # whose name starts with 'D':
 print("Starts with D:")
-a = []
+a = [human.name for human in humans if human.name[0] == "D"]
 print(a)
 
 # Write a list comprehension that creates a list of names of everyone
 # whose name ends in "e".
 print("Ends with e:")
-b = []
+b = [human.name for human in humans if human.name[-1] == "e"]
 print(b)
 
 # Write a list comprehension that creates a list of names of everyone
 # whose name starts with any letter between 'C' and 'G' inclusive.
 print("Starts between C and G, inclusive:")
-c = []
+letter_range = ["C", "D", "E", "F", "G"]
+c = [human.name for human in humans if human.name[0] in letter_range]
 print(c)
 
 # Write a list comprehension that creates a list of all the ages plus 10.
 print("Ages plus 10:")
-d = []
+d = [human.age + 10 for human in humans]
 print(d)
 
 # Write a list comprehension that creates a list of strings which are the name
 # joined to the age with a hyphen, for example "David-31", for all humans.
 print("Name hyphen age:")
-e = []
+e = [f"{human.name}-{human.age}" for human in humans]
 print(e)
 
 # Write a list comprehension that creates a list of tuples containing name and
 # age, for example ("David", 31), for everyone between the ages of 27 and 32,
 # inclusive.
 print("Names and ages between 27 and 32:")
-f = []
+age_range = [num for num in range(27, 33)]
+f = [(human.name, human.age) for human in humans if human.age in age_range]
 print(f)
 
 # Write a list comprehension that creates a list of new Humans like the old
 # list, except with all the names uppercase and the ages with 5 added to them.
 # The "humans" list should be unmodified.
 print("All names uppercase:")
-g = []
+g = [Human(human.name.upper(), human.age + 5) for human in humans]
 print(g)
 
 # Write a list comprehension that contains the square root of all the ages.
 print("Square root of ages:")
 import math
-h = []
-print(h)
+h = [math.sqrt(human.age) for human in humans]
+print(h)

src/oop/oop1.py

@@ -17,3 +17,31 @@
 #     pass
 #
 # Put a comment noting which class is the base class
+
+# Base Class
+class Vehicle:
+	pass
+
+
+class GroundVehicle(Vehicle):
+	pass
+
+
+class Car(GroundVehicle):
+	pass
+
+
+class Motorcycle(GroundVehicle):
+	pass
+
+
+class FlightVehicle(Vehicle):
+	pass
+
+
+class Starship(FlightVehicle):
+	pass
+
+
+class Airplane(FlightVehicle):
+	pass

src/oop/oop2.py

@@ -4,11 +4,11 @@
 # object is constructed.
 
 class GroundVehicle():
-    def __init__(self, num_wheels):
-        self.num_wheels = num_wheels
-
-    # TODO
+  def __init__(self, num_wheels = 4):
+    self.num_wheels = num_wheels
 
+  def drive(self):
+    return "vroooom"
 
 # Subclass Motorcycle from GroundVehicle.
 #
@@ -18,6 +18,15 @@ def __init__(self, num_wheels):
 # Override the drive() method in Motorcycle so that it returns "BRAAAP!!"
 
 # TODO
+class Motorcycle(GroundVehicle):
+  def __init__(self, num_wheels = 2):
+    super().__init__(num_wheels)
+
+  def drive(self):
+    return "BRAAAP!!"
+
+m = Motorcycle()
+print(m.num_wheels)
 
 vehicles = [
     GroundVehicle(),
@@ -30,3 +39,5 @@ def __init__(self, num_wheels):
 # Go through the vehicles list and print the result of calling drive() on each.
 
 # TODO
+for vehicle in vehicles:
+  print(vehicle.drive())