README
author Christian Urban <urbanc@in.tum.de>
Tue, 05 Dec 2017 00:34:14 +0000
changeset 162 6d25ccbb3cf2
parent 117 d3bd321ee7cc
child 167 349d706586ef
permissions -rw-r--r--
marking 2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
117
d3bd321ee7cc updated
Christian Urban <urbanc@in.tum.de>
parents: 116
diff changeset
     1
116
Christian Urban <urbanc@in.tum.de>
parents: 113
diff changeset
     2
Christian Urban <urbanc@in.tum.de>
parents: 113
diff changeset
     3
113
b8ba08170d79 hook test
Christian Urban <urbanc@in.tum.de>
parents: 112
diff changeset
     4
78
85f2f75abeeb updated
Christian Urban <urbanc@in.tum.de>
parents:
diff changeset
     5
Calling ediff from the command line
85f2f75abeeb updated
Christian Urban <urbanc@in.tum.de>
parents:
diff changeset
     6
85f2f75abeeb updated
Christian Urban <urbanc@in.tum.de>
parents:
diff changeset
     7
85f2f75abeeb updated
Christian Urban <urbanc@in.tum.de>
parents:
diff changeset
     8
emacs --eval "(ediff-files \"k1502472/drumb.scala\" \"k1502752/drumb.scala\")"
85
fd3f8581ce85 updated
Christian Urban <urbanc@in.tum.de>
parents: 78
diff changeset
     9
fd3f8581ce85 updated
Christian Urban <urbanc@in.tum.de>
parents: 78
diff changeset
    10
fd3f8581ce85 updated
Christian Urban <urbanc@in.tum.de>
parents: 78
diff changeset
    11
deleting comments from scala files
fd3f8581ce85 updated
Christian Urban <urbanc@in.tum.de>
parents: 78
diff changeset
    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
e10a9b2fd35a updated
Christian Urban <urbanc@in.tum.de>
parents: 90
diff changeset
    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
e10a9b2fd35a updated
Christian Urban <urbanc@in.tum.de>
parents: 90
diff changeset
    40
e10a9b2fd35a updated
Christian Urban <urbanc@in.tum.de>
parents: 90
diff changeset
    41
e10a9b2fd35a updated
Christian Urban <urbanc@in.tum.de>
parents: 90
diff changeset
    42
e10a9b2fd35a updated
Christian Urban <urbanc@in.tum.de>
parents: 90
diff changeset
    43
ontime:
e10a9b2fd35a updated
Christian Urban <urbanc@in.tum.de>
parents: 90
diff changeset
    44
k1502660
e10a9b2fd35a updated
Christian Urban <urbanc@in.tum.de>
parents: 90
diff changeset
    45
k1502705
111
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    46
k1502679
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    47
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    48
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    49
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    50
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    51
-----------------------
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    52
"Mounty, Jonathan" jonathan.mounty@kcl.ac.uk
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    53
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    54
Task 1: Ok  (1%)
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    55
Task 2: Ok  (2%)
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    56
Task 3: OK  (1%)
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    57
Task 4: Ok  (1%)
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    58
Task 5: Ok  (1%)
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    59
Task 6: Not implemented (-2%)
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    60
Task 7: OK  (1%)
cd6b9fe4bce5 updated
Christian Urban <urbanc@in.tum.de>
parents: 99
diff changeset
    61
Task 8: Not ok (-1%)
112
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    62
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    63
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    64
----------------------
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    65
Sharpe, Simone simone.sharpe@kcl.ac.uk
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    66
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    67
Task 1: Ok  (1%)
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    68
Task 2: Ok  (2%)
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    69
Task 3: OK  (1%)
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    70
Task 4: Ok  (1%)
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    71
Task 5: Not implemented (-1%)
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    72
Task 6: Not implemented (-2%)
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    73
Task 7: Not implemented (-1%)
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    74
Task 8: Not implemented (-1%)
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    75
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    76
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    77
--------------------------------
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    78
Hasebe, Nina,   nina.hasebe@kcl.ac.uk
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    79
3252fd0c0dd2 updated
Christian Urban <urbanc@in.tum.de>
parents: 111
diff changeset
    80
All fine except task 6. (-2%)