| author | Christian Urban <urbanc@in.tum.de> | 
| Wed, 08 Nov 2017 20:27:56 +0000 | |
| changeset 135 | e59aebee9770 | 
| parent 117 | 3b9b13edb97a | 
| child 167 | 1bbd4db36151 | 
| permissions | -rw-r--r-- | 
| 117 | 1  | 
|
| 116 | 2  | 
|
3  | 
||
| 113 | 4  | 
|
| 78 | 5  | 
Calling ediff from the command line  | 
6  | 
||
7  | 
||
8  | 
emacs --eval "(ediff-files \"k1502472/drumb.scala\" \"k1502752/drumb.scala\")"  | 
|
| 85 | 9  | 
|
10  | 
||
11  | 
deleting comments from scala files  | 
|
12  | 
||
| 
89
 
fac25de665d2
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
85 
diff
changeset
 | 
13  | 
find . -name '*.scala' -print0 | xargs -0 perl -n -p -0 -i.bak -e 's%/\*([^*].*?)?\*/%%gs;s%^([^\"\n\r]*(\"[^\"\n\r]*\"[^\"\n\r]*?)*?)//([^*\n\r].*)?$%$1%gm'  | 
| 
 
fac25de665d2
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
85 
diff
changeset
 | 
14  | 
|
| 
 
fac25de665d2
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
85 
diff
changeset
 | 
15  | 
|
| 
 
fac25de665d2
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
85 
diff
changeset
 | 
16  | 
find . -name '*.scala' -print0 | sed -i.2 's|def ordered_moves(dim: Int, path: Path, x: Pos): List[Pos] = ..|//def ordered_moves(dim: Int, path: Path, x: Pos): List[Pos] = ..|g'  | 
| 
 
fac25de665d2
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
85 
diff
changeset
 | 
17  | 
|
| 
 
fac25de665d2
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
85 
diff
changeset
 | 
18  | 
|
| 
 
fac25de665d2
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
85 
diff
changeset
 | 
19  | 
LC_ALL=C sed -i.2 -- 's|def ordered_moves(dim: Int, path: Path, x: Pos): List\[Pos\] = \.\.|//def ordered_moves(dim: Int, path: Path, x: Pos): List[Pos] = ..|g' k*/knight3.scala.bak  | 
| 
 
fac25de665d2
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
85 
diff
changeset
 | 
20  | 
|
| 
 
fac25de665d2
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
85 
diff
changeset
 | 
21  | 
LC_ALL=C sed -i.2 -- 's|def first_closed_tour_heuristic(dim: Int, path: Path): Option\[Path\] = \.\.\.|//def first_closed_tour_heuristic(dim: Int, path: Path): Option[Path] = ...|g' k*/knight3.scala.bak  | 
| 
 
fac25de665d2
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
85 
diff
changeset
 | 
22  | 
|
| 
90
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
23  | 
LC_ALL=C sed -i.2 -- 's|def first_tour_heuristic(dim: Int, path: Path): Option\[Path\] = \.\.\.|//def first_tour_heuristic(dim: Int, path: Path): Option[Path] = ...|g' k*/knight3.scala.bak  | 
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
24  | 
|
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
25  | 
LC_ALL=C sed -i.2 -- 's|def nullable (r: Rexp) : Boolean = \.\.\.|//def nullable (r: Rexp) : Boolean = ...|g' k*/re.scala.bak  | 
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
26  | 
|
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
27  | 
LC_ALL=C sed -i.2 -- 's|def der (c: Char, r: Rexp) : Rexp = \.\.\.|//def der (c: Char, r: Rexp) : Rexp = ...|g' k*/re.scala.bak  | 
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
28  | 
|
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
29  | 
LC_ALL=C sed -i.2 -- 's|def simp(r: Rexp) : Rexp = \.\.\.|//def simp(r: Rexp) : Rexp = ...|g' k*/re.scala.bak  | 
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
30  | 
|
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
31  | 
LC_ALL=C sed -i.2 -- 's|def ders (s: List[Char], r: Rexp) : Rexp = \.\.\.|//def ders (s: List[Char], r: Rexp) : Rexp = ...|g' k*/re.scala.bak  | 
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
32  | 
|
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
33  | 
LC_ALL=C sed -i.2 -- 's|def matcher(r: Rexp, s: String): Boolean = \.\.\.|//def matcher(r: Rexp, s: String): Boolean = ...|g' k*/re.scala.bak  | 
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
34  | 
|
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
35  | 
LC_ALL=C sed -i.2 -- 's|def replace(r: Rexp, s1: String, s2: String): String = \.\.\.|//def replace(r: Rexp, s1: String, s2: String): String = ...|g' k*/re.scala.bak  | 
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
36  | 
|
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
37  | 
LC_ALL=C sed -i.2 -- 's|println(matcher(EVIL,|//println(matcher(EVIL,|g' k*/re.scala.bak  | 
| 
 
d77af4aca939
updated
 
Christian Urban <christian dot urban at kcl dot ac dot uk> 
parents: 
89 
diff
changeset
 | 
38  | 
|
| 99 | 39  | 
LC_ALL=C sed -i.2 -- 's|for (i <- 1 to 5000001 by 500000)|for (i <- 1 to 11 by 10)|g' k*/re.scala.bak  | 
40  | 
||
41  | 
||
42  | 
||
43  | 
ontime:  | 
|
44  | 
k1502660  | 
|
45  | 
k1502705  | 
|
| 111 | 46  | 
k1502679  | 
47  | 
||
48  | 
||
49  | 
||
50  | 
||
51  | 
-----------------------  | 
|
52  | 
"Mounty, Jonathan" jonathan.mounty@kcl.ac.uk  | 
|
53  | 
||
54  | 
Task 1: Ok (1%)  | 
|
55  | 
Task 2: Ok (2%)  | 
|
56  | 
Task 3: OK (1%)  | 
|
57  | 
Task 4: Ok (1%)  | 
|
58  | 
Task 5: Ok (1%)  | 
|
59  | 
Task 6: Not implemented (-2%)  | 
|
60  | 
Task 7: OK (1%)  | 
|
61  | 
Task 8: Not ok (-1%)  | 
|
| 112 | 62  | 
|
63  | 
||
64  | 
----------------------  | 
|
65  | 
Sharpe, Simone simone.sharpe@kcl.ac.uk  | 
|
66  | 
||
67  | 
Task 1: Ok (1%)  | 
|
68  | 
Task 2: Ok (2%)  | 
|
69  | 
Task 3: OK (1%)  | 
|
70  | 
Task 4: Ok (1%)  | 
|
71  | 
Task 5: Not implemented (-1%)  | 
|
72  | 
Task 6: Not implemented (-2%)  | 
|
73  | 
Task 7: Not implemented (-1%)  | 
|
74  | 
Task 8: Not implemented (-1%)  | 
|
75  | 
||
76  | 
||
77  | 
--------------------------------  | 
|
78  | 
Hasebe, Nina, nina.hasebe@kcl.ac.uk  | 
|
79  | 
||
80  | 
All fine except task 6. (-2%)  |