Merge pull request #10 from AladdinPerzon/UpdateMaster

update

Author: aladdinpersson

Algorithm_tests/dynamic_programming_tests/knapsack_tests/knapsack_tests.py

@@ -0,0 +1,24 @@
+# with open('p01_c.txt') as f_capacity:
+#     capacity = int(f_capacity.readline())
+#
+# with open('p01_p.txt') as f_values:
+#     values = []
+#
+#     for line in f_values:
+#         values.append(int(line))
+#
+# with open('p01_w.txt') as f_weights:
+#     weights = []
+#
+#     for line in f_weights:
+#         weights.append(int(line))
+#
+# num_objects = len(weights)
+# start1=time.time()
+# total_val, items = knapsack(num_objects, capacity, weights, values, [])
+# print(items)
+#
+# print(total_val)
+#
+# print(time.time()-start1)
+# print(KS.knapsack(weights,values).solve(capacity))

Algorithm_tests/dynamic_programming_tests/knapsack_tests/p01_c.txt

@@ -0,0 +1 @@
+165

Algorithm_tests/dynamic_programming_tests/knapsack_tests/p01_p.txt

@@ -0,0 +1,10 @@
+   92
+   57
+   49
+   68
+   60
+   43
+   67
+   84
+   87
+   72

Algorithm_tests/dynamic_programming_tests/knapsack_tests/p01_w.txt

@@ -0,0 +1,10 @@
+   23
+   31
+   29
+   44
+   53
+   38
+   63
+   85
+   89
+   82

Algorithm_tests/dynamic_programming_tests/knapsack_tests/p08_c.txt

@@ -0,0 +1 @@
+6404180

Algorithm_tests/dynamic_programming_tests/knapsack_tests/p08_p.txt

@@ -0,0 +1,24 @@
+ 825594
+1677009
+1676628
+1523970
+ 943972
+  97426
+  69666
+1296457
+1679693
+1902996
+1844992
+1049289
+1252836
+1319836
+ 953277
+2067538
+ 675367
+ 853655
+1826027
+  65731
+ 901489
+ 577243
+ 466257
+ 369261

Algorithm_tests/dynamic_programming_tests/knapsack_tests/p08_w.txt

@@ -0,0 +1,24 @@
+382745
+799601
+909247
+729069
+467902
+ 44328
+ 34610
+698150
+823460
+903959
+853665
+551830
+610856
+670702
+488960
+951111
+323046
+446298
+931161
+ 31385
+496951
+264724
+224916
+169684

Algorithm_tests/sorting_tests/test_sorting.py

@@ -0,0 +1,38 @@
+# import alla sorting algoritms
+
+L1 = [1,2,3,4,5,6,7,8,9]
+L1_sorted = []
+L2 = [9,8,7,6,5,4,3,2,1]
+L2_sorted = []
+L3 = [1,1,1,1,1,1,1,1,1]
+L3_sorted = []
+L4 = [6,7,3,5,1,3]
+L4_sorted = [1,3,3,5,6,7]
+L5 = []
+L5_sorted = []
+
+
+# Bubblesort
+assert sorted(L4) == L4_sorted, "Not correctly sorted"
+assert sorted(L4) == L4_sorted, "Not correctly sorted"
+assert sorted(L4) == L4_sorted, "Not correctly sorted"
+assert sorted(L4) == L4_sorted, "Not correctly sorted"
+assert sorted(L4) == L4_sorted, "Not correctly sorted"
+
+# Selectionsort
+assert sorted(L4) == L4_sorted, "Not correctly sorted"
+assert sorted(L4) == L4_sorted, "Not correctly sorted"
+assert sorted(L4) == L4_sorted, "Not correctly sorted"
+assert sorted(L4) == L4_sorted, "Not correctly sorted"
+assert sorted(L4) == L4_sorted, "Not correctly sorted"
+
+# Heapsort
+
+# Quicksort
+
+# Mergesort
+
+if __name__ == '__main__':
+    pass
+    #run_tests()
+    #print("All tests OK!")