diff --git a/SoccerFun.cabal b/SoccerFun.cabal --- a/SoccerFun.cabal +++ b/SoccerFun.cabal @@ -1,5 +1,5 @@ Name: SoccerFun -Version: 0.4.2 +Version: 0.4.3 Copyright: (c) 2010, Jan Rochel License: BSD3 License-File: LICENSE @@ -13,7 +13,9 @@ This is a Haskell port of the the SoccerFun framework originally implemented in Clean. From the website: Soccer-Fun is an educational project to stimulate functional programming by thinking about, designing, implementing, running, and competing with the brains of football players! It is open for participation by everybody who likes to contribute. It is not restricted to a particular functional programming language. Category: Game, Education, AI Cabal-Version: >= 1.6 -Data-Files: template/Main.hs template/Makefile template/Children/Child.hs template/Children/Team.hs +Data-Files: + template/Main.hs template/Makefile template/Children/Child.hs template/Children/Team.hs + tournament/makeAll.sh tournament/makeLoop.sh tournament/Makefile Library Extensions: diff --git a/SoccerFun/MatchGame.hs b/SoccerFun/MatchGame.hs --- a/SoccerFun/MatchGame.hs +++ b/SoccerFun/MatchGame.hs @@ -71,12 +71,11 @@ let (loc,name) = case findIndices isSlash t of [ ] → (".", t) ixs → let (loc,slash:name) = splitAt (last ixs) t in (loc, name) - waitForProcess =<< runProcess "ghc" ["--make", name ⧺ ".Team"] (Just loc) Nothing Nothing Nothing Nothing - oldLoc ← getCurrentDirectory - setCurrentDirectory loc - putStrLn $ "Loading module " ⧺ name ⧺ ".Team from " ⧺ loc - team ← eval_ (name ⧺ ".Team.team") [name ⧺ ".Team"] [] [] [loc] -- the [loc] doesn't seem to have any effect - setCurrentDirectory oldLoc + team ← inDir loc $ do + exitCode ← waitForProcess =<< runProcess "ghc" ["--make", "-v0", name ⧺ ".Team"] (Just ".") Nothing Nothing Nothing Nothing + if exitCode ≢ ExitSuccess + then return $ Left ["Teams could not be compiled"] + else eval_ (name ⧺ ".Team.team") [name ⧺ ".Team"] [] [] [loc] -- the [loc] doesn't seem to have any effect case team of Left errors → mapM_ putStrLn ("Failed to load team. Errors:" : errors) >> exitFailure Right Nothing → do @@ -88,7 +87,12 @@ where removeTrailingSlashes str = if isSlash (last str) then removeTrailingSlashes (init str) else str isSlash = flip elem ['/','\\'] - + inDir dir ioAction = do + oldDir ← getCurrentDirectory + setCurrentDirectory dir + res ← ioAction + setCurrentDirectory oldDir + return res {- This module defines the match and tournament data structures. -} diff --git a/tournament/Makefile b/tournament/Makefile new file mode 100644 --- /dev/null +++ b/tournament/Makefile @@ -0,0 +1,19 @@ +.SUFFIXES: .log .sft .hs +.PHONY: recordAll record clean + +TEAMS=$(notdir $(wildcard teams/*)) + +recordAll: + for t1 in $(TEAMS); do for t2 in $(TEAMS); do make TEAM1=$$t1 TEAM2=$$t2 record; done; done + +# the rest of the file requires TEAM1 and TEAM2 to be defined + +record: teams/$(TEAM1) teams/$(TEAM2) tapes/$(TEAM1)-$(TEAM2).log + +tapes/$(TEAM1)-$(TEAM2).log: teams/$(TEAM1)/* teams/$(TEAM2)/* + ulimit -t 15; sfRecord teams/$(TEAM1) teams/$(TEAM2) > $@ 2>&1 + [ -f $(TEAM1)-$(TEAM2).sft ] && mv $(TEAM1)-$(TEAM2).sft tapes + +clean: + rm -f tapes/* + rm -f teams/*/*.o teams/*/*.hi diff --git a/tournament/makeAll.sh b/tournament/makeAll.sh new file mode 100644 --- /dev/null +++ b/tournament/makeAll.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +echo 'SoccerFun Tournament' > out + +echo "" >> out +for i in teams/*; do + echo "" >> out +done +echo "" >> out +echo "" >> out + +for i in teams/*; do + for j in teams/*; do + make TEAM1=`basename $i` TEAM2=`basename $j` record + done; +done + +for i in teams/*; do + echo "" >> out + for j in teams/*; do + game=`basename $i`-`basename $j` + echo "" >> out + done; + echo "" >> out + echo "" >> out +done + +echo '
`basename $i`
" >> out + if [ `stat -c%s "tapes/$game.log"` -lt 10 ]; then + [ -s tapes/$game.sft ] && echo "" >> out + cat "tapes/$game.log" >> out + [ -s tapes/$game.sft ] && echo "" >> out + else + echo "error" >> out + fi + echo "`basename $j`
' >> out + +mv out tapes/index.html diff --git a/tournament/makeLoop.sh b/tournament/makeLoop.sh new file mode 100644 --- /dev/null +++ b/tournament/makeLoop.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +while ( true ); do + ./makeAll + sleep 60 +done