Day 4 coding

Day2/README.md

@@ -662,7 +662,16 @@ if d==e:
 else:
     print("Not a pallindrome")
 ```
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+=======
 
+>>>>>>> 59b8bd388e0854765c3122d6e802a85978004667
+=======
+
+>>>>>>> 6aef1378d44840c82d996e7d0ad58664d70abeae
 ## Ruby implementation
 
 ### [palindrome.rb](./Ruby/palindrome.rb)
@@ -680,3 +689,4 @@ end
 ```
 
 
+

Day3/README.md

@@ -282,6 +282,7 @@ else:
     print("Hamming Distance = ", HD)
 ```
 ##Python Implementation
+<<<<<<< HEAD
 
 ### [Solution](./Python/Shashankham.py)
 ``` Python
@@ -290,6 +291,16 @@ else:
  * @date: 24/12/2018
 """
 
+=======
+
+### [Solution](./Python/Shashankham.py)
+``` Python
+"""
+ * @author: Shashank Jain
+ * @date: 24/12/2018
+"""
+
+>>>>>>> 59b8bd388e0854765c3122d6e802a85978004667
 a=input("Enter the first string?")
 b=input("Enter the second string?")
 c=list(a.replace(" ",""))

day4/Python/Shashankchar.py

@@ -0,0 +1,16 @@
+"""
+* @author: Shashank Jain
+* @date: 25/12/2018
+"""
+a=input("Enter the string to count frequent occuring characters?")
+b=list(a.replace(" ","").lower())
+c=[]
+for i in b:
+    d=(i,b.count(i))
+    c.append(d)
+
+e=dict(list(set(c)))
+f=max(e)
+g=max(e.values())
+print("maximum occurence is of {0}:{1}".format(f,g))
+

day4/Python/Shashankvowel.py

@@ -0,0 +1,14 @@
+""" 
+ * @author: Shashank Jain
+ * @date: 25/12/2018
+"""
+a=input("Enter the string to count no. of vowels?")
+b=list(a.replace(" ","").lower())
+c=['a','e','i','o','u']
+count=0
+for i in b:
+    for j in c:
+        if (j==i):
+            count=count+1
+print(count)
+

day4/README.md

@@ -239,10 +239,26 @@ for char in string:
 # Print the result
 print("Number of vowels in the string are : ",count)
 
+```
+##Python Implementation
+##[Solution](./Python/Shashankvowels.py)
+""" 
+ * @author: Shashank Jain
+ * @date: 25/12/2018
+"""
+```Python
+a=input("Enter the string to count no. of vowels?")
+b=list(a.replace(" ","").lower())
+c=['a','e','i','o','u']
+count=0
+for i in b:
+    for j in c:
+        if (j==i):
+            count=count+1
+print(count)
 ```
 
-<hr/>
-
+</hr>
 ## Part B -- Max Chars Problem
 
 **Question** - Given a string, write a program to return the character that appears most frequently in that string
@@ -342,5 +358,24 @@ print("The most occouring character in the string is : ", max(characters,key=cha
 
 ```
 
+##Python Implementation
+###[Solution] (./Python/Shashankchar.py)
+"""
+* @author: Shashank Jain
+* @date: 25/12/2018
+"""
+``` Python
+a=input("Enter the string to count frequent occuring characters?")
+b=list(a.replace(" ","").lower())
+c=[]
+for i in b:
+    d=(i,b.count(i))
+    c.append(d)
+
+e=dict(list(set(c)))
+f=max(e)
+g=max(e.values())
+print("maximum occurence is of {0}:{1}".format(f,g))
+```