Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 35 additions & 14 deletions src/cityreader/cityreader.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
import csv

# 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 = lat
self.lon = lon

def __repr__(self):
return f"City({self.name}, {self.lat}, {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".)
#
# 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.
Expand All @@ -16,26 +28,34 @@
# should not be loaded into a City object.
cities = []


def cityreader(cities=[]):
# TODO Implement the functionality to read from the 'cities.csv' file
# 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
# For each city record, create a new City instance and add it to the
# `cities` list
with open('cities.csv', 'r') as file:
csv_file = csv.DictReader(file)

for row in csv_file:
cities.append(City(row['city'], float(
row['lat']), float(row['lng'])))

return cities


cityreader(cities)

# Print the list of cities (name, lat, lon), 1 record per line.
for c in cities:
print(c)
print(f"{c.name}, {c.lat}, {c.lon}")

# 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
Expand All @@ -60,12 +80,13 @@ 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 = []
# within will hold the cities that fall within the specified region
within = []

# TODO Ensure that the lat and lon valuse are all floats
# Go through each city and check to see if it falls within
# the specified coordinates.
# TODO Ensure that the lat and lon valuse are all floats
# Go through each city and check to see if it falls within
# the specified coordinates.

return within
return within
26 changes: 15 additions & 11 deletions src/comp/comp.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -8,6 +11,7 @@ def __init__(self, name, age):
def __repr__(self):
return f"<Human: {self.name}, {self.age}>"


humans = [
Human("Alice", 29),
Human("Bob", 32),
Expand All @@ -24,48 +28,48 @@ 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 human.name[0] >= "C" and human.name[0] <= "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)
21 changes: 21 additions & 0 deletions src/oop/oop1.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,24 @@
# pass
#
# Put a comment noting which class is the base class

class Vehicle:
pass

class GroundVehicle(Vehicle):
pass

class Car(GroundVehicle):
pass

class Motorcycle(GroundVehicle):
pass

class FlightVehicle(Vehicle):
pass

class Airplane(FlightVehicle):
pass

class Starship(FlightVehicle):
pass
14 changes: 13 additions & 1 deletion src/oop/oop2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -18,6 +20,14 @@ 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)

# TODO
def drive(self):
return "BRAAAP!!"


vehicles = [
GroundVehicle(),
Expand All @@ -30,3 +40,5 @@ def __init__(self, num_wheels):
# Go through the vehicles list and print the result of calling drive() on each.

# TODO
for val in vehicles:
print(val.drive())