Skip to content
Browse files

Merge branch 'master' of github.com:deltaluca/flappy

  • Loading branch information...
2 parents 6f4af99 + ccd2989 commit c3f98f81b482de9c61591413c6c84f98d7a335a7 @cliffsun91 cliffsun91 committed Jan 11, 2012
View
4 AI/Diplomacy/AI/Bots/LearnBot/PatternWeights.hs
@@ -51,12 +51,12 @@ _dbname = "test.db"
-- n pattern weights to use
_npats :: [Int]
-_npats = [1]
+_npats = [1,2]
-- _c defines the constant that determines how 'strong' the weights are affected
-- Larger _c corresponds to smaller change
_c :: Double
-_c = 20.0
+_c = 50.0
-- sets the low (starting) and high (ending) values of k, which varies linearly over the
-- game period from low to high. k is used as a 'learning temperature'
View
BIN AI/Diplomacy/AI/Bots/LearnBot/test.db
Binary file not shown.
View
5 AI/DiplomacyAI.cabal
@@ -97,8 +97,7 @@ Executable learnbot
HDBC,
HDBC-sqlite3
- Ghc-Options: -auto-all -Wall -rtsopts -fno-warn-missing-signatures -fno-warn-unused-do-bind -fwarn-missing-methods -fno-warn-orphans
-
+ Ghc-Options: -rtsopts -prof -auto-all -Wall -fno-warn-missing-signatures -fno-warn-unused-do-bind -fwarn-missing-methods -fno-warn-orphans
-- -- Modules not exported by this package.
-- -- Other-modules:
@@ -159,7 +158,7 @@ Executable dumbbot
containers,
transformers
- Ghc-Options: -auto-all -Wall -rtsopts -fno-warn-missing-signatures -fno-warn-unused-do-bind -fwarn-missing-methods -fno-warn-orphans
+ Ghc-Options: -auto-all -prof -Wall -rtsopts -fno-warn-missing-signatures -fno-warn-unused-do-bind -fwarn-missing-methods -fno-warn-orphans
-- -- Modules not exported by this package.
-- -- Other-modules:
View
5 Makefile
@@ -6,6 +6,9 @@ ser:
obs:
cd UserClient && make run &
+random6:
+ cd AI/dist/build/randombot && zsh -c 'for i in {1..6} ; do ./randombot localhost 16713 &> outp.$$i & ; done'
+
random7:
cd AI/dist/build/randombot && zsh -c 'for i in {1..7} ; do ./randombot localhost 16713 &> outp.$$i & ; done'
@@ -26,7 +29,7 @@ learn7:
cd AI/dist/build/learnbot && zsh -c 'for i in {1..7} ; do ./learnbot localhost 16713 &> outp.$$i & ; done'
learn:
- cd AI/dist/build/learnbot && zsh -c './learnbot localhost 16713 &> outp &'
+ cd AI/dist/build/learnbot && zsh -c './learnbot localhost 16713 +RTS -p &'
debug:
View
BIN Presentation/ProjectDemonstration.odp 100644 → 100755
Binary file not shown.
View
0 Reports/AI_brainstorming.aux
No changes.
View
52 Reports/report2.aux
@@ -1,52 +0,0 @@
-\relax
-\@writefile{toc}{\contentsline {section}{\numberline {1}Project progress}{1}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.1}Recap: User stories for 2nd iteration (weeks 3 - 4)}{1}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.2}Progress on 'Messaging system' and 'Client-server interface'}{2}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.3}Progress on 'Game state modification component'}{2}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.4}Progress on the 'Map representation'}{2}}
-\@writefile{toc}{\contentsline {section}{\numberline {2}Technical issues during the latest iteration}{3}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {2.1}Error recovery in Message passing}{3}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {2.2}Ambiguity of DAIDE language}{3}}
-\@writefile{toc}{\contentsline {section}{\numberline {3}Schedule revisions}{3}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {3.1}Requirements for next iteration (weeks 5-6)}{3}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {3.1.1}Towards the Artificial intelligence}{4}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {3.1.2}Order resolution}{4}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {3.2}Requirements for iteration (weeks 7-8)}{4}}
-\@writefile{toc}{\contentsline {section}{\numberline {4}Division of work in the next iterations}{5}}
-\@writefile{toc}{\contentsline {section}{\numberline {5}Future project progress measures}{5}}
-\@writefile{toc}{\contentsline {section}{\numberline {6}Design of the AI player(s)}{5}}
-\@writefile{toc}{\contentsline {section}{\numberline {7}Challenges for an AI player in 'Diplomacy'}{5}}
-\@writefile{toc}{\contentsline {section}{\numberline {8}Iterative AI development}{6}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {8.1}Primitive hold-bot}{6}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {8.2}Random bot}{6}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {8.3}Heuristic search bot}{7}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {8.4}Tactical bot}{7}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {8.5}Learning / Strategy-bot}{7}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {8.6}Negotiating bot}{7}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {8.6.1}Alliance / Trust model}{8}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {8.6.2}Strategy formation}{8}}
-\@writefile{toc}{\contentsline {section}{\numberline {9}Character / personality of an AI player}{8}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {9.0.3}AI Bot Requirements}{8}}
-\@writefile{toc}{\contentsline {section}{\numberline {10}Details of the proposed AI iterations}{9}}
-\@writefile{toc}{\contentsline {section}{\numberline {11}Short-term game tactics}{9}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {11.1}Searching the game tree}{9}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {11.1.1}Search heuristics}{9}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {11.1.2}State evaluation function}{10}}
-\@writefile{toc}{\contentsline {section}{\numberline {12}Long-term strategy templates}{10}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {12.1}Strategy acquisation}{10}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {12.2}Expert game knowledge}{10}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {12.2.1}Partial game-state encoding}{11}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {12.2.2}Opening games}{11}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {12.3}Move generation}{11}}
-\@writefile{toc}{\contentsline {section}{\numberline {13}Negotiation component}{12}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {13.1}Internal model of other players}{12}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {13.1.1}Trust}{12}}
-\@writefile{toc}{\contentsline {section}{\numberline {14}Game meta-heuristics}{12}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {14.1}Learning on previous game-databases}{12}}
-\@writefile{toc}{\contentsline {section}{\numberline {15}Project management}{13}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {15.1}Software Engineering Process}{13}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {15.1.1}Scrum Meetings}{13}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {15.2}Team collaboration}{13}}
-\@writefile{toc}{\contentsline {section}{\numberline {16}Ethical and Environment Impact}{14}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {16.1}Ethical impact}{14}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {16.2}Environmental Impact }{14}}
View
43 Reports/report3.aux
@@ -1,43 +0,0 @@
-\relax
-\@writefile{toc}{\contentsline {section}{\numberline {1}Project synopsis}{1}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.1}Requirements engineering / management}{1}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.2}Change / Risk management}{2}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.3}Planning / task estimation}{3}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.4}Progress metrics}{3}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.5}Detailed AI metrics}{4}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.5.1}Games won/lost}{4}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.5.2}Supply centres controlled}{4}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.5.3}Units lost during the game}{5}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.5.4}Provinces conceded during the game}{5}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.5.5}Negotiation 'strength'}{5}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.6}Team velocity / Milestones}{5}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.7}Description of iterations per subsystem}{5}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.7.1}Framework and Server}{5}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.7.2}AI framework / bots}{6}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.8}Progress report for Week 10/11}{7}}
-\@writefile{toc}{\contentsline {section}{\numberline {2}General validation}{7}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {2.1}Server testing}{7}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {2.2}AI client testing}{8}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {2.3}GUI client testing}{8}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {2.4}Examples of bugs discovered during testing}{9}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {2.5}Static code checking / tools}{9}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {2.6}Code documentation}{9}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {2.6.1}Developer documention}{9}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {2.6.2}User documention}{10}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {2.7}Code inspection / Refactoring}{10}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {2.8}Acceptance tests}{10}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {2.9}Stress testing}{10}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {2.9.1}Server loading}{10}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {2.9.2}AI / GUI client loading}{11}}
-\@writefile{toc}{\contentsline {section}{\numberline {3}Managerial Documentation}{11}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {3.1}Collaboration tools}{11}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {3.2}Terms of collaboration}{11}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {3.2.1}Working hours / patterns}{11}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {3.2.2}Group meeting conditions}{11}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {3.2.3}Group meeting structure}{11}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {3.2.4}Record of group meetings}{13}}
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {3.2.5}Log-Book}{14}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {3.3}Version control}{14}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {3.4}Automated build}{15}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {3.5}Management / Organisational policies}{15}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {3.6}Knowledge transfer within the group}{15}}
View
3 haxe_setup 100644 → 100755
@@ -8,7 +8,7 @@ else
INSTDIR=$HOME/.haxenekoflash
fi
-rm -rf $INSTDIR
+#rm -rf $INSTDIR
mkdir $INSTDIR
cd $INSTDIR
@@ -140,6 +140,5 @@ svn checkout http://sdl-static.googlecode.com/svn/trunk/ sdl-static
cd $INSTDIR
cd nmefork/project
-haxelib run hxcpp Build.xml
haxelib run hxcpp Build.xml -DHXCPP_M64

0 comments on commit c3f98f8

Please sign in to comment.
Something went wrong with that request. Please try again.