From 3443622d947092b3123d32f2aa511d69c659c7c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20M=2E=20Thi=C3=A9ry?= <nthiery@users.sf.net>
Date: Mon, 15 Dec 2014 22:26:06 +0100
Subject: [PATCH] WIMS: Correctif bug exos avec plusieurs entrees valides +
ajout alerte automatique
---
test~coding~readingCppPrograms.fr/Makefile | 10 +++++++---
.../data/vector2D_1_input.cpp | 3 ++-
.../data/vector2D_2_input.cpp | 3 ++-
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/test~coding~readingCppPrograms.fr/Makefile b/test~coding~readingCppPrograms.fr/Makefile
index b854647..9e638fb 100644
--- a/test~coding~readingCppPrograms.fr/Makefile
+++ b/test~coding~readingCppPrograms.fr/Makefile
@@ -11,8 +11,12 @@ data/index: $(PROGRAMS)
done
data/%.answer: data/%.bin
- if echo $< | grep -q _input.cpp; then \
- for i in `seq 0 99`; do if [ x`echo $$i | $<` = 'x42' ]; then echo $$i; fi; done > $@; \
+ @if echo $< | grep -q _input.cpp; then \
+ count=0; \
+ for i in `seq 0 99`; do if [ x`echo $$i | $<` = 'x42' ]; then echo $$i; count=$$((count+1)); fi; done > $@; \
+ if [ $$count != 1 ]; then \
+ echo "ATTENTION IL N'Y A PAS EXACTEMENT UNE BONNE RÉPONSE pour $<"; \
+ fi; \
else \
./$< > $@; \
fi
@@ -21,7 +25,7 @@ data/%.cpp.bin: data/%.cpp
g++ -Wall -Wno-sign-compare -Wno-unused-value -pedantic -std=c++11 $< -o $@
clean:
- rm data/*.bin data/*.answer data/index
+ -rm data/*.bin data/*.answer data/index
# Pour restauration
archive:
diff --git a/test~coding~readingCppPrograms.fr/data/vector2D_1_input.cpp b/test~coding~readingCppPrograms.fr/data/vector2D_1_input.cpp
index 47a7824..b3155e4 100644
--- a/test~coding~readingCppPrograms.fr/data/vector2D_1_input.cpp
+++ b/test~coding~readingCppPrograms.fr/data/vector2D_1_input.cpp
@@ -12,5 +12,6 @@ int main(void) {
};
int j;
cin >> j;
- cout << tab[3][j] << endl;
+ if (0<=j and j<5)
+ cout << tab[3][j] << endl;
}
diff --git a/test~coding~readingCppPrograms.fr/data/vector2D_2_input.cpp b/test~coding~readingCppPrograms.fr/data/vector2D_2_input.cpp
index 5ec4d30..82d86c9 100644
--- a/test~coding~readingCppPrograms.fr/data/vector2D_2_input.cpp
+++ b/test~coding~readingCppPrograms.fr/data/vector2D_2_input.cpp
@@ -19,5 +19,6 @@ int main(void) {
};
int j;
cin >> j;
- cout << mystere(tab,j) << endl;
+ if (0<=j and j<4)
+ cout << mystere(tab,j) << endl;
}
--
GitLab