Skip to content

Commit 2ffe711

Browse files
authored
Add files via upload
1 parent 351706e commit 2ffe711

2 files changed

Lines changed: 48 additions & 0 deletions

File tree

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
class employee:
2+
salary = 10000
3+
increment = 37
4+
5+
@property
6+
def salary_with_increment(self):
7+
return f"Salary after increment is: {self.salary + (self.salary * self.increment / 100)}"
8+
9+
@salary_with_increment.setter
10+
def salary_with_increment(self, new_salary):
11+
self.increment = ((new_salary/self.salary) - 1) * 100
12+
13+
y = employee()
14+
# print(y.salary_with_increment)
15+
# print(y.increment)
16+
print(f"Salary is: {y.salary}")
17+
y.salary_with_increment = 30000
18+
print(f"Increment is: {y.increment}")
19+
print(y.salary_with_increment)
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
class _2D_vectors:
2+
def __init__(self, i, j):
3+
self.i = i
4+
self.j = j
5+
6+
def vectors(self):
7+
print(f"2D Vector is: {self.i}i + {self.j}j")
8+
9+
def magnitude(self):
10+
print(f"Magnitude of 2D vector is: {(self.i**2 + self.j**2) ** 0.5}")
11+
12+
class _3D_vectors(_2D_vectors):
13+
def __init__(self, i, j, k):
14+
super().__init__(i, j)
15+
self.k = k
16+
17+
def vectors(self):
18+
print(f"3D Vector is: {self.i}i + {self.j}j + {self.k}k")
19+
20+
def magnitude(self):
21+
print(f"Magnitude of 3D vector is: {(self.i**2 + self.j**2 + self.k**2) ** 0.5}")
22+
23+
r = _2D_vectors(3, 4)
24+
r.vectors()
25+
r.magnitude()
26+
#-------------
27+
s = _3D_vectors(3, 4, 12)
28+
s.vectors()
29+
s.magnitude()

0 commit comments

Comments
 (0)