finalizado

JulianaDantass · Oct 30, 2023 · 402d991 · 402d991
1 parent 99d4ff4
commit 402d991
Show file tree

Hide file tree

Showing 328 changed files with 3,089 additions and 58 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/apa.pdf b/apa.pdf
diff --git a/objetos/heuristica.o b/objetos/heuristica.o
diff --git a/objetos/instancia.o b/objetos/instancia.o
diff --git a/objetos/main.o b/objetos/main.o
diff --git a/objetos/veiculo.o b/objetos/veiculo.o
diff --git a/resultados/10exec/saida-n120k7_A.txt b/resultados/10exec/saida-n120k7_A.txt
@@ -0,0 +1,10 @@
+4192
+671
+1004
+2517
+
+75 77 1 87 51 41 119 8 59 15 17 37 61 65 67 40 12 97 19 63 25 92 90 70 43 58 89 10 11 116 42 38 55 5 69 64 56 52 46 113 66 68 72 13 16 3 120 23 108 18 7 98 103 54 82 39 14 102 99 86 115 83 74 30 96 
+
+2
+106 107 104 100 71 73 76 78 79 60 62 50 47 49 32 35 36 34 33 27 24 20 21 9 6 4 2 118 91 93 85 117 81 111 88 
+95 105 101 94 110 80 53 57 45 48 44 29 31 22 28 26 109 114 84 112 
diff --git a/resultados/10exec/saida-n120k7_B.txt b/resultados/10exec/saida-n120k7_B.txt
@@ -0,0 +1,10 @@
+6198
+671
+3010
+2517
+
+75 77 1 87 51 41 119 8 59 15 17 37 61 65 67 40 12 97 19 63 25 92 90 70 43 58 89 10 11 116 42 38 55 5 69 64 56 52 46 113 66 68 72 13 16 3 120 23 108 18 7 98 103 54 82 39 14 102 99 86 115 83 74 30 96 
+
+2
+106 107 104 100 71 73 76 78 79 60 62 50 47 49 32 35 36 34 33 27 24 20 21 9 6 4 2 118 91 93 85 117 81 111 88 
+95 105 101 94 110 80 53 57 45 48 44 29 31 22 28 26 109 114 84 112 
diff --git a/resultados/10exec/saida-n120k7_C.txt b/resultados/10exec/saida-n120k7_C.txt
@@ -0,0 +1,12 @@
+8502
+1126
+6020
+1356
+
+64 77 1 3 51 41 119 8 59 15 17 37 61 65 67 40 12 72 19 63 25 16 48 70 43 58 66 52 11 26 42 38 55 5 68 
+
+4
+106 107 104 100 110 71 76 78 79 60 62 50 47 49 32 35 36 34 33 27 28 23 20 21 9 6 4 2 118 91 93 117 81 111 88 
+95 105 101 94 115 80 56 53 54 57 45 44 46 29 31 7 83 113 112 82 
+96 99 103 116 98 74 73 39 30 24 22 13 14 10 108 84 85 86 
+120 102 69 75 97 109 114 18 90 89 92 87 
diff --git a/resultados/10exec/saida-n120k7_D.txt b/resultados/10exec/saida-n120k7_D.txt
@@ -0,0 +1,9 @@
+4481
+306
+502
+3673
+
+75 77 1 106 51 41 119 8 59 15 17 37 61 65 67 40 12 71 19 63 25 60 90 70 43 58 89 10 11 49 42 38 55 5 69 64 62 52 27 109 66 68 72 13 16 3 120 23 108 18 22 98 103 54 82 39 14 102 99 86 115 83 74 30 96 7 113 53 46 116 56 80 44 21 84 94 95 29 101 45 73 57 112 105 24 78 110 104 81 117 100 2 107 93 
+
+1
+87 97 76 79 48 50 47 32 35 36 34 33 31 28 26 20 9 4 6 118 114 91 92 85 111 88 
diff --git a/resultados/saida-n14k5_A.txt → resultados/10exec/saida-n14k5_A.txt b/resultados/saida-n14k5_A.txt → resultados/10exec/saida-n14k5_A.txt
diff --git a/resultados/saida-n14k5_B.txt → resultados/10exec/saida-n14k5_B.txt b/resultados/saida-n14k5_B.txt → resultados/10exec/saida-n14k5_B.txt
diff --git a/resultados/10exec/saida-n14k5_C.txt b/resultados/10exec/saida-n14k5_C.txt
@@ -0,0 +1,10 @@
+828
+394
+282
+152
+
+13 2 4 
+
+2
+6 3 11 8 9 10 5 
+14 7 1 12 
diff --git a/resultados/10exec/saida-n14k5_D.txt b/resultados/10exec/saida-n14k5_D.txt
@@ -0,0 +1,9 @@
+471
+226
+47
+198
+
+12 8 10 1 13 9 5 11 6 
+
+1
+7 3 2 4 14 
diff --git a/resultados/saida-n199k17_A.txt → resultados/10exec/saida-n199k17_A.txt b/resultados/saida-n199k17_A.txt → resultados/10exec/saida-n199k17_A.txt
diff --git a/resultados/saida-n199k17_B.txt → resultados/10exec/saida-n199k17_B.txt b/resultados/saida-n199k17_B.txt → resultados/10exec/saida-n199k17_B.txt
@@ -1,12 +1,12 @@
-14960
-1015
+14948
+1003
 9776
 4169
 
 85 118 161 48 68 86 190 164 39 154 49 102 23 178 159 175 182 125 120 171 59 31 174 168 196 141 183 47 152 81 160 134 5 34 72 181 147 67 66 188 133 13 79 113 108 32 93 180 170 114 195 61 155 30 65 198 167 14 95 197 4 111 156 16 12 166 107 62 130 184 176 58 54 44 75 151 193 22 149 194 148 19 177 77 135 26 103 158 162 144 189 139 9 123 38 50 45 82 10 116 127 138 106 89 71 157 169 191 53 187 128 
 
 4
-146 69 101 70 90 126 7 36 46 199 60 84 17 173 91 140 43 42 37 92 6 117 2 57 41 74 56 110 25 55 165 24 29 121 129 78 35 136 
-137 40 21 73 15 98 99 104 96 8 124 64 20 51 33 185 80 150 1 132 52 
+146 69 101 70 90 126 7 36 46 199 60 84 17 173 91 140 43 15 42 92 6 117 2 57 41 74 56 110 25 55 165 24 29 121 129 78 35 136 
+40 21 73 137 96 99 104 37 98 8 124 64 20 51 33 185 80 150 1 132 52 
 88 153 18 83 143 11 63 131 122 3 163 179 186 145 172 142 119 192 
 27 28 76 109 105 115 87 100 97 94 112 
diff --git a/resultados/10exec/saida-n199k17_C.txt b/resultados/10exec/saida-n199k17_C.txt
@@ -0,0 +1,15 @@
+21177
+1484
+17108
+2585
+
+85 118 161 48 68 86 193 164 39 154 49 102 23 178 159 151 22 125 120 171 59 31 174 75 196 141 183 47 152 81 160 134 5 87 72 181 147 67 66 188 133 13 79 113 108 32 93 180 170 114 195 149 155 30 65 198 167 14 95 197 4 111 156 16 12 166 107 62 130 184 176 58 54 44 
+
+7
+146 69 101 70 90 126 7 36 46 199 60 84 17 173 91 140 43 15 42 92 6 117 2 57 41 74 56 110 25 55 165 24 29 121 129 78 35 136 
+40 73 115 137 99 104 98 37 119 8 143 64 63 122 51 34 163 80 150 1 52 
+153 106 124 168 131 20 103 33 185 109 179 139 145 172 192 97 96 
+21 187 186 144 142 38 191 61 162 128 71 135 9 132 
+18 82 45 83 100 105 76 116 77 158 3 50 27 
+89 19 175 11 10 189 157 169 177 26 138 28 53 
+127 190 88 148 182 123 194 94 112 
diff --git a/resultados/saida-n199k17_D.txt → resultados/10exec/saida-n199k17_D.txt b/resultados/saida-n199k17_D.txt → resultados/10exec/saida-n199k17_D.txt
diff --git a/resultados/10exec/saida-n22k3_A.txt b/resultados/10exec/saida-n22k3_A.txt
@@ -0,0 +1,9 @@
+680
+444
+87
+149
+
+10 17 19 14 7 
+
+1
+18 20 22 15 16 3 2 1 6 11 13 9 8 5 4 21 12 
diff --git a/resultados/10exec/saida-n22k3_B.txt b/resultados/10exec/saida-n22k3_B.txt
@@ -0,0 +1,9 @@
+852
+444
+259
+149
+
+10 17 19 14 7 
+
+1
+18 20 22 15 16 3 2 1 6 11 13 9 8 5 4 21 12 
diff --git a/resultados/10exec/saida-n22k3_C.txt b/resultados/10exec/saida-n22k3_C.txt
@@ -0,0 +1,9 @@
+856
+432
+259
+165
+
+10 12 19 14 7 
+
+1
+18 20 22 17 15 16 3 2 1 6 11 13 9 8 5 4 21 
diff --git a/resultados/10exec/saida-n22k3_D.txt b/resultados/10exec/saida-n22k3_D.txt
@@ -0,0 +1,9 @@
+984
+253
+87
+644
+
+18 9 19 14 4 20 7 12 5 13 17 11 21 16 15 8 1 
+
+1
+22 3 2 6 10 
diff --git a/resultados/saida-n31k5_A.txt → resultados/10exec/saida-n31k5_A.txt b/resultados/saida-n31k5_A.txt → resultados/10exec/saida-n31k5_A.txt
diff --git a/resultados/10exec/saida-n31k5_B.txt b/resultados/10exec/saida-n31k5_B.txt
@@ -0,0 +1,9 @@
+1666
+380
+416
+870
+
+19 24 25 15 12 2 27 1 17 4 16 7 9 13 28 21 11 
+
+1
+30 26 14 6 31 3 23 8 18 22 29 10 5 20 
diff --git a/resultados/10exec/saida-n31k5_C.txt b/resultados/10exec/saida-n31k5_C.txt
@@ -0,0 +1,10 @@
+2007
+607
+832
+568
+
+19 24 25 15 12 2 27 1 17 4 16 
+
+2
+14 26 13 21 31 3 23 8 18 22 29 10 5 20 
+30 7 6 28 11 9 
diff --git a/resultados/10exec/saida-n31k5_D.txt b/resultados/10exec/saida-n31k5_D.txt
@@ -0,0 +1,9 @@
+1248
+249
+139
+860
+
+19 3 25 20 12 2 27 1 17 4 8 7 9 13 28 23 11 21 6 31 10 
+
+1
+30 16 26 24 14 18 22 15 29 5 
diff --git a/resultados/10exec/saida-n43k6_A.txt b/resultados/10exec/saida-n43k6_A.txt
@@ -0,0 +1,10 @@
+1856
+530
+404
+922
+
+16 25 27 30 37 2 31 40 29 14 23 36 6 43 8 28 13 17 10 42 35 
+
+2
+41 38 9 22 3 12 39 26 11 32 21 5 24 15 7 
+4 34 1 18 20 33 19 
diff --git a/resultados/10exec/saida-n43k6_B.txt b/resultados/10exec/saida-n43k6_B.txt
@@ -0,0 +1,10 @@
+2661
+531
+1208
+922
+
+16 25 27 30 37 2 31 40 29 14 23 36 6 43 8 28 13 17 10 42 35 
+
+2
+41 38 9 22 3 12 1 18 20 26 11 21 24 15 7 
+19 5 32 33 39 34 4 
diff --git a/resultados/10exec/saida-n43k6_C.txt b/resultados/10exec/saida-n43k6_C.txt
@@ -0,0 +1,11 @@
+3306
+901
+1812
+593
+
+16 25 27 30 37 28 31 4 19 14 23 36 8 43 
+
+3
+41 38 9 22 3 12 39 1 18 11 32 21 24 15 7 
+13 29 40 35 20 26 33 5 
+2 6 17 10 42 34 
diff --git a/resultados/10exec/saida-n43k6_D.txt b/resultados/10exec/saida-n43k6_D.txt
@@ -0,0 +1,9 @@
+1856
+226
+202
+1428
+
+16 18 27 30 37 26 31 4 19 14 23 36 6 43 8 28 34 17 10 42 35 39 29 13 40 20 32 5 7 22 11 1 
+
+1
+2 41 38 9 25 3 12 33 21 24 15 
diff --git a/resultados/saida-n64k9_A.txt → resultados/10exec/saida-n64k9_A.txt b/resultados/saida-n64k9_A.txt → resultados/10exec/saida-n64k9_A.txt
@@ -1,10 +1,10 @@
-2665
-611
+2651
+597
 562
 1492
 
 9 20 44 56 53 43 31 2 17 63 60 30 23 24 14 6 55 58 36 8 34 10 25 62 28 3 27 37 40 59 47 29 64 41 49 16 
 
 2
-39 11 48 57 12 13 19 52 21 32 61 42 38 35 45 5 26 46 51 
-7 54 1 33 18 50 4 22 15 
+11 48 57 13 19 52 21 45 32 61 42 38 50 35 4 22 26 46 51 
+39 7 54 33 1 12 18 5 15 
diff --git a/resultados/saida-n64k9_B.txt → resultados/10exec/saida-n64k9_B.txt b/resultados/saida-n64k9_B.txt → resultados/10exec/saida-n64k9_B.txt
diff --git a/resultados/10exec/saida-n64k9_C.txt b/resultados/10exec/saida-n64k9_C.txt
@@ -0,0 +1,12 @@
+5385
+1004
+3368
+1013
+
+9 20 44 56 53 43 31 2 17 63 28 30 23 24 54 6 55 58 36 8 62 10 25 
+
+4
+39 11 48 57 12 13 19 52 32 61 42 38 45 35 4 22 26 46 51 
+7 33 1 18 16 50 14 15 49 
+64 47 5 40 59 21 29 
+34 27 3 37 60 41 
diff --git a/resultados/saida-n64k9_D.txt → resultados/10exec/saida-n64k9_D.txt b/resultados/saida-n64k9_D.txt → resultados/10exec/saida-n64k9_D.txt
diff --git a/resultados/saida-n9k5_A.txt → resultados/10exec/saida-n9k5_A.txt b/resultados/saida-n9k5_A.txt → resultados/10exec/saida-n9k5_A.txt
diff --git a/resultados/10exec/saida-n9k5_B.txt b/resultados/10exec/saida-n9k5_B.txt
@@ -0,0 +1,9 @@
+559
+253
+117
+189
+
+2 7 1 9 
+
+1
+5 8 4 3 6 
diff --git a/resultados/10exec/saida-n9k5_C.txt b/resultados/10exec/saida-n9k5_C.txt
@@ -0,0 +1,10 @@
+672
+333
+234
+105
+
+2 4 
+
+2
+5 9 8 3 6 
+1 7 
diff --git a/resultados/10exec/saida-n9k5_D.txt b/resultados/10exec/saida-n9k5_D.txt
@@ -0,0 +1,9 @@
+471
+234
+39
+198
+
+2 4 6 9 8 
+
+1
+1 7 3 5 
diff --git a/resultados/1exec/saida-n120k7_A.txt b/resultados/1exec/saida-n120k7_A.txt
@@ -0,0 +1,10 @@
+4192
+671
+1004
+2517
+
+75 77 1 87 51 41 119 8 59 15 17 37 61 65 67 40 12 97 19 63 25 92 90 70 43 58 89 10 11 116 42 38 55 5 69 64 56 52 46 113 66 68 72 13 16 3 120 23 108 18 7 98 103 54 82 39 14 102 99 86 115 83 74 30 96 
+
+2
+106 107 104 100 71 73 76 78 79 60 62 50 47 49 32 35 36 34 33 27 24 20 21 9 6 4 2 118 91 93 85 117 81 111 88 
+95 105 101 94 110 80 53 57 45 48 44 29 31 22 28 26 109 114 84 112 
diff --git a/resultados/1exec/saida-n120k7_B.txt b/resultados/1exec/saida-n120k7_B.txt
@@ -0,0 +1,10 @@
+6198
+671
+3010
+2517
+
+75 77 1 87 51 41 119 8 59 15 17 37 61 65 67 40 12 97 19 63 25 92 90 70 43 58 89 10 11 116 42 38 55 5 69 64 56 52 46 113 66 68 72 13 16 3 120 23 108 18 7 98 103 54 82 39 14 102 99 86 115 83 74 30 96 
+
+2
+106 107 104 100 71 73 76 78 79 60 62 50 47 49 32 35 36 34 33 27 24 20 21 9 6 4 2 118 91 93 85 117 81 111 88 
+95 105 101 94 110 80 53 57 45 48 44 29 31 22 28 26 109 114 84 112 
diff --git a/resultados/1exec/saida-n120k7_C.txt b/resultados/1exec/saida-n120k7_C.txt
@@ -0,0 +1,12 @@
+8489
+1113
+6020
+1356
+
+64 77 1 3 51 41 119 8 59 15 17 37 61 65 67 40 12 72 19 63 25 16 48 70 43 58 66 52 11 26 42 38 55 5 68 
+
+4
+106 107 104 100 110 71 76 78 79 60 62 50 47 49 32 35 36 34 33 27 28 23 20 21 9 6 4 2 118 91 93 117 81 111 88 
+95 105 101 94 115 80 56 53 54 57 45 44 46 29 31 30 22 83 113 112 
+102 96 99 103 116 98 74 73 39 24 13 14 10 7 108 84 85 86 
+120 69 75 97 109 114 18 90 89 92 87 82 
diff --git a/resultados/1exec/saida-n120k7_D.txt b/resultados/1exec/saida-n120k7_D.txt
@@ -0,0 +1,9 @@
+4481
+306
+502
+3673
+
+75 77 1 106 51 41 119 8 59 15 17 37 61 65 67 40 12 71 19 63 25 60 90 70 43 58 89 10 11 49 42 38 55 5 69 64 62 52 27 109 66 68 72 13 16 3 120 23 108 18 22 98 103 54 82 39 14 102 99 86 115 83 74 30 96 7 113 53 46 116 56 80 44 21 84 94 95 29 101 45 73 57 112 105 24 78 110 104 81 117 100 2 107 93 
+
+1
+87 97 76 79 48 50 47 32 35 36 34 33 31 28 26 20 9 4 6 118 114 91 92 85 111 88 
diff --git a/resultados/1exec/saida-n14k5_A.txt b/resultados/1exec/saida-n14k5_A.txt
@@ -0,0 +1,9 @@
+545
+269
+47
+229
+
+12 11 4 1 13 9 7 
+
+1
+14 6 3 2 8 10 5 
diff --git a/resultados/1exec/saida-n14k5_B.txt b/resultados/1exec/saida-n14k5_B.txt
@@ -0,0 +1,9 @@
+639
+269
+141
+229
+
+12 11 4 1 13 9 7 
+
+1
+14 6 3 2 8 10 5 
diff --git a/resultados/1exec/saida-n14k5_C.txt b/resultados/1exec/saida-n14k5_C.txt
@@ -0,0 +1,10 @@
+828
+394
+282
+152
+
+13 2 4 
+
+2
+6 3 11 8 9 10 5 
+14 7 1 12 
diff --git a/resultados/1exec/saida-n14k5_D.txt b/resultados/1exec/saida-n14k5_D.txt
@@ -0,0 +1,9 @@
+471
+226
+47
+198
+
+12 8 10 1 13 9 5 11 6 
+
+1
+7 3 2 4 14
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,9 @@
		4481
		306
		502
		3673

		75 77 1 106 51 41 119 8 59 15 17 37 61 65 67 40 12 71 19 63 25 60 90 70 43 58 89 10 11 49 42 38 55 5 69 64 62 52 27 109 66 68 72 13 16 3 120 23 108 18 22 98 103 54 82 39 14 102 99 86 115 83 74 30 96 7 113 53 46 116 56 80 44 21 84 94 95 29 101 45 73 57 112 105 24 78 110 104 81 117 100 2 107 93

		1
		87 97 76 79 48 50 47 32 35 36 34 33 31 28 26 20 9 4 6 118 114 91 92 85 111 88
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,9 @@
		680
		444
		87
		149

		10 17 19 14 7

		1
		18 20 22 15 16 3 2 1 6 11 13 9 8 5 4 21 12
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,9 @@
		856
		432
		259
		165

		10 12 19 14 7

		1
		18 20 22 17 15 16 3 2 1 6 11 13 9 8 5 4 21
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,9 @@
		984
		253
		87
		644

		18 9 19 14 4 20 7 12 5 13 17 11 21 16 15 8 1

		1
		22 3 2 6 10
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,9 @@
		1666
		380
		416
		870

		19 24 25 15 12 2 27 1 17 4 16 7 9 13 28 21 11

		1
		30 26 14 6 31 3 23 8 18 22 29 10 5 20
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,9 @@
		1248
		249
		139
		860

		19 3 25 20 12 2 27 1 17 4 8 7 9 13 28 23 11 21 6 31 10

		1
		30 16 26 24 14 18 22 15 29 5
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,9 @@
		1856
		226
		202
		1428

		16 18 27 30 37 26 31 4 19 14 23 36 6 43 8 28 34 17 10 42 35 39 29 13 40 20 32 5 7 22 11 1

		1
		2 41 38 9 25 3 12 33 21 24 15
-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+4
+9 8 3 6
+7