diff --git a/src/cityreader/cityreader.py b/src/cityreader/cityreader.py index 2bd8007ce7..97e958be41 100644 --- a/src/cityreader/cityreader.py +++ b/src/cityreader/cityreader.py @@ -5,7 +5,7 @@ # We have a collection of US cities with population over 750,000 stored in the # file "cities.csv". (CSV stands for "comma-separated values".) # -# In the body of the `cityreader` function, use Python's built-in "csv" module +# In the body of the `cityreader` function, use Python's built-in "csv" module # to read this file so that each record is imported into a City instance. Then # return the list with all the City instances from the function. # Google "python 3 csv" for references and use your Google-fu for other examples. @@ -14,18 +14,42 @@ # # Note that the first line of the CSV is header that describes the fields--this # should not be loaded into a City object. + +import csv +import os cities = [] +# City Class + + +class City: + def __init__(self, name, lat, lon): + self.name = name + self.lat = lat + self.lon = lon + + def __str__(self): + return f'name: {self.name}\nlattitude: {self.lat}\n longitude: {self.lon}' + + def cityreader(cities=[]): - # TODO Implement the functionality to read from the 'cities.csv' file - # 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 - + # TODO Implement the functionality to read from the 'cities.csv' file + # 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 + path = os.path.dirname(__file__) + '/cities.csv' + with open(path, newline='') as csvfile: + reader = csv.reader(csvfile) + next(reader) + for row in reader: + name, lat, lon = row[0], float(row[3]), float(row[4]) + city_instance = City(name, lat, lon) + cities.append(city_instance) + return cities -cityreader(cities) +cityreader(cities) # Print the list of cities (name, lat, lon), 1 record per line. for c in cities: print(c) @@ -33,10 +57,10 @@ def cityreader(cities=[]): # STRETCH GOAL! # # Allow the user to input two points, each specified by latitude and longitude. -# These points form the corners of a lat/lon square. Pass these latitude and +# These points form the corners of a lat/lon square. Pass these latitude and # longitude values as parameters to the `cityreader_stretch` function, along # with the `cities` list that holds all the City instances from the `cityreader` -# function. This function should output all the cities that fall within the +# function. This function should output all the cities that fall within the # coordinate square. # # Be aware that the user could specify either a lower-left/upper-right pair of @@ -61,11 +85,21 @@ def cityreader(cities=[]): # TODO Get latitude and longitude values from the user + def cityreader_stretch(lat1, lon1, lat2, lon2, cities=[]): - # within will hold the cities that fall within the specified region - within = [] - - # Go through each city and check to see if it falls within - # the specified coordinates. + # within will hold the cities that fall within the specified region + # within = [] + if lat1 < lat2 and lon1 < lon2: + print('reverse!!!!') + lat1, lon1, lat2, lon2 = lat2, lon2, lat1, lon1 + print(lat1, lat2, lon1, lon2) + + within = [city for city in cities if city.lat < + lat1 and city.lon < lon1] + within = [city for city in within if city.lat > + lat2 and city.lon > lon2] + + # Go through each city and check to see if it falls within + # the specified coordinates. - return within + return within diff --git a/src/comp/comp.py b/src/comp/comp.py index 82f8821d63..4a74a85250 100644 --- a/src/comp/comp.py +++ b/src/comp/comp.py @@ -1,5 +1,8 @@ -# The following list comprehension exercises will make use of the -# defined Human class. +# The following list comprehension exercises will make use of the +# defined Human class. +import math + + class Human: def __init__(self, name, age): self.name = name @@ -8,6 +11,7 @@ def __init__(self, name, age): def __repr__(self): return f"" + humans = [ Human("Alice", 29), Human("Bob", 32), @@ -24,48 +28,49 @@ 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 = [] +c = [human.name for human in humans if ord(human.name[0]) >= ord( + 'C') and ord(human.name[0]) <= ord('G')] 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 = [] +f = [(human.name, human.age) + for human in humans if human.age >= 27 and human.age <= 32] 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 = [] +h = [math.sqrt(human.age) for human in humans] print(h) diff --git a/src/oop/oop1.py b/src/oop/oop1.py index b7268c5263..b58dbbb42e 100644 --- a/src/oop/oop1.py +++ b/src/oop/oop1.py @@ -17,3 +17,29 @@ # pass # # Put a comment noting which class is the base class +class Vehicle: + pass + + +class FlightVehicle(Vehicle): + pass + + +class Starship(FlightVehicle): + pass + + +class GroundVehicle(Vehicle): + pass + + +class Car(GroundVehicle): + pass + + +class Motorcycle(GroundVehicle): + pass + + +class Airplane(FlightVehicle): + pass diff --git a/src/oop/oop2.py b/src/oop/oop2.py index 29d3e481fe..df7c9b4c69 100644 --- a/src/oop/oop2.py +++ b/src/oop/oop2.py @@ -4,10 +4,12 @@ # object is constructed. class GroundVehicle(): - def __init__(self, num_wheels): + def __init__(self, num_wheels=4): self.num_wheels = num_wheels # TODO + def drive(self): + return "vroooom" # Subclass Motorcycle from GroundVehicle. @@ -18,6 +20,13 @@ def __init__(self, num_wheels): # Override the drive() method in Motorcycle so that it returns "BRAAAP!!" # TODO +class Motorcycle(GroundVehicle): + def __init__(self): + super().__init__(2) + + def drive(self): + return "BRAAAP!!" + 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())