wip

Author: luisgsilva950

src_ordenacao_imperador_algoritmo1/main.cc

@@ -12,8 +12,8 @@ void swap(vector<Civilization> &v, int x, int y) {
 }
 
 bool mustSwap(const Civilization &c1, const Civilization &c2) {
-    if (c1.getDistance() > c2.getDistance()) return true;
-    else if (c1.getDistance() < c2.getDistance()) return false;
+    if (c1.getDistance() < c2.getDistance()) return true;
+    else if (c1.getDistance() > c2.getDistance()) return false;
     else {
         if (c1.getSize() > c2.getSize()) return true;
         else return false;

src_ordenacao_imperador_algoritmo2/0.out

@@ -0,0 +1,50 @@
+bDSGcZIaKq 715 969366
+LpElaojxaF 715 864609
+KOkLTrvdMu 715 840337
+ibYDhGlHzM 715 830427
+wwtbyStoDA 715 823399
+tTXmWAgmYH 715 799979
+qslREMheCu 715 798784
+KnbSzMzPwW 715 697292
+xpRqoYGcGJ 715 678948
+FwUkpQjBnr 715 643962
+JEJEQzTIUX 715 611235
+NVDOWtumBS 715 536959
+aLxfhRCqIp 715 519942
+MFxpjSanWK 715 487824
+KZXcBGeDGY 715 434566
+OrBVohrvpC 715 431773
+KjJHlUcVnz 715 352595
+OEUiianXXZ 715 318947
+OYWFlPwKOS 715 299086
+OSpxYKcOPo 715 268765
+vKvGGIqIvN 715 267026
+rBxEuvHACu 715 238474
+OfQcAwuwXi 715 196891
+eirEivyvAa 715 165540
+LpHERtAdzy 715 73227
+JYYdojqsrw 66804 926743
+CeUkDQvPUb 66804 925552
+OLfbxiTyeZ 66804 903846
+UIWKyflVhA 66804 893225
+gVrIvwzugU 66804 793643
+rDvdAAKxpB 66804 777022
+HuRuUNaezV 66804 768210
+SSMqcEYktN 66804 727141
+HtZmRgyItd 66804 707371
+yMqlPlGaDe 66804 667700
+ueckQiHEJV 66804 618270
+kcGCukKfWq 66804 574020
+cWmoVjYpDf 66804 567283
+cVtaKuvjrX 66804 532902
+LKbkqxicwT 66804 528992
+CNlLGWWKQe 66804 445183
+LnVRaCEeUz 66804 198720
+dybfwTOIkH 66804 190358
+uuCqfpqyWR 66804 169839
+JXGfosDsye 66804 113160
+KzoXdmDoDd 66804 108753
+FLIwCXNjMS 66804 103848
+OXwNeawLFx 66804 25641
+LjCcTzhwjx 66804 23219
+zMzmvUGuGh 66804 17828

src_ordenacao_imperador_algoritmo2/Makefile

@@ -12,8 +12,8 @@ void swap(vector<Civilization> &v, int x, int y) {
 }
 
 bool mustSwap(const Civilization &c1, const Civilization &c2) {
-    if (c1.getDistance() > c2.getDistance()) return true;
-    else if (c1.getDistance() < c2.getDistance()) return false;
+    if (c1.getDistance() < c2.getDistance()) return true;
+    else if (c1.getDistance() > c2.getDistance()) return false;
     else {
         if (c1.getSize() > c2.getSize()) return true;
         else return false;

src_ordenacao_imperador_algoritmo2/main.cc

@@ -1,7 +1,7 @@
 EXEC=$1
 TMP_OUT=$2
 
-for i in {0..5..1}; do
+for i in {0..9..1}; do
   testname=$(printf "%01d" $i)
   $EXEC < tests/$testname.in > $TMP_OUT
   if ! diff -qwB tests/$testname.out $TMP_OUT &>/dev/null; then