[Toss-devel-svn] SF.net SVN: toss:[1667] trunk/Toss
Status: Beta
Brought to you by:
lukaszkaiser
Menu
▾
▴
[Toss-devel-svn] SF.net SVN: toss:[1667] trunk/Toss
|
From: <luk...@us...> - 2012-02-06 02:18:47
|
Revision: 1667
http://toss.svn.sourceforge.net/toss/?rev=1667&view=rev
Author: lukaszkaiser
Date: 2012-02-06 02:18:40 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
Final cleanups for 0.7 release.
Modified Paths:
--------------
trunk/Toss/Makefile
trunk/Toss/Play/Move.ml
trunk/Toss/README
trunk/Toss/Toss.odocl
trunk/Toss/WebClient/JsHandler.js
trunk/Toss/WebClient/Main.js
trunk/Toss/WebClient/Play.js
trunk/Toss/WebClient/Style.css
trunk/Toss/WebClient/index.html
trunk/Toss/WebClient/local.html
trunk/Toss/www/Publications/.cvsignore
trunk/Toss/www/Publications/Makefile
trunk/Toss/www/Publications/all.bib
trunk/Toss/www/Publications/index.xml
trunk/Toss/www/create.xml
trunk/Toss/www/develop.xml
trunk/Toss/www/index.xml
trunk/Toss/www/learn.xml
trunk/Toss/www/navigation.xml
trunk/Toss/www/play.xml
Added Paths:
-----------
trunk/Toss/run_server.sh
trunk/Toss/www/pub/aaai11_slides.pdf
Removed Paths:
-------------
trunk/Toss/toss
trunk/Toss/www/examples.xml
Property Changed:
----------------
trunk/Toss/www/Publications/
Modified: trunk/Toss/Makefile
===================================================================
--- trunk/Toss/Makefile 2012-02-05 17:05:10 UTC (rev 1666)
+++ trunk/Toss/Makefile 2012-02-06 02:18:40 UTC (rev 1667)
@@ -10,10 +10,10 @@
%.js: %.byte
js_of_ocaml _build/$<
-RELEASE=0.6
+RELEASE=0.7
Release: TossServer doc
- rm -f *~ Formula/*~ Solver/*~ Arena/*~ Play/*~ GGP/*~ \
- Language/*~ Server/*~ www/*~ WebClient/~
+ rm -f *~ MenhirLib/*~ Formula/*~ Solver/*~ Arena/*~ Play/*~ GGP/*~ \
+ Learn/*~ Language/*~ Server/*~ www/*~ WebClient/~
make -C www/reference
make -C www
make -C .
@@ -26,6 +26,7 @@
mv toss_$(RELEASE)/_build/Toss.docdir toss_$(RELEASE)/www/code_doc
rm -rf toss_$(RELEASE)/_build toss_$(RELEASE)/gmon.out
rm -rf toss_$(RELEASE)/www/pub
+ rm -rf toss_$(RELEASE)/Learn/videos
zip -r toss_$(RELEASE).zip toss_$(RELEASE)
rm -rf toss_$(RELEASE)
@@ -51,8 +52,6 @@
$(OCB_LIB) $(OCB_CFLAG) $(OCB_LFLAG)
OCAMLBUILDJS=ocamlbuild -log build.log -j 8 -menhir ../menhir_conf $(OCB_PPJS) \
$(OCB_LIBJS) $(OCB_CFLAG) $(OCB_LFLAG)
-OCAMLBUILDNOPP=ocamlbuild -log build.log -j 8 -menhir ../menhir_conf \
- $(OCB_LIB) $(OCB_CFLAG) $(OCB_LFLAG)
FormulaINCSatINC=MenhirLib,Formula
FormulaINC=MenhirLib,Formula,Formula/Sat,Formula/Sat/dpll
@@ -77,7 +76,7 @@
$(OCAMLBUILD) -Is $($(subst /,INC,$(dir $@))) $@
doc: caml_extensions/pa_let_try.cmo
- $(OCAMLBUILDNOPP) -Is +oUnit,+sqlite3,$(.INC) Toss.docdir/index.html
+ $(OCAMLBUILD) -Is +oUnit,+sqlite3,$(.INC) Toss.docdir/index.html
make -C www code_doc_link
Modified: trunk/Toss/Play/Move.ml
===================================================================
--- trunk/Toss/Play/Move.ml 2012-02-05 17:05:10 UTC (rev 1666)
+++ trunk/Toss/Play/Move.ml 2012-02-06 02:18:40 UTC (rev 1667)
@@ -39,14 +39,10 @@
Aux.concat_map
(fun (label,next_loc) ->
let rule = List.assoc label.Arena.lb_rule rules in
- AuxIO.log ("gen_moves: matchings for "^label.Arena.lb_rule);
List.map (fun emb -> label,next_loc,emb)
- (ContinuousRule.matches model rule))
+ (ContinuousRule.matches model rule))
loc.Arena.moves in
- AuxIO.log ("gen_moves: found "^string_of_int (List.length matchings)
- ^" matchings.");
- if matchings = [] then [| |]
- else (
+ if matchings = [] then [| |] else (
(* generating the grid *)
Array.concat
(List.map (fun (label,next_loc,emb) ->
@@ -120,11 +116,7 @@
let loc = game.Arena.graph.(s.Arena.cur_loc) in
let moving = select_moving loc in
let get_moves pl =
- AuxIO.log ("Move.list_moves: before getting moves for player "^
- string_of_int pl);
- let m =
- gen_moves cGRID_SIZE game.Arena.rules s.Arena.struc loc.(pl) in
- AuxIO.log ("Move.list_moves: before generating models for the moves");
+ let m = gen_moves cGRID_SIZE game.Arena.rules s.Arena.struc loc.(pl) in
(gen_models_list game.Arena.rules s s.Arena.time m) in
Array.of_list (List.concat (
List.map (fun p -> List.map (fun (a,b) -> (p,a,b)) (get_moves p)) moving))
Modified: trunk/Toss/README
===================================================================
--- trunk/Toss/README 2012-02-05 17:05:10 UTC (rev 1666)
+++ trunk/Toss/README 2012-02-06 02:18:40 UTC (rev 1667)
@@ -9,7 +9,7 @@
-- Installing dependencies under Ubuntu
Run the following in terminal:
- sudo apt-get install menhir libounit-ocaml-dev libsqlite3-ocaml-dev heirloom-mailx
+ sudo apt-get install menhir libounit-ocaml-dev libsqlite3-ocaml-dev libjs-of-ocaml-dev heirloom-mailx
Finally to compile Toss just type
make
@@ -44,6 +44,7 @@
The SAT-solver in Formula/Sat/dpll/ is part of the Decision Procedure Toolkit,
and it is Copyright to Intel Corporation and distributed under a separate
license - the Apache License 2.0. See Formula/Sat/dpll/LICENSE.txt.
+The part of menhirLib we use (under MenhirLib/) also has a separate licence.
Toss is licensed under the following BSD license.
Modified: trunk/Toss/Toss.odocl
===================================================================
--- trunk/Toss/Toss.odocl 2012-02-05 17:05:10 UTC (rev 1666)
+++ trunk/Toss/Toss.odocl 2012-02-06 02:18:40 UTC (rev 1667)
@@ -1,3 +1,4 @@
+Formula/Aux
Formula/Formula
Formula/FormulaParser
Formula/FormulaMap
@@ -20,7 +21,6 @@
Solver/Solver
Solver/Class
Solver/ClassParser
-Solver/Distinguish
Arena/Term
Arena/TermParser
Arena/DiscreteRule
@@ -38,7 +38,7 @@
GGP/TranslateFormula
GGP/TranslateGame
GGP/GameSimpl
-Server/Picture
-Server/LearnGame
+Learn/Distinguish
+Learn/LearnGame
Server/DB
Server/ReqHandler
Modified: trunk/Toss/WebClient/JsHandler.js
===================================================================
--- trunk/Toss/WebClient/JsHandler.js 2012-02-05 17:05:10 UTC (rev 1666)
+++ trunk/Toss/WebClient/JsHandler.js 2012-02-06 02:18:40 UTC (rev 1667)
@@ -948,4 +948,4 @@
if( y.fun ) { x.fun = y.fun; return 0; }
var i = y.length; while (i--) x[i] = y[i]; return 0;
}
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
