Resovle conflicts

Author: harshildarji

Analysis/Compression_Analysis/compressed_image.png renamed to analysis/compression_analysis/compressed_image.png

@@ -99,8 +99,8 @@ def prime_implicant_chart(prime_implicants, binary):
 	return chart
 
 def main():
-	no_of_variable = int(raw_input("Enter the no. of variables\n"))
-	minterms = [int(x) for x in raw_input("Enter the decimal representation of Minterms 'Spaces Seprated'\n").split()]
+	no_of_variable = int(input("Enter the no. of variables\n"))
+	minterms = [int(x) for x in input("Enter the decimal representation of Minterms 'Spaces Seprated'\n").split()]
 	binary = decimal_to_binary(no_of_variable, minterms)
 
 	prime_implicants = check(binary)
@@ -113,4 +113,4 @@ def main():
 	print(essential_prime_implicants)
 
 if __name__ == '__main__':
-	main()
+	main()

Analysis/Compression_Analysis/example_image.jpg renamed to analysis/compression_analysis/example_image.jpg

@@ -4,9 +4,9 @@
 SYMBOLS = """ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~"""
 
 def main():
-    message = raw_input('Enter message: ')
-    key = int(raw_input('Enter key [2000 - 9000]: '))
-    mode = raw_input('Encrypt/Decrypt [E/D]: ')
+    message = input('Enter message: ')
+    key = int(input('Enter key [2000 - 9000]: '))
+    mode = input('Encrypt/Decrypt [E/D]: ')
 
     if mode.lower().startswith('e'):
               mode = 'encrypt'

Analysis/Compression_Analysis/orignal_image.png renamed to analysis/compression_analysis/orignal_image.png

@@ -44,7 +44,7 @@ def decrypt(message):
         print("Decryption using Key #%s: %s" % (key, translated))
 
 def main():
-    message = raw_input("Encrypted message: ")
+    message = input("Encrypted message: ")
     message = message.upper()
     decrypt(message)
 

Analysis/Compression_Analysis/PSNR.py renamed to analysis/compression_analysis/psnr.py

@@ -40,25 +40,25 @@ def main():
     print("3.BruteForce")
     print("4.Quit")
     while True:
-        choice = raw_input("What would you like to do?: ")
+        choice = input("What would you like to do?: ")
         if choice not in ['1', '2', '3', '4']:
             print ("Invalid choice")
         elif choice == '1':
-            strng = raw_input("Please enter the string to be ecrypted: ")
+            strng = input("Please enter the string to be ecrypted: ")
             while True:
                 key = int(input("Please enter off-set between 1-94: "))
                 if key in range(1, 95):
                     print (encrypt(strng, key))
                     main()
         elif choice == '2':
-            strng = raw_input("Please enter the string to be decrypted: ")
+            strng = input("Please enter the string to be decrypted: ")
             while True:
                 key = raw_int(input("Please enter off-set between 1-94: "))
                 if key > 0 and key <= 94:
                     print(decrypt(strng, key))
                     main()
         elif choice == '3':
-            strng = raw_input("Please enter the string to be decrypted: ")
+            strng = input("Please enter the string to be decrypted: ")
             brute_force(strng)
             main()
         elif choice == '4':

ArithmeticAnalysis/Bisection.py renamed to arithmetic_analysis/bisection.py

@@ -6,7 +6,7 @@
 
 def main():
     filename = 'encrypted_file.txt'
-    response = raw_input('Encrypte\Decrypt [e\d]: ')
+    response = input('Encrypte\Decrypt [e\d]: ')
 
     if response.lower().startswith('e'):
         mode = 'encrypt'

ArithmeticAnalysis/Intersection.py renamed to arithmetic_analysis/intersection.py

@@ -4,9 +4,9 @@
 LETTERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
 def main():
-    message = raw_input('Enter message: ')
+    message = input('Enter message: ')
     key = 'LFWOAYUISVKMNXPBDCRJTQEGHZ'
-    resp = raw_input('Encrypt/Decrypt [e/d]: ')
+    resp = input('Encrypt/Decrypt [e/d]: ')
 
     checkValidKey(key)
 

ArithmeticAnalysis/LUdecomposition.py renamed to arithmetic_analysis/lu_decomposition.py

@@ -2,9 +2,9 @@
 import math
 
 def main():
-    message = raw_input('Enter message: ')
-    key = int(raw_input('Enter key [2-%s]: ' % (len(message) - 1)))
-    mode = raw_input('Encryption/Decryption [e/d]: ')
+    message = input('Enter message: ')
+    key = int(input('Enter key [2-%s]: ' % (len(message) - 1)))
+    mode = input('Encryption/Decryption [e/d]: ')
 
     if mode.lower().startswith('e'):
         text = encryptMessage(key, message)

ArithmeticAnalysis/NewtonMethod.py renamed to arithmetic_analysis/newton_method.py

@@ -5,15 +5,15 @@
 def main():
     inputFile = 'Prehistoric Men.txt'
     outputFile = 'Output.txt'
-    key = int(raw_input('Enter key: '))
-    mode = raw_input('Encrypt/Decrypt [e/d]: ')
+    key = int(input('Enter key: '))
+    mode = input('Encrypt/Decrypt [e/d]: ')
 
     if not os.path.exists(inputFile):
         print('File %s does not exist. Quitting...' % inputFile)
         sys.exit()
     if os.path.exists(outputFile):
         print('Overwrite %s? [y/n]' % outputFile)
-        response = raw_input('> ')
+        response = input('> ')
         if not response.lower().startswith('y'):
             sys.exit()
 

ArithmeticAnalysis/NewtonRaphsonMethod.py renamed to arithmetic_analysis/newton_raphson_method.py

@@ -2,9 +2,9 @@
 LETTERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
 def main():
-    message = raw_input('Enter message: ')
-    key = raw_input('Enter key [alphanumeric]: ')
-    mode = raw_input('Encrypt/Decrypt [e/d]: ')
+    message = input('Enter message: ')
+    key = input('Enter key [alphanumeric]: ')
+    mode = input('Encrypt/Decrypt [e/d]: ')
 
     if mode.lower().startswith('e'):
         mode = 'encrypt'

boolean_algebra/Quine_McCluskey/QuineMcCluskey.py renamed to boolean_algebra/quine_mc_cluskey.py

@@ -35,8 +35,8 @@ def BellmanFord(graph, V, E, src):
 
 
 #MAIN
-V = int(raw_input("Enter number of vertices: "))
-E = int(raw_input("Enter number of edges: "))
+V = int(input("Enter number of vertices: "))
+E = int(input("Enter number of edges: "))
 
 graph = [dict() for j in range(E)]
 
@@ -45,10 +45,10 @@ def BellmanFord(graph, V, E, src):
 
 for i in range(E):
 	print("\nEdge ",i+1)
-	src = int(raw_input("Enter source:"))
-	dst = int(raw_input("Enter destination:"))
-	weight = float(raw_input("Enter weight:"))
+	src = int(input("Enter source:"))
+	dst = int(input("Enter destination:"))
+	weight = float(input("Enter weight:"))
 	graph[i] = {"src": src,"dst": dst, "weight": weight}
 
-gsrc = int(raw_input("\nEnter shortest path source:"))
+gsrc = int(input("\nEnter shortest path source:"))
 BellmanFord(graph, V, E, gsrc)

ciphers/affine_cipher.py

@@ -38,8 +38,8 @@ def Dijkstra(graph, V, src):
 
 
 #MAIN
-V = int(raw_input("Enter number of vertices: "))
-E = int(raw_input("Enter number of edges: "))
+V = int(input("Enter number of vertices: "))
+E = int(input("Enter number of edges: "))
 
 graph = [[float('inf') for i in range(V)] for j in range(V)]
 
@@ -48,10 +48,10 @@ def Dijkstra(graph, V, src):
 
 for i in range(E):
 	print("\nEdge ",i+1)
-	src = int(raw_input("Enter source:"))
-	dst = int(raw_input("Enter destination:"))
-	weight = float(raw_input("Enter weight:"))
+	src = int(input("Enter source:"))
+	dst = int(input("Enter destination:"))
+	weight = float(input("Enter weight:"))
 	graph[src][dst] = weight
 
-gsrc = int(raw_input("\nEnter shortest path source:"))
+gsrc = int(input("\nEnter shortest path source:"))
 Dijkstra(graph, V, gsrc)

ciphers/brute-force_caesar_cipher.py renamed to ciphers/brute_force_caesar_cipher.py

@@ -30,8 +30,8 @@ def FloydWarshall(graph, V):
 
 
 #MAIN
-V = int(raw_input("Enter number of vertices: "))
-E = int(raw_input("Enter number of edges: "))
+V = int(input("Enter number of vertices: "))
+E = int(input("Enter number of edges: "))
 
 graph = [[float('inf') for i in range(V)] for j in range(V)]
 
@@ -40,9 +40,9 @@ def FloydWarshall(graph, V):
 
 for i in range(E):
 	print("\nEdge ",i+1)
-	src = int(raw_input("Enter source:"))
-	dst = int(raw_input("Enter destination:"))
-	weight = float(raw_input("Enter weight:"))
+	src = int(input("Enter source:"))
+	dst = int(input("Enter destination:"))
+	weight = float(input("Enter weight:"))
 	graph[src][dst] = weight
 
 FloydWarshall(graph, V)

ciphers/caesar_cipher.py

@@ -1,10 +1,10 @@
 from __future__ import print_function
-num_nodes, num_edges = list(map(int,raw_input().split()))
+num_nodes, num_edges = list(map(int,input().split()))
 
 edges = []
 
 for i in range(num_edges):
-	node1, node2, cost = list(map(int,raw_input().split()))
+	node1, node2, cost = list(map(int,input().split()))
 	edges.append((i,node1,node2,cost))
 
 edges = sorted(edges, key=lambda edge: edge[3])

ciphers/Onepad_Cipher.py renamed to ciphers/onepad_cipher.py

@@ -101,8 +101,8 @@ def deleteMinimum(heap, positions):
     return TreeEdges
 
 # < --------- Prims Algorithm --------- >
-n = int(raw_input("Enter number of vertices: "))
-e = int(raw_input("Enter number of edges: "))
+n = int(input("Enter number of vertices: "))
+e = int(input("Enter number of edges: "))
 adjlist = defaultdict(list)
 for x in range(e):
     l = [int(x) for x in input().split()]

ciphers/Prehistoric Men.txt renamed to ciphers/prehistoric_men.txt

@@ -1,12 +1,12 @@
 from __future__ import print_function
 # n - no of nodes, m - no of edges
-n, m = list(map(int,raw_input().split()))
+n, m = list(map(int,input().split()))
 
 g = [[] for i in range(n)] #graph
 r = [[] for i in range(n)] #reversed graph
 # input graph data (edges)
 for i in range(m):
-    u, v = list(map(int,raw_input().split()))
+    u, v = list(map(int,input().split()))
     g[u].append(v)
     r[v].append(u)
 

ciphers/rsa_cipher.py

@@ -120,5 +120,5 @@ def sign(self, u):
 while True:
     sample = []
     for i in range(3):
-        sample.insert(i, float(raw_input('value: ')))
-    network.sort(sample)
+        sample.insert(i, float(input('value: ')))
+    network.sort(sample)

ciphers/simple_substitution_cipher.py

@@ -1,5 +1,5 @@
 import math
-n = int(raw_input("Enter n: "))
+n = int(input("Enter n: "))
 
 def sieve(n):
     l = [True] * (n+1)
@@ -21,4 +21,4 @@ def sieve(n):
     return prime
 
 print(sieve(n))
-        
+        

ciphers/transposition_cipher.py

@@ -120,5 +120,5 @@ def sign(self, u):
 while True:
     sample = []
     for i in range(3):
-        sample.insert(i, float(raw_input('value: ')))
+        sample.insert(i, float(input('value: ')))
     network.sort(sample)

ciphers/transposition_cipher_encrypt-decrypt_file.py renamed to ciphers/transposition_cipher_encrypt_decrypt_file.py

@@ -37,7 +37,7 @@ def is_balanced(S):
 
 def main():
 
-    S = raw_input("Enter sequence of brackets: ")
+    S = input("Enter sequence of brackets: ")
 
     if is_balanced(S):
         print((S, "is balanced"))

ciphers/vigenere_cipher.py

@@ -19,7 +19,7 @@ def moveDisk(fp,tp):
     print(('moving disk from', fp, 'to', tp))
 
 def main():
-    height = int(raw_input('Height of hanoi: '))
+    height = int(input('Height of hanoi: '))
     moveTower(height, 'A', 'B', 'C')
 
 if __name__ == '__main__':

ciphers/XOR_cipher.py renamed to ciphers/xor_cipher.py

@@ -7,7 +7,7 @@
 e.g. for n=10, we have {2,8}, sum is 10.
 '''
 """Python 3"""
-n = int(raw_input())
+n = int(input())
 a=0
 b=2
 count=0

data_structures/Arrays.py renamed to data_structures/arrays.py

@@ -19,7 +19,7 @@ def isprime(no):
     return True
 
 maxNumber = 0
-n=int(raw_input())
+n=int(input())
 if(isprime(n)):
     print(n)
 else:

data_structures/AVL/AVL.py renamed to data_structures/avl.py

@@ -5,12 +5,7 @@
 '''
 
 from __future__ import print_function
-try:
-    raw_input          # Python 2
-except NameError:
-    raw_input = input  # Python 3
-
-n=int(raw_input())
+n=int(input())
 prime=1
 i=2
 while(i*i<=n):

data_structures/Binary Tree/binary_search_tree.py renamed to data_structures/binary tree/binary_search_tree.py

@@ -4,7 +4,7 @@
 Find the largest palindrome made from the product of two 3-digit numbers which is less than N.
 '''
 from __future__ import print_function
-limit = int(raw_input("limit? "))
+limit = int(input("limit? "))
 
 # fetchs the next number
 for number in range(limit-1,10000,-1):
@@ -26,4 +26,4 @@
                 print(number)
                 exit(0)
 
-            divisor -=1
+            divisor -=1

data_structures/Binary Tree/FenwickTree.py renamed to data_structures/binary tree/fenwick_tree.py

@@ -12,8 +12,8 @@
             arr.append(i*j)
 arr.sort()
 
-n=int(raw_input())
+n=int(input())
 for i in arr[::-1]:
     if(i<n):
         print(i)
-        exit(0)
+        exit(0)

data_structures/Binary Tree/LazySegmentTree.py renamed to data_structures/binary tree/lazy_segment_tree.py

@@ -5,7 +5,7 @@
 '''
 from __future__ import print_function
 
-n = int(raw_input())
+n = int(input())
 i = 0
 while 1:
     i+=n*(n-1)
@@ -18,4 +18,4 @@
         if(i==0):
             i=1
         print(i)
-        break
+        break

data_structures/Binary Tree/SegmentTree.py renamed to data_structures/binary tree/segment_tree

@@ -13,7 +13,7 @@ def gcd(x,y):
 def lcm(x,y):
     return (x*y)//gcd(x,y)
 
-n = int(raw_input())
+n = int(input())
 g=1
 for i in range(1,n+1):
     g=lcm(g,i)

data_structures/Graph/BellmanFord.py renamed to data_structures/graph/bellman_ford.py

@@ -12,9 +12,9 @@
 
 suma = 0
 sumb = 0
-n = int(raw_input())
+n = int(input())
 for i in range(1,n+1):
     suma += i**2
     sumb += i
 sum = sumb**2 - suma
-print(sum)
+print(sum)