diff --git a/7 - Classes and Objects/Challenge/Ball.py b/7 - Classes and Objects/Challenge/Ball.py new file mode 100644 index 0000000..6782efd --- /dev/null +++ b/7 - Classes and Objects/Challenge/Ball.py @@ -0,0 +1,20 @@ +class Ball(): + def __init__(self, diameter, color): + self.diameter = diameter + self.color = color + self.timesBounced = 0 + + def getDiameter(self): + return self.diameter + + def getColor(self): + return self.color + + def getTimesBounced(self): + return self.timesBounced + + def bounceBall(self): + self.timesBounced += 1 + + def __str__(self): + return "This ball is " + self.color + " with a diameter of " + str(self.diameter) + " and has been bounced " + str(self.timesBounced) + " times!" \ No newline at end of file diff --git a/7 - Classes and Objects/Challenge/README.md b/7 - Classes and Objects/Challenge/README.md new file mode 100644 index 0000000..4e53aeb --- /dev/null +++ b/7 - Classes and Objects/Challenge/README.md @@ -0,0 +1,22 @@ +Write a class called Ball with the following +- Characteristics + - diameter (float) + - color (string) + - timesBounced (int) +- Behaviors + - bounceBall + - getDiameter + - getColor + - getTimesBounced + +Create 2 Balls +- Ball 1 + - Diameter: .5 + - Color: Red + - Bounce the ball 10 times +- Ball 2 + - Diameter: 1 + - Color: Yellow + - Bounce teh ball 1 time + +Print all the values for both balls \ No newline at end of file diff --git a/7 - Classes and Objects/Challenge/main.py b/7 - Classes and Objects/Challenge/main.py new file mode 100644 index 0000000..b408f89 --- /dev/null +++ b/7 - Classes and Objects/Challenge/main.py @@ -0,0 +1,12 @@ +import Ball + +ball1 = Ball.Ball(5, "Red") +ball2 = Ball.Ball(1, "Yellow") + +for i in range(10): + ball1.bounceBall() + +ball2.bounceBall() + +print(ball1) +print(ball2) \ No newline at end of file diff --git a/7 - Classes and Objects/README.md b/7 - Classes and Objects/README.md new file mode 100644 index 0000000..e69de29 diff --git a/7 - Classes and Objects/Tree.py b/7 - Classes and Objects/Tree.py new file mode 100644 index 0000000..217e05b --- /dev/null +++ b/7 - Classes and Objects/Tree.py @@ -0,0 +1,21 @@ +class Tree(): + def __init__(self, typeOfTree, height, width): + self.typeOfTree = typeOfTree + self.height = height + self.width = width + + def getTypeOfTree(self): + return self.typeOfTree + + def getHeight(self): + return self.height + + def getWidth(self): + return self.width + + def grow(self, heightAdd, widthAdd): + self.height += heightAdd + self.width += widthAdd + + def __str__(self): + return "Type of Tree: " + self.typeOfTree + " Height: " + str(self.height) + " Width: " + str(self.width) \ No newline at end of file diff --git a/7 - Classes and Objects/main.py b/7 - Classes and Objects/main.py new file mode 100644 index 0000000..2483597 --- /dev/null +++ b/7 - Classes and Objects/main.py @@ -0,0 +1,10 @@ +import Tree + +oakTree = Tree.Tree("Oak", 10, .5) +pineTree = Tree.Tree("Pine", 25, 1.25) + +print(oakTree) +oakTree.grow(5, .5) + +print(oakTree) +print(pineTree) \ No newline at end of file diff --git a/8 - Basic Robot Electronics/CS8 - Basic Robot Electronics.odp b/8 - Basic Robot Electronics/CS8 - Basic Robot Electronics.odp new file mode 100644 index 0000000..fc57031 Binary files /dev/null and b/8 - Basic Robot Electronics/CS8 - Basic Robot Electronics.odp differ diff --git a/8 - Basic Robot Electronics/CS8 - Basic Robot Electronics.pdf b/8 - Basic Robot Electronics/CS8 - Basic Robot Electronics.pdf new file mode 100644 index 0000000..cb20203 Binary files /dev/null and b/8 - Basic Robot Electronics/CS8 - Basic Robot Electronics.pdf differ diff --git a/8 - Basic Robot Electronics/README.md b/8 - Basic Robot Electronics/README.md new file mode 100644 index 0000000..e69de29