Skip to content

Commit 7f20391

Browse files
many fixes after beta-testing
1 parent f4cf406 commit 7f20391

12 files changed

Lines changed: 26 additions & 17 deletions

File tree

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env sh
22

3+
cd $HOME
34
if [ ! -d parcomp ] ; then
45
echo The directory is nowere to be found!
5-
exit -1
6+
false
67
fi

missions/parcomp/03_firstactualtiming/check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash -x
22

33

4-
read -p "What is the 'user' duration, in seconds, of the command as reported by the time command? " D
4+
read -p "What is the 'real' duration, in seconds, of the command as reported by the time command? " D
55

66
if [[ $D == 4* ]]
77
then

missions/parcomp/05_backgroundparallel/check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash -x
22

33

4-
read -p "What is the 'user' duration, in seconds, of the command as reported by the time command? " D
4+
read -p "What is the 'real' duration, in seconds, of the command as reported by the time command? " D
55

66
if [[ $D == 4* ]]
77
then

missions/parcomp/09_fifo/check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ else
1717
fi
1818

1919

20-
read -p "What is the 'user' duration in seconds of the command as reported by the time command? " D
20+
read -p "What is the 'real' duration in seconds of the command as reported by the time command? " D
2121

2222
if [[ $D == 5* ]]
2323
then

missions/parcomp/11_split/check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ if [[ $D == 1* ]]
88
then
99
true
1010
else
11-
echo "Are you sure? The timing should be quite low."
11+
echo "Are you sure? The timing should be quite low. Did you take into account the remark paragraph in the goal description?"
1212
false
1313
fi

missions/parcomp/12_make/check.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,18 @@
44

55
read -p "What is the 'user' duration in seconds of the command as reported by the time command? " D
66

7+
if [[ $D == 12* ]]
8+
then
9+
echo "Hum it seems you bumped into a bug in Make."
10+
echo "One of the steps in the second stage did not run at the same time as the others"
11+
echo "which explains why you observe 12 seconds runtime. But actually, it should be 8."
12+
echo "Please try again (with make -B -j4)"
13+
false
14+
fi
715
if [[ $D == 8* ]]
816
then
917
true
1018
else
11-
echo "Are you sure? The timing should be a bit above 4."
19+
echo "Are you sure? The timing should be a bit above 8."
1220
false
1321
fi

missions/parcomp/14_pararllelcite/goal/en.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GPL_v3 licence and is free to use, but the author requests
77
that publications that used the software to produce the
88
results cite the software in their references.
99

10-
The programm will remind you this until you explicitly agree
10+
The program will remind you this until you explicitly agree
1111
to cite it in future publications, at which point it will
1212
become completely silent on the matter.
1313

@@ -20,7 +20,7 @@ Useful commands
2020
parallel COMMAND ::: ARG1 ARG2 ... ARGN
2121
this command will start N instances of COMMAND in parallel
2222
and "distribute" ARG1 ARG2 ... ARGN to each instance. For
23-
instance parallel `echo ::: Hello Bonjour Holà` will run
23+
instance `parallel echo ::: Hello Bonjour Holà` will run
2424
`echo` three times, once with `Hello`, once with `Bonjour` and
2525
a final time with `Holà`, all at the same time.
2626

missions/parcomp/16_combinations/goal/en.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ cp FROM TO
4242
Remarks
4343
-------
4444

45-
It is often interesting to first try the command with `--dru-run` to see
45+
It is often interesting to first try the command with `--dry-run` to see
4646
what would be executed without actually executing it.

missions/parcomp/17_argsinfile/check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ else
1010
fi
1111

1212

13-
if [[ -f expriment.A_1.txt && -f expriment.B_2.txt && -f expriment.A_5.txt && -f expriment.C_4.txt ]]
13+
if [[ -f experiment.A_1.txt && -f experiment.B_2.txt && -f experiment.A_5.txt && -f experiment.C_4.txt ]]
1414
then
1515
true
1616
else

missions/parcomp/17_argsinfile/goal/en.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ Useful parameters are:
1212
--header ':' -> use header in parameter names
1313

1414
With those defined, parallel will understand placeholders
15-
with the name of the columns inside it.
15+
with the name of the columns inside it, e.g.
16+
17+
{ColumnA} {ColumnB}
1618

1719
Goal of the mission: create empty files with names following
1820
the pattern

0 commit comments

Comments
 (0)