From b1890ac7b20d094500bd37f60e9ad8a43a297fcb Mon Sep 17 00:00:00 2001 From: ahviplc Date: Thu, 29 Nov 2018 13:23:28 +0800 Subject: [PATCH 1/6] absMax fix bug. --- Maths/absMax.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Maths/absMax.py b/Maths/absMax.py index 432734ec02c0..5f003d92e519 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] for i in x: - if absVal(i) < j: + if absVal(i) > 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 = [3, 2, -11, -12] + print(absMax(a)) # = -11 if __name__ == '__main__': main() + +""" +print abs Max +""" \ No newline at end of file From faa5f236eb12d204f3efaebb710d8c438df4a1f3 Mon Sep 17 00:00:00 2001 From: ahviplc Date: Thu, 29 Nov 2018 14:52:22 +0800 Subject: [PATCH 2/6] =?UTF-8?q?1:=E5=85=A8=E9=83=A8=E7=AE=97=E6=B3=95=20?= =?UTF-8?q?=E5=BC=80=E6=BA=90=E9=A1=B9=E7=9B=AE=20=E5=AE=8C=E7=BE=8E?= =?UTF-8?q?=EF=BC=812=EF=BC=9A=E8=87=AA=E5=B7=B1=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E5=B0=8F=E8=AF=B4=E6=98=8E=EF=BC=81=20LC=202018?= =?UTF-8?q?=E5=B9=B411=E6=9C=8829=E6=97=A514:50:31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Maths/3n+1.py | 8 ++++++++ Maths/abs.py | 11 +++++++++-- strings/min_cost.txt | 12 ++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 strings/min_cost.txt diff --git a/Maths/3n+1.py b/Maths/3n+1.py index 6424fe0d8f15..10f9f9d52f73 100644 --- a/Maths/3n+1.py +++ b/Maths/3n+1.py @@ -13,7 +13,15 @@ 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() + +""" +算法题： + +输入一个数，偶数时则砍掉一半；奇数时，则（3n+1）砍掉一半，最后直到得到1.问，进行了多少次？ + +""" \ No newline at end of file diff --git a/Maths/abs.py b/Maths/abs.py index 5b758f8389b4..f08c76480c8e 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,10 @@ def main(): 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 From e03a3a6ee111a278c911efae1c4a105edebebbf5 Mon Sep 17 00:00:00 2001 From: ahviplc Date: Thu, 29 Nov 2018 14:55:03 +0800 Subject: [PATCH 3/6] import error,fix it.just make it better. --- Maths/absMin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Maths/absMin.py b/Maths/absMin.py index a353be4ceb8f..04b7c3bf3109 100644 --- a/Maths/absMin.py +++ b/Maths/absMin.py @@ -1,9 +1,9 @@ -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]) From d4d30de183386ab1c2e2f16220b582a439dacb20 Mon Sep 17 00:00:00 2001 From: ahviplc Date: Tue, 4 Dec 2018 14:53:53 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1:=E6=9C=80=E5=A4=A7=E7=BB=9D=E5=AF=B9?= =?UTF-8?q?=E5=80=BC=E4=B8=8E=E6=9C=80=E5=B0=8F=E7=BB=9D=E5=AF=B9=E5=80=BC?= =?UTF-8?q?=EF=BC=8C=E8=BE=93=E5=87=BA=E7=9A=84=E6=98=AF=E5=85=B6=E7=BB=9D?= =?UTF-8?q?=E5=AF=B9=E5=80=BC=E6=9C=80=E5=A4=A7=E5=92=8C=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E9=82=A3=E4=B8=AA=E6=95=B0=EF=BC=81?= =?UTF-8?q?=20LC=202018=E5=B9=B412=E6=9C=884=E6=97=A514:53:27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Maths/absMax.py | 8 ++++---- Maths/absMin.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Maths/absMax.py b/Maths/absMax.py index 5f003d92e519..a7bb2882dcd8 100644 --- a/Maths/absMax.py +++ b/Maths/absMax.py @@ -7,17 +7,17 @@ def absMax(x): >>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 = [3, 2, -11, -12] - print(absMax(a)) # = -11 + a = [-13, 2, -11, -12] + print(absMax(a)) # = -13 if __name__ == '__main__': main() diff --git a/Maths/absMin.py b/Maths/absMin.py index 04b7c3bf3109..2cdb63428661 100644 --- a/Maths/absMin.py +++ b/Maths/absMin.py @@ -6,14 +6,14 @@ def absMin(x): # >>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] + a = [-3,-1,2,-11] print(absMin(a)) # = 1 if __name__ == '__main__': From 5969cbed61774e6a38f7c52a156b7756afe1ec86 Mon Sep 17 00:00:00 2001 From: ahviplc Date: Tue, 4 Dec 2018 15:38:42 +0800 Subject: [PATCH 5/6] Remove Chinese remarks. --- Maths/3n+1.py | 6 ------ Maths/abs.py | 5 ----- 2 files changed, 11 deletions(-) diff --git a/Maths/3n+1.py b/Maths/3n+1.py index 10f9f9d52f73..ae175e28d40c 100644 --- a/Maths/3n+1.py +++ b/Maths/3n+1.py @@ -19,9 +19,3 @@ def n31(a):# a = initial number if __name__ == '__main__': main() -""" -算法题： - -输入一个数，偶数时则砍掉一半；奇数时，则（3n+1）砍掉一半，最后直到得到1.问，进行了多少次？ - -""" \ No newline at end of file diff --git a/Maths/abs.py b/Maths/abs.py index f08c76480c8e..dc97c2b351c4 100644 --- a/Maths/abs.py +++ b/Maths/abs.py @@ -17,9 +17,4 @@ def main(): if __name__ == '__main__': main() -""" - -绝对值 - -""" From 7cdc28a353b41dfa666378e7c6cbd3b6f1fe4b5b Mon Sep 17 00:00:00 2001 From: ahviplc Date: Tue, 4 Dec 2018 16:13:51 +0800 Subject: [PATCH 6/6] Modify the comments for the print demo. --- Maths/absMin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Maths/absMin.py b/Maths/absMin.py index 2cdb63428661..7eaecc060222 100644 --- a/Maths/absMin.py +++ b/Maths/absMin.py @@ -14,7 +14,7 @@ def absMin(x): def main(): a = [-3,-1,2,-11] - print(absMin(a)) # = 1 + print(absMin(a)) # = -1 if __name__ == '__main__': main()