From cd398482768991d22765dd497e712d9d7428f258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20M=2E=20Thi=C3=A9ry?= <nthiery@users.sf.net>
Date: Sun, 5 Oct 2014 22:37:25 +0200
Subject: [PATCH] WIMS: reclassification theme de quelques programmes +
Makefile
---
test~coding~readingCppPrograms.fr/Makefile | 5 +++++
.../data/function_blackjack.cpp | 1 +
.../data/{if_function.cpp => function_if.cpp} | 0
test~coding~readingCppPrograms.fr/data/function_max.cpp | 2 +-
...{loop_count_soustractions.cpp => loop_count_subtract.cpp} | 0
test~coding~readingCppPrograms.fr/data/loop_indices.cpp | 1 +
test~coding~readingCppPrograms.fr/data/loop_indices_2.cpp | 1 +
.../data/{function_odd.cpp => loop_odd.cpp} | 0
.../data/{loop_soustractions.cpp => loop_substract.cpp} | 0
test~coding~readingCppPrograms.fr/data/loop_syracuse.cpp | 1 +
test~coding~readingCppPrograms.fr/data/variable_assign.cpp | 1 +
11 files changed, 11 insertions(+), 1 deletion(-)
rename test~coding~readingCppPrograms.fr/data/{if_function.cpp => function_if.cpp} (100%)
rename test~coding~readingCppPrograms.fr/data/{loop_count_soustractions.cpp => loop_count_subtract.cpp} (100%)
rename test~coding~readingCppPrograms.fr/data/{function_odd.cpp => loop_odd.cpp} (100%)
rename test~coding~readingCppPrograms.fr/data/{loop_soustractions.cpp => loop_substract.cpp} (100%)
diff --git a/test~coding~readingCppPrograms.fr/Makefile b/test~coding~readingCppPrograms.fr/Makefile
index e9f8356..c89cd53 100644
--- a/test~coding~readingCppPrograms.fr/Makefile
+++ b/test~coding~readingCppPrograms.fr/Makefile
@@ -5,6 +5,7 @@ all: data/index $(OUTPUT)
data/index: $(PROGRAMS)
cd data; \
+ if [ -f index ]; then rm index; fi; \
for target in $(TARGETS); do \
(echo "$$target: "`ls -m $${target}_*.cpp`) >> index; \
done
@@ -18,6 +19,10 @@ data/%.cpp.bin: data/%.cpp
clean:
rm data/*.bin data/*.output data/index
+# Pour restauration
+archive:
+ cd ..; tar zcvf /tmp/modtool-test~coding~readingCppPrograms.fr.tgz test~coding~readingCppPrograms.fr
+
#main.oef: header.oef programs/guess-output/*.cpp footer.oef Makefile
# cd programs/guess-output; make all.oef
# cat header.oef programs/guess-output/all.oef footer.oef > main.oef
diff --git a/test~coding~readingCppPrograms.fr/data/function_blackjack.cpp b/test~coding~readingCppPrograms.fr/data/function_blackjack.cpp
index 1d5e7ca..6244905 100644
--- a/test~coding~readingCppPrograms.fr/data/function_blackjack.cpp
+++ b/test~coding~readingCppPrograms.fr/data/function_blackjack.cpp
@@ -39,4 +39,5 @@ int main() {
y = 25;
cout << max(x,y) << endl;
cout << blackJack(x,y) << endl;
+ return 0;
}
diff --git a/test~coding~readingCppPrograms.fr/data/if_function.cpp b/test~coding~readingCppPrograms.fr/data/function_if.cpp
similarity index 100%
rename from test~coding~readingCppPrograms.fr/data/if_function.cpp
rename to test~coding~readingCppPrograms.fr/data/function_if.cpp
diff --git a/test~coding~readingCppPrograms.fr/data/function_max.cpp b/test~coding~readingCppPrograms.fr/data/function_max.cpp
index 3fc83b7..1c17c82 100644
--- a/test~coding~readingCppPrograms.fr/data/function_max.cpp
+++ b/test~coding~readingCppPrograms.fr/data/function_max.cpp
@@ -1,7 +1,7 @@
#include <iostream>
using namespace std;
-float max(float a, float b) {
+double max(double a, double b) {
if ( a >= b ) {
return a;
} else {
diff --git a/test~coding~readingCppPrograms.fr/data/loop_count_soustractions.cpp b/test~coding~readingCppPrograms.fr/data/loop_count_subtract.cpp
similarity index 100%
rename from test~coding~readingCppPrograms.fr/data/loop_count_soustractions.cpp
rename to test~coding~readingCppPrograms.fr/data/loop_count_subtract.cpp
diff --git a/test~coding~readingCppPrograms.fr/data/loop_indices.cpp b/test~coding~readingCppPrograms.fr/data/loop_indices.cpp
index e97c36b..32a59d7 100644
--- a/test~coding~readingCppPrograms.fr/data/loop_indices.cpp
+++ b/test~coding~readingCppPrograms.fr/data/loop_indices.cpp
@@ -8,4 +8,5 @@ int main() {
cout << i << endl;
i = i + 2;
}
+ return 0;
}
diff --git a/test~coding~readingCppPrograms.fr/data/loop_indices_2.cpp b/test~coding~readingCppPrograms.fr/data/loop_indices_2.cpp
index 7274438..5f80cf9 100644
--- a/test~coding~readingCppPrograms.fr/data/loop_indices_2.cpp
+++ b/test~coding~readingCppPrograms.fr/data/loop_indices_2.cpp
@@ -8,4 +8,5 @@ int main() {
cout << i << endl;
i = i * 2;
}
+ return 0;
}
diff --git a/test~coding~readingCppPrograms.fr/data/function_odd.cpp b/test~coding~readingCppPrograms.fr/data/loop_odd.cpp
similarity index 100%
rename from test~coding~readingCppPrograms.fr/data/function_odd.cpp
rename to test~coding~readingCppPrograms.fr/data/loop_odd.cpp
diff --git a/test~coding~readingCppPrograms.fr/data/loop_soustractions.cpp b/test~coding~readingCppPrograms.fr/data/loop_substract.cpp
similarity index 100%
rename from test~coding~readingCppPrograms.fr/data/loop_soustractions.cpp
rename to test~coding~readingCppPrograms.fr/data/loop_substract.cpp
diff --git a/test~coding~readingCppPrograms.fr/data/loop_syracuse.cpp b/test~coding~readingCppPrograms.fr/data/loop_syracuse.cpp
index a97861a..a22e0c7 100644
--- a/test~coding~readingCppPrograms.fr/data/loop_syracuse.cpp
+++ b/test~coding~readingCppPrograms.fr/data/loop_syracuse.cpp
@@ -11,4 +11,5 @@ int main() {
i = i/2;
}
}
+ return 0;
}
diff --git a/test~coding~readingCppPrograms.fr/data/variable_assign.cpp b/test~coding~readingCppPrograms.fr/data/variable_assign.cpp
index 770df1d..9aa03f0 100644
--- a/test~coding~readingCppPrograms.fr/data/variable_assign.cpp
+++ b/test~coding~readingCppPrograms.fr/data/variable_assign.cpp
@@ -21,4 +21,5 @@ int main() {
cout << a << " " << b << " " << c << " " << d << endl;
c + b;
cout << a << " " << b << " " << c << " " << d << endl;
+ return 0;
}
--
GitLab