Sim sprint 04/09

src/cityreader/cityreader.py

@@ -1,6 +1,9 @@
 # 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, lat, lon):
+    self.lat = lat
+    self.lon = 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".)

src/comp/comp.py

@@ -20,52 +20,56 @@ def __repr__(self):
     Human("Igon", 41),
     Human("David", 31),
 ]
+#need some way to separate names from ages
 
 # Write a list comprehension that creates a list of names of everyone
 # whose name starts with 'D':
 print("Starts with D:")
-a = []
+a = [x for x in humans.name if x[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 = [x for x in humans.name if x[-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 = []
+import string
+alphabet = string.ascii_uppercase
+c = [x for x in humans.name if alphabet[2] <= x[0] <= alphabet[6]]
 print(c)
 
 # Write a list comprehension that creates a list of all the ages plus 10.
 print("Ages plus 10:")
-d = []
+d = [humans.age[i] + 10 for i 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.
+#something sort of like this 
 print("Name hyphen age:")
-e = []
+e = [' '.join(humans[i].name-humans[i].age) for i 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 = [humans[i].name, humans[i].age for i in range(32 <= humans.age <= 27)]
 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 = [humans[i].name.captialize(), humans[i].age + 5 for i 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(humans[i].age) for i in humans]
 print(h)

src/oop/oop1.py

@@ -17,3 +17,30 @@
 #     pass
 #
 # Put a comment noting which class is the base class
+
+#This is the base class.
+class Vehicle:
+    def __init__(self, name, year):
+        self.name = name
+        self.year = year
+
+class FlightVehicle(Vehicle):
+    pass
+
+class GroundVehicle(Vehicle):
+    pass
+
+class Starship(FlightVehicle):
+    pass
+
+class Airplane(FlightVehicle):
+    pass
+
+class Car(GroundVehicle):
+    pass
+
+class Motorcycle(GroundVehicle):
+    pass
+
+
+

src/oop/oop2.py

@@ -5,8 +5,11 @@
 
 class GroundVehicle():
     def __init__(self, num_wheels):
+        if not num_wheels:
+            return 4
         self.num_wheels = num_wheels
-
+    def drive():
+        return 'vrooooom'
     # TODO
 
 
@@ -17,6 +20,12 @@ def __init__(self, num_wheels):
 #
 # Override the drive() method in Motorcycle so that it returns "BRAAAP!!"
 
+class Motorcycle(GroundVehicle):
+    super().__init__(self, 2)
+    #something like that 
+    def drive(self):
+        return 'BRAAAP!!'
+
 # TODO
 
 vehicles = [
@@ -30,3 +39,4 @@ def __init__(self, num_wheels):
 # Go through the vehicles list and print the result of calling drive() on each.
 
 # TODO
+