diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 00000000..866f1e13 --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": null +} \ No newline at end of file diff --git a/.vs/Scripted/FileContentIndex/8edec92c-612a-4bca-bc00-f37c79c48934.vsidx b/.vs/Scripted/FileContentIndex/8edec92c-612a-4bca-bc00-f37c79c48934.vsidx new file mode 100644 index 00000000..f37bb512 Binary files /dev/null and b/.vs/Scripted/FileContentIndex/8edec92c-612a-4bca-bc00-f37c79c48934.vsidx differ diff --git a/.vs/Scripted/FileContentIndex/read.lock b/.vs/Scripted/FileContentIndex/read.lock new file mode 100644 index 00000000..e69de29b diff --git a/.vs/Scripted/v17/.suo b/.vs/Scripted/v17/.suo new file mode 100644 index 00000000..f48ffdf6 Binary files /dev/null and b/.vs/Scripted/v17/.suo differ diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 00000000..d0545579 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\C:\\Users\\jolachenal\\Source\\Repos\\Scripted", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 00000000..47fdedcf Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/EnigmePython/trianglepascal.py b/EnigmePython/trianglepascal.py index 131e8814..c1815b7f 100644 --- a/EnigmePython/trianglepascal.py +++ b/EnigmePython/trianglepascal.py @@ -1,19 +1,41 @@ - - -def triangle(n): - if(n==0): - return [] - if(n==1): - return [[1]] - triangle=[[1],[1, 1]] - columns=n - for line in range(2,n): - triangle.append([1]) - for column in range(1, line): - triangle[line].append(triangle[line - 1][column - 1] + triangle[line - 1][column]) - triangle[line].append(1) - return triangle - -print(triangle(0)) -print(triangle(1)) -print(triangle(8)) +import random as r + +def triangleDePascal(n): + if(n==0): + return [] + if(n==1) + return [[1]] + triangle=[[1],[1, 1]] + columns=n + for line in range(2,n): + triangle.append([1]) + for column in range(1, line): + triangle[line].append(triangle[line - 1][column - 1] + triangle[line - 1][column]) + triangle[line].append(1) + return triangle + +#t=triangle(8) +#for line in range(0,7): +# print(t[line]) + +def estTriangleDePascal(n): + if(n==0): + return [] + if(n==1) + return [[1]] + triangle=[[1],[1, 1]] + columns=n + for line in range(2,n): + triangle.append([1]) + for column in range(1, line): + triangle[line].append(triangle[line - 1][column - 1] + triangle[line - 1][column]) + triangle[line].append(1) + return triangle + +def testTriangleDePascal(): + listTest=[0,1,r.randint(5,140)] + for i in listTest + if(triangleDePascal(i)!=estTriangleDePascal(i)) + return False + return True +