Skip to content

Commit e4517c6

Browse files
extra class removal and cleanup
extra class removal and cleanup.
1 parent bfc2031 commit e4517c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2712
-3175
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/.metadata/

Algorithms/Fibo.py

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1-
class Prime(object):
2-
@classmethod
3-
def main(cls, args):
4-
print(cls.isPrime(50))
5-
print(cls.isPrime(47))
6-
7-
@classmethod
8-
def isPrime(self, n):
9-
if( n > 1):
10-
answer = True
11-
else:
12-
answer = False
13-
i = 2
14-
while(i*i <= n):
15-
if(n%i == 0):
16-
answer = False
17-
break
18-
i += 1
19-
return answer
1+
def fibonacci2(n):
2+
if n <= 1:
3+
return n
4+
return fibonacci(n - 1) + fibonacci(n - 2)
205

21-
if __name__ == '__main__':
22-
import sys
23-
Prime.main(sys.argv)
6+
7+
def fibonacci(n):
8+
first = 0
9+
second = 1
10+
if (n == 0):
11+
return first;
12+
elif (n == 1):
13+
return second;
14+
i = 2
15+
while(i <= n):
16+
temp = first + second
17+
first = second
18+
second = temp
19+
i += 1
20+
return temp
21+
22+
23+
print(fibonacci(50))
24+
print(fibonacci2(50))

Algorithms/NQueen.py

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,22 @@
1-
#!/usr/bin/env python
1+
def Feasible(Q, k):
2+
i = 0
3+
while i < k:
4+
if Q[k] == Q[i] or abs(Q[i] - Q[k]) == abs(i - k):
5+
return False
6+
i += 1
7+
return True
28

3-
class NQueen(object):
4-
@classmethod
5-
def printArr(cls, Q, n):
6-
i = 0
7-
while i < n:
8-
print(Q[i])
9-
i += 1
10-
print("")
9+
def NQueens(Q, k, n):
10+
if k == n:
11+
print (Q)
12+
return
13+
i = 0
14+
while i < n:
15+
Q[k] = i
16+
if Feasible(Q, k):
17+
NQueens(Q, k + 1, n)
18+
i += 1
1119

12-
@classmethod
13-
def Feasible(cls, Q, k):
14-
i = 0
15-
while i < k:
16-
if Q[k] == Q[i] or abs(Q[i] - Q[k]) == abs(i - k):
17-
return False
18-
i += 1
19-
return True
2020

21-
@classmethod
22-
def NQueens(cls, Q, k, n):
23-
if k == n:
24-
cls.printArr(Q, n)
25-
return
26-
i = 0
27-
while i < n:
28-
Q[k] = i
29-
if cls.Feasible(Q, k):
30-
cls.NQueens(Q, k + 1, n)
31-
i += 1
32-
33-
34-
@classmethod
35-
def main(cls, args):
36-
Q = [0] * 8
37-
cls.NQueens(Q, 0, 8)
38-
39-
if __name__ == '__main__':
40-
import sys
41-
NQueen.main(sys.argv)
21+
Q = [0] * 8
22+
NQueens(Q, 0, 8)

Algorithms/Prime.py

Lines changed: 13 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,15 @@
1-
class Fibo(object):
2-
3-
@classmethod
4-
def main(cls, args):
5-
print(cls.fibonacci(50))
6-
print(cls.fibonacci2(50))
7-
8-
@classmethod
9-
def fibonacci2(cls, n):
10-
if n <= 1:
11-
return n
12-
return cls.fibonacci(n - 1) + cls.fibonacci(n - 2)
13-
14-
@classmethod
15-
def fibonacci(cls, n):
16-
first = 0
17-
second = 1
18-
if (n == 0):
19-
return first;
20-
elif (n == 1):
21-
return second;
22-
i = 2
23-
while(i <= n):
24-
temp = first + second
25-
first = second
26-
second = temp
27-
i += 1
28-
return temp
29-
30-
def isPrime(self, n):
31-
if( n > 1):
32-
answer = True
33-
else:
1+
def isPrime(n):
2+
if(n > 1):
3+
answer = True
4+
else:
5+
answer = False
6+
i = 2
7+
while(i*i <= n):
8+
if(n % i == 0):
349
answer = False
35-
i = 2
36-
while(i*i <= n):
37-
if(n%i == 0):
38-
answer = True;
39-
break;
40-
i += 1
41-
return answer
10+
break
11+
i += 1
12+
return answer
4213

43-
if __name__ == '__main__':
44-
import sys
45-
Fibo.main(sys.argv)
14+
print(isPrime(50))
15+
print(isPrime(47))

Algorithms/TOH.py

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,12 @@
1-
#!/usr/bin/env python
2-
""" generated source for module TOH """
3-
4-
class TOH(object):
5-
""" generated source for class TOH """
6-
7-
@classmethod
8-
def main(cls, args):
9-
""" generated source for method main """
10-
11-
cls.TowersOfHanoi(3)
12-
13-
@classmethod
14-
def TOHUtil(cls, num, source, dest, temp):
15-
""" generated source for method TOHUtil """
16-
if num < 1:
17-
return
18-
cls.TOHUtil(num - 1, source, temp, dest)
19-
print("Move disk" , num , "from peg" , source , "to peg" , dest)
20-
cls.TOHUtil(num - 1, temp, dest, source)
21-
22-
@classmethod
23-
def TowersOfHanoi(cls, num):
24-
""" generated source for method TowersOfHanoi """
25-
print("The sequence of moves involved in the Tower of Hanoi are :")
26-
cls.TOHUtil(num, 'A', 'C', 'B')
27-
28-
29-
if __name__ == '__main__':
30-
import sys
31-
TOH.main(sys.argv)
1+
def TOHUtil(num, source, dest, temp):
2+
if num < 1:
3+
return
4+
TOHUtil(num - 1, source, temp, dest)
5+
print("Move disk" , num , "from peg" , source , "to peg" , dest)
6+
TOHUtil(num - 1, temp, dest, source)
7+
8+
def TowersOfHanoi(num):
9+
print("The sequence of moves involved in the Tower of Hanoi are :")
10+
TOHUtil(num, 'A', 'C', 'B')
11+
12+
TowersOfHanoi(3)

0 commit comments

Comments
 (0)