diff --git a/Maths/3n+1.py b/Maths/3n+1.py index 6424fe0d8f15..ae175e28d40c 100644 --- a/Maths/3n+1.py +++ b/Maths/3n+1.py @@ -13,7 +13,9 @@ def n31(a):# a = initial number return l , c print(n31(43)) print(n31(98)[0][-1])# = a + print(n31(13)) print("It took {0} steps.".format(n31(13)[1]))#optional finish if __name__ == '__main__': main() + diff --git a/Maths/abs.py b/Maths/abs.py index 5b758f8389b4..dc97c2b351c4 100644 --- a/Maths/abs.py +++ b/Maths/abs.py @@ -1,9 +1,9 @@ def absVal(num): """ Function to fins absolute value of numbers. - >>>absVal(-5) + #>>>absVal(-5) 5 - >>>absVal(0) + #>>>absVal(0) 0 """ if num < 0: @@ -16,3 +16,5 @@ def main(): if __name__ == '__main__': main() + + diff --git a/Maths/absMax.py b/Maths/absMax.py index 432734ec02c0..a7bb2882dcd8 100644 --- a/Maths/absMax.py +++ b/Maths/absMax.py @@ -1,22 +1,27 @@ -from abs import absVal +from Maths.abs import absVal + def absMax(x): """ - >>>absMax([0,5,1,11]) + #>>>absMax([0,5,1,11]) 11 >>absMax([3,-10,-2]) -10 """ - j = x[0] + j =x[0] for i in x: - if absVal(i) < j: + if absVal(i) > absVal(j): j = i return j #BUG: i is apparently a list, TypeError: '<' not supported between instances of 'list' and 'int' in absVal - + #BUG fix def main(): - a = [1,2,-11] - print(absVal(a)) # = -11 + a = [-13, 2, -11, -12] + print(absMax(a)) # = -13 if __name__ == '__main__': main() + +""" +print abs Max +""" \ No newline at end of file diff --git a/Maths/absMin.py b/Maths/absMin.py index a353be4ceb8f..7eaecc060222 100644 --- a/Maths/absMin.py +++ b/Maths/absMin.py @@ -1,20 +1,20 @@ -from abs import absVal +from Maths.abs import absVal def absMin(x): """ - >>>absMin([0,5,1,11]) + # >>>absMin([0,5,1,11]) 0 - >>absMin([3,-10,-2]) + # >>absMin([3,-10,-2]) -2 """ - j = absVal(x[0]) + j = x[0] for i in x: - if absVal(i) < j: + if absVal(i) < absVal(j): j = i return j def main(): - a = [1,2,-11] - print(absMin(a)) # = 1 + a = [-3,-1,2,-11] + print(absMin(a)) # = -1 if __name__ == '__main__': main() diff --git a/strings/min_cost.txt b/strings/min_cost.txt new file mode 100644 index 000000000000..0f4510eb8ecc --- /dev/null +++ b/strings/min_cost.txt @@ -0,0 +1,12 @@ +Insert A APython +Insert l AlPython +Insert g AlgPython +Insert o AlgoPython +Replace P with r Algorython +Replace y with i Algorithon +Copy t Algorithon +Copy h Algorithon +Replace o with m Algorithmn +Replace n with s Algorithms + +Minimum cost: 10 \ No newline at end of file