wip

Author: luisgsilva950

src_ordenacao_alianca_rebelde_algoritmo1/run_tests.sh

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

src_ordenacao_alianca_rebelde_algoritmo2/run_tests.sh

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

src_ordenacao_alianca_rebelde_algoritmo3/main.cc

@@ -16,12 +16,12 @@ bool mustSwap(const Civilization &c1, const Civilization &c2) {
 
 void merge(vector<Civilization> &vec, int low, int high, int mid) {
     int i, j, k;
-    Civilization c[vec.size()];
+    vector<Civilization> c(vec.size());
     i = low;
     k = low;
     j = mid + 1;
     while (i <= mid && j <= high) {
-        if (!mustSwap(vec[i], vec[j])) {
+        if (mustSwap(vec[i], vec[j])) {
             c[k] = vec[i];
             k++;
             i++;

src_ordenacao_alianca_rebelde_algoritmo3/run_tests.sh

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

src_ordenacao_alianca_rebelde_algoritmo3/tp1

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