Merge branch 'ShellSort' into sortingFinal

Merge ShellSort

sorting.py

@@ -72,7 +72,29 @@ def quickSort(lista):
 
 def shellSort(lista):
 	#definan el algoritmo de ordenamiento shellsort
+	Size = len(lista) # Contains the complete size of the list
+	Diff = Size/2 # Contains the number of half of the list
+
+	# Does a insertion sort by ordering in base of the Diff.
+	while Diff > 0:
+		# Begins a loop to sort the elements added to sorted array.
+		for i in range(Diff, Size):
+			# Saves the element sorted in a temporary variable
+			Tmp = lista[i]
+			j = i # Shifts the location of the elements
+			# Looks for the locations
+			while j >= Diff and lista[j - Diff] > Tmp:
+				# Gives the new element to the location
+				lista[j] = lista[j - Diff]
+				# The size of the array is ajusted
+				j -= Diff
+			# Puts the Tmp variable in is correct location
+			lista[j] = Tmp
+		# Reduces again the list
+		Diff /= 2
+
 	return lista
+	# Code was taken from GeeksforGeeks
 
 maxValor=1000 	#define el valor maximo de los elementos de la lista
 largoLista=1000 #define el largo de las listas a ordenar