[Toss-devel-svn] SF.net SVN: toss:[1363] trunk/Toss

[<luk...@us...>]

Revision: 1363
          http://toss.svn.sourceforge.net/toss/?rev=1363&view=rev
Author:   lukaszkaiser
Date:     2011-03-16 00:05:04 +0000 (Wed, 16 Mar 2011)

Log Message:
-----------
WebClient, www and manual GGP corrections.

Modified Paths:
--------------
    trunk/Toss/GGP/GDL.ml
    trunk/Toss/WebClient/Main.js
    trunk/Toss/www/Makefile
    trunk/Toss/www/ideas.xml

Added Paths:
-----------
    trunk/Toss/www/img/favicon.ico

Modified: trunk/Toss/GGP/GDL.ml
===================================================================
--- trunk/Toss/GGP/GDL.ml	2011-03-15 14:53:40 UTC (rev 1362)
+++ trunk/Toss/GGP/GDL.ml	2011-03-16 00:05:04 UTC (rev 1363)
@@ -3821,7 +3821,7 @@
   match actions with
     | [Func ("MOVE", [Const x1; Const y1; Const x2; Const y2]);
        Const "NOOP"] when x1 = x2 ->
-      "WhiteStraight",
+      "WhiteMove",
       ["a1", Structure.board_coords_name (s2i x1, s2i y1);
       "a2", Structure.board_coords_name (s2i x2, s2i y2)]
     | [Func ("MOVE", [Const x1; Const y1; Const x2; Const y2]);
@@ -3832,7 +3832,7 @@
     | [Const "NOOP";
        Func ("MOVE", [Const x1; Const y1; Const x2; Const y2])]
         when x1 = x2 ->
-      "BlackStraight",
+      "BlackMove",
       ["a2", Structure.board_coords_name (s2i x1, s2i y1);
       "a1", Structure.board_coords_name (s2i x2, s2i y2)]
     | [Const "NOOP";
@@ -3944,7 +3944,7 @@
   let struc = (snd new_state).Arena.struc in
   match emb with
     | [(_,a); (_,b)] ->
-      let a, b = if rule = "BlackStraight" then a, b else b, a in
+      let a, b = if rule = "BlackMove" then a, b else b, a in
       let x1, y1 =
         Structure.board_elem_coords (Structure.elem_str struc a)
       and x2, y2 =
@@ -3957,7 +3957,7 @@
   match emb with
     | [(_,a); (_,b)] ->
       let a, b = 
-	if rule = "BlackStraight" then a, b else b, a in
+	if rule = "BlackMove" then a, b else b, a in
       let x1, y1 =
         Structure.board_elem_coords (Structure.elem_str struc a)
       and x2, y2 =
@@ -3967,7 +3967,7 @@
       else
 	Printf.sprintf "(CAPTURE %d %d %d %d)" x1 y1 x2 y2
     | [(_,a); (_,b); (_, c)] ->
-      let a, b = if rule = "BlackStraightTwo" then a, c else c, a in
+      let a, b = if rule = "BlackMoveTwo" then a, c else c, a in
       let x1, y1 =
         Structure.board_elem_coords (Structure.elem_str struc a)
       and x2, y2 =

Modified: trunk/Toss/WebClient/Main.js
===================================================================
--- trunk/Toss/WebClient/Main.js	2011-03-15 14:53:40 UTC (rev 1362)
+++ trunk/Toss/WebClient/Main.js	2011-03-16 00:05:04 UTC (rev 1363)
@@ -227,6 +227,7 @@
 
 // Apply current move.
 function make_move () {
+    if (ASYNC_REQ_PENDING != 0) return;
     if (CUR_MOVE == "") return;
     var m = PLAYS[CUR_PLAY_I][3];
     if (PLAYS[CUR_PLAY_I][m] != UNAME && PLAYS[CUR_PLAY_I][m] != "computer") {

Modified: trunk/Toss/www/Makefile
===================================================================
--- trunk/Toss/www/Makefile	2011-03-15 14:53:40 UTC (rev 1362)
+++ trunk/Toss/www/Makefile	2011-03-16 00:05:04 UTC (rev 1363)
@@ -6,6 +6,5 @@
 	ln -fs ../Toss.docdir code_doc
 	cp code_doc/index.html code_doc/index.html.en
 	cp code_doc/index.html code_doc/index.html.de
-	cp code_doc/index.html code_doc/index.html.de
 	cp code_doc/index.html code_doc/index.html.pl
 	cp code_doc/index.html code_doc/index.html.fr

Modified: trunk/Toss/www/ideas.xml
===================================================================
--- trunk/Toss/www/ideas.xml	2011-03-15 14:53:40 UTC (rev 1362)
+++ trunk/Toss/www/ideas.xml	2011-03-16 00:05:04 UTC (rev 1363)
@@ -14,8 +14,10 @@
     <par>Toss is applying to participate in <em>Google Summer of Code</em>
       in 2011. This page contains a few ideas for students who wish to work
       on Toss this summer. But, most importantly, we welcome new ideas from
-      students who wish to participate! We are very positive about suggestions
-      and we think that best proposals (and code) come from students who are
+      students who wish to participate! If you think of a complex strategic game
+      or a suite of simpler games, it may be a good idea to do them in Toss.
+      Make sure to contact us, we are very positive about suggestions and
+      we think that the best proposals (and code) come from students who are
       simply passionate about realizing their own ideas!<br/></par>
   </section>
   
@@ -93,26 +95,27 @@
       in current Toss code and GUI, these are not fully developed, tested,
       and not supported in the web interface. The good old 
       <a href="http://en.wikipedia.org/wiki/Pac-Man">Pac-Man</a> is an ideal
-      test candidate for these features.
+      test candidate for these features, especially for concurrent moves.
       <br/><br/></par>
     <par><em>Deliverables.</em>
       By mid-term it will be possible to play Pac-Man in Toss in command
       line mode and in the GUI. By the end, it will be supported in the web
-      interface as well.
+      interface and automatic play will work as well.
       <br/><br/></par>
     <par><em>Modules (in planned construction order).</em>
       <enumerate>
 	<item>Allow multiple players in one location in Toss (easy)</item>
+	<item>Implement missing concurrency features in Toss (medium)</item>
 	<item>Test, debug and implement missing timing features (easy)</item>
-	<item>Relate Toss-internal time with real time (medium)</item>
 	<item>Pac-Man in command line and GUI (easy after 1, 2)</item>
 	<item>Make Toss web interface fully asynchronous (medium)</item>
 	<item>Pac-Man in the web interface (easy after 5)</item>
+	<item>Adapt automatic playing algorithms to concurrency</item>
       </enumerate>
     <br/></par>
     <par><em>Needed Skills and Difficulty.</em>
-      This idea is straight-forward and does not contain any hard bits.
-      But it requires the student to know both OCaml and AJAX with JavaScript,
+      This idea is easy to medium depending on much one demands in point 7.
+      It requires the student to know both OCaml and AJAX with JavaScript,
       and to be able to use and debug them in parallel.
       <br/><br/></par>
     <par><em>Possible Mentors (in order of preference):</em>
@@ -220,6 +223,8 @@
       <enumerate>
 	<item>Enrich Toss formulas with fixed-points (medium, needed)</item>
 	<item>Generalize GGP translation using fixed-points (medium)</item>
+	<item>Generalize GDL translation to handle simultaneous moves and
+	  arbitrary turn taking (depends on concurrency in Toss)</item>
 	<item>Improve readability of translated games, test, debug</item>
 	<item>Add some position detection or layouting to the translation</item>
 	<item>Adapt web interface to be usable with translated games</item>

Added: trunk/Toss/www/img/favicon.ico
===================================================================
(Binary files differ)


Property changes on: trunk/Toss/www/img/favicon.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.