| author | Christian Urban <urbanc@in.tum.de> | 
| Sat, 25 Feb 2017 21:18:08 +0000 | |
| changeset 116 | 82a671b7ebac | 
| parent 113 | b8ba08170d79 | 
| child 117 | d3bd321ee7cc | 
| permissions | -rw-r--r-- | 
| 116 | 1 | |
| 2 | ||
| 113 | 3 | |
| 78 | 4 | Calling ediff from the command line | 
| 5 | ||
| 6 | ||
| 7 | emacs --eval "(ediff-files \"k1502472/drumb.scala\" \"k1502752/drumb.scala\")" | |
| 85 | 8 | |
| 9 | ||
| 10 | deleting comments from scala files | |
| 11 | ||
| 89 
fac25de665d2
updated
 Christian Urban <christian dot urban at kcl dot ac dot uk> parents: 
85diff
changeset | 12 | 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: 
85diff
changeset | 13 | |
| 
fac25de665d2
updated
 Christian Urban <christian dot urban at kcl dot ac dot uk> parents: 
85diff
changeset | 14 | |
| 
fac25de665d2
updated
 Christian Urban <christian dot urban at kcl dot ac dot uk> parents: 
85diff
changeset | 15 | 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: 
85diff
changeset | 16 | |
| 
fac25de665d2
updated
 Christian Urban <christian dot urban at kcl dot ac dot uk> parents: 
85diff
changeset | 17 | |
| 
fac25de665d2
updated
 Christian Urban <christian dot urban at kcl dot ac dot uk> parents: 
85diff
changeset | 18 | 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: 
85diff
changeset | 19 | |
| 
fac25de665d2
updated
 Christian Urban <christian dot urban at kcl dot ac dot uk> parents: 
85diff
changeset | 20 | 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: 
85diff
changeset | 21 | |
| 90 
d77af4aca939
updated
 Christian Urban <christian dot urban at kcl dot ac dot uk> parents: 
89diff
changeset | 22 | 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: 
89diff
changeset | 23 | |
| 
d77af4aca939
updated
 Christian Urban <christian dot urban at kcl dot ac dot uk> parents: 
89diff
changeset | 24 | 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: 
89diff
changeset | 25 | |
| 
d77af4aca939
updated
 Christian Urban <christian dot urban at kcl dot ac dot uk> parents: 
89diff
changeset | 26 | 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: 
89diff
changeset | 27 | |
| 
d77af4aca939
updated
 Christian Urban <christian dot urban at kcl dot ac dot uk> parents: 
89diff
changeset | 28 | 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: 
89diff
changeset | 29 | |
| 
d77af4aca939
updated
 Christian Urban <christian dot urban at kcl dot ac dot uk> parents: 
89diff
changeset | 30 | 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: 
89diff
changeset | 31 | |
| 
d77af4aca939
updated
 Christian Urban <christian dot urban at kcl dot ac dot uk> parents: 
89diff
changeset | 32 | 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: 
89diff
changeset | 33 | |
| 
d77af4aca939
updated
 Christian Urban <christian dot urban at kcl dot ac dot uk> parents: 
89diff
changeset | 34 | 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: 
89diff
changeset | 35 | |
| 
d77af4aca939
updated
 Christian Urban <christian dot urban at kcl dot ac dot uk> parents: 
89diff
changeset | 36 | 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: 
89diff
changeset | 37 | |
| 99 | 38 | 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 | 
| 39 | ||
| 40 | ||
| 41 | ||
| 42 | ontime: | |
| 43 | k1502660 | |
| 44 | k1502705 | |
| 111 | 45 | k1502679 | 
| 46 | ||
| 47 | ||
| 48 | ||
| 49 | ||
| 50 | ----------------------- | |
| 51 | "Mounty, Jonathan" jonathan.mounty@kcl.ac.uk | |
| 52 | ||
| 53 | Task 1: Ok (1%) | |
| 54 | Task 2: Ok (2%) | |
| 55 | Task 3: OK (1%) | |
| 56 | Task 4: Ok (1%) | |
| 57 | Task 5: Ok (1%) | |
| 58 | Task 6: Not implemented (-2%) | |
| 59 | Task 7: OK (1%) | |
| 60 | Task 8: Not ok (-1%) | |
| 112 | 61 | |
| 62 | ||
| 63 | ---------------------- | |
| 64 | Sharpe, Simone simone.sharpe@kcl.ac.uk | |
| 65 | ||
| 66 | Task 1: Ok (1%) | |
| 67 | Task 2: Ok (2%) | |
| 68 | Task 3: OK (1%) | |
| 69 | Task 4: Ok (1%) | |
| 70 | Task 5: Not implemented (-1%) | |
| 71 | Task 6: Not implemented (-2%) | |
| 72 | Task 7: Not implemented (-1%) | |
| 73 | Task 8: Not implemented (-1%) | |
| 74 | ||
| 75 | ||
| 76 | -------------------------------- | |
| 77 | Hasebe, Nina, nina.hasebe@kcl.ac.uk | |
| 78 | ||
| 79 | All fine except task 6. (-2%) |