1.1 --- a/factory/v2012/about.html Sat Jan 07 01:34:40 2012 +0100
1.2 +++ b/factory/v2012/about.html Sat Jan 07 16:27:42 2012 +0100
1.3 @@ -6,8 +6,19 @@
1.4 In my scientific pursuits I delve into <a href="http://xkcd.com/638">artificial intelligence</a> and all its <a href="http://xkcd.com/329">challenges</a>. Along the long hard road to general artificial intelligence I make detours for solving algorithmic problems like <a href="http://xkcd.com/461">fast routing</a> in public transportation networks.
1.5 </p>
1.6 <p>
1.7 -Before going back to <a href="http://xkcd.com/664">academia</a>, I used to develop <a href="http://xkcd.com/912">safety-critical</a> software systems for the Air Traffic Control industry at <a href="http://comsoft.aero">Comsoft</a>. You can experience my work for the industry by reading this little <a href="http://www.amazon.de/Luftraummodellierung-Abflugplanung-Optimierung-Vereinigten-Arabischen/dp/3639346203">book</a> I've written, while waiting for your flight to take off anywhere in the United Arab Emirates.
1.8 +Before going back to <a href="http://xkcd.com/664">academia</a>, I used to develop <a href="http://xkcd.com/912">safety-critical</a> software systems for the Air Traffic Control domain at <a href="http://comsoft.aero">Comsoft</a>. You can experience some of my work by reading this little <a href="http://www.amazon.de/Luftraummodellierung-Abflugplanung-Optimierung-Vereinigten-Arabischen/dp/3639346203">book</a> I've written, while waiting for your flight to take off anywhere in the United Arab Emirates.
1.9 </p>
1.10 <p>
1.11 -I enjoy <a href="http://xkcd.com/844">good code</a>, <a href="http://xkcd.com/353">good</a> <a href="http://xkcd.com/224">programming languages</a>, <a href="http://xkcd.com/193">good music</a>, <a href="http://xkcd.com/971">good books</a>, <a href="http://xkcd.com/566">good movies</a> and <a href="http://xkcd.com/435">tea</a>. I enjoy spending time with my family and my lovely girlfriend, who makes the best <a href="http://suesskeks.de">little cookies</a> in town. And I like <a href="http://xkcd.com/888">games</a>.
1.12 +I enjoy <a href="http://xkcd.com/844">good code</a>, <a href="http://xkcd.com/353">good</a> <a href="http://xkcd.com/224">programming languages</a>, <a href="http://xkcd.com/193">good music</a>, <a href="http://xkcd.com/971">good books</a>, <a href="http://xkcd.com/566">good movies</a> and <a href="http://xkcd.com/435">tea</a>. I enjoy spending time with my family and my lovely girlfriend, who makes the best <a href="http://suesskeks.de">little cookies</a> in town. And I like <a href="http://xkcd.com/888">good games</a>.
1.13 </p>
1.14 +
1.15 +<h2>Press Articles</h2>
1.16 +<ul>
1.17 +<li><h4>About my bachelor thesis at <a href="http://comsoft.aero">Comsoft GmbH</a></h4>
1.18 +"Flexible Modeling of Dynamic Air Space Constraints and its Application in Departure Flow Optimisation"
1.19 +<div class="download"><a href="http://me73.com/downloads/campus_magazin_29.pdf">
1.20 +Campus Mag (P. 36 / German)</a></div>
1.21 +<div class="download"><a href="http://me73.com/downloads/discover_me_24.pdf">
1.22 +Discover ME (P. 22 / German)</a></div>
1.23 +</li>
1.24 +</ul>
2.1 --- a/factory/v2012/books.html Sat Jan 07 01:34:40 2012 +0100
2.2 +++ b/factory/v2012/books.html Sat Jan 07 16:27:42 2012 +0100
2.3 @@ -23,7 +23,7 @@
2.4 The standard introduction to compiler development. Also known as the Dragon Book.
2.5 </li>
2.6 <li><h4>Computer Networks</h4><h5>Andrew S. Tanenbaum</h5>
2.7 -A good and in-depth textbook for network technology.
2.8 +A good and in-depth textbook on network technology.
2.9 </li>
2.10 <li><h4>A Brief History of Time</h4><h5>Stephen W. Hawking</h5>
2.11 Popular science. Follow Stephen on his quest for the Theory of Everything.
3.1 --- a/factory/v2012/personalwork.html Sat Jan 07 01:34:40 2012 +0100
3.2 +++ b/factory/v2012/personalwork.html Sat Jan 07 16:27:42 2012 +0100
3.3 @@ -8,7 +8,7 @@
3.4 A Javascript-based implementation of Conway's Game of Life.</li>
3.5 <li>
3.6 <h4>Version</h4>
3.7 -Stable and fun.
3.8 +Stable and green.
3.9 <div class="download"><a href="gameoflife.html">View in your browser</a></div>
3.10 </li>
3.11 </ul>
4.1 --- a/factory/v2012/script.js Sat Jan 07 01:34:40 2012 +0100
4.2 +++ b/factory/v2012/script.js Sat Jan 07 16:27:42 2012 +0100
4.3 @@ -43,7 +43,7 @@
4.4 } else if (page == "" || page == "index.html") {
4.5 init_gameoflife("ME73");
4.6 } else if (page == "gameoflife.html") {
4.7 - init_gameoflife("");
4.8 + init_gameoflife("AE");
4.9 }
4.10 });
4.11
4.12 @@ -133,8 +133,10 @@
4.13 $("body").load(page);
4.14 document.location.href = page;
4.15 }
4.16 +
4.17 var last_highlight;
4.18 var last_colours = new Array();
4.19 +
4.20 function highlight_menu(id, p) {
4.21 if (last_highlight == p) {
4.22 return;
4.23 @@ -162,7 +164,7 @@
4.24 last_colours[0] = colour_area(image, min_x + 10, max_x - 10, 0, 60,
4.25 orange);
4.26 last_colours[1] = colour_area(image, min_x + 10, max_x - 10, 60, max_y - 10,
4.27 - white);
4.28 + white);
4.29 }
4.30
4.31 context.putImageData(image, 0, 0);
4.32 @@ -179,10 +181,7 @@
4.33 colour.a = pix_colour.a;
4.34 setPixel(image, x, y, colour);
4.35 if (pix_colour.a == 255) {
4.36 - old_colour = new Colour(pix_colour.r,
4.37 - pix_colour.g,
4.38 - pix_colour.b,
4.39 - pix_colour.a);
4.40 + old_colour = pix_colour;
4.41 }
4.42 }
4.43 }
4.44 @@ -697,7 +696,7 @@
4.45 }
4.46 Grid.prototype.pick_cell = function(x, y) {
4.47 var lx = parseInt(x / this.cell_size - 0.5);
4.48 - var ly = parseInt(y / this.cell_size - 0.5);
4.49 + var ly = parseInt(y / this.cell_size - 0.5);
4.50 return this.cells[ly][lx];
4.51 }
4.52