From dcb66bd8ebe8a4f8ee6605b00af09e8a48ace0ff Mon Sep 17 00:00:00 2001 From: Gökçen Eraslan Date: Wed, 6 Jan 2016 19:50:21 +0100 Subject: Add a SWIG interface file, a Bash script to generate Go, Python and Lua bindings and add Python test file. --- bindings/python/test.py | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 bindings/python/test.py (limited to 'bindings/python') diff --git a/bindings/python/test.py b/bindings/python/test.py new file mode 100644 index 0000000..a5e2373 --- /dev/null +++ b/bindings/python/test.py @@ -0,0 +1,63 @@ +# coding: utf-8 + +import quackle + +# Set up the data manager +dm = quackle.DataManager() +dm.setComputerPlayers(quackle.ComputerPlayerCollection.fullCollection()) +dm.setBackupLexicon('twl06') +dm.setAppDataDirectory('../../data') + +# Set up the alphabet +abc = quackle.AlphabetParameters.findAlphabetFile('english') +fa = quackle.FlexibleAlphabetParameters() +assert fa.load(quackle.Util.stdStringToQString(abc)) +dm.setAlphabetParameters(fa) + +# Set up the board +board = quackle.BoardParameters() +dm.setBoardParameters(board) + +# Find the lexicon +dawg = quackle.LexiconParameters.findDictionaryFile('twl06.dawg') +gaddag = quackle.LexiconParameters.findDictionaryFile('twl06.gaddag') +dm.lexiconParameters().loadDawg(dawg) +dm.lexiconParameters().loadGaddag(gaddag) + +dm.strategyParameters().initialize('twl06') + +# Create a computer player +player1, found = dm.computerPlayers().playerForName('Speedy Player') +assert found +player1 = player1.computerPlayer() +print player1.name() + +# Create the Game file (.gcg) reader +gamereader = quackle.GCGIO() +game = gamereader.read(quackle.Util.stdStringToQString('../../test/positions/short_game_with_bad_moves.gcg'), + quackle.Logania.MaintainBoardPreparation) + +# Get the current position +position = game.currentPosition() + +player1.setPosition(position) + +racks = quackle.ProbableRackList() +unseenbag = position.unseenBag() +if unseenbag.size() <= dm.parameters().rackSize() + 3: + enum = quackle.Enumerator(unseenbag) + enum.enumerate(racks) + for rack in racks: + print rack + +movesToShow = 10 + +print "Board state: \n%s" % position.board().toString() +print "Move made: %s" % position.moveMade().toString() +print "Current player: %s" % position.currentPlayer().storeInformationToString() +print "Turn number: %i" % position.turnNumber() + +movelist = player1.moves(10) + +# Show 10 moves suggested by computer player +for move in movelist: print move.toString() -- cgit v1.2.3 From c7276ad4f627d3c3569996519de001431c04b1c0 Mon Sep 17 00:00:00 2001 From: Gökçen Eraslan Date: Thu, 7 Jan 2016 17:35:04 +0100 Subject: Tidy up Python test file and add extra vector typemaps to swig file. --- bindings/python/test.py | 73 ++++++++++++++++++++++++++++++------------------- bindings/quackle.i | 3 ++ 2 files changed, 48 insertions(+), 28 deletions(-) (limited to 'bindings/python') diff --git a/bindings/python/test.py b/bindings/python/test.py index a5e2373..3a95808 100644 --- a/bindings/python/test.py +++ b/bindings/python/test.py @@ -2,40 +2,57 @@ import quackle -# Set up the data manager -dm = quackle.DataManager() -dm.setComputerPlayers(quackle.ComputerPlayerCollection.fullCollection()) -dm.setBackupLexicon('twl06') -dm.setAppDataDirectory('../../data') - -# Set up the alphabet -abc = quackle.AlphabetParameters.findAlphabetFile('english') -fa = quackle.FlexibleAlphabetParameters() -assert fa.load(quackle.Util.stdStringToQString(abc)) -dm.setAlphabetParameters(fa) - -# Set up the board -board = quackle.BoardParameters() -dm.setBoardParameters(board) - -# Find the lexicon -dawg = quackle.LexiconParameters.findDictionaryFile('twl06.dawg') -gaddag = quackle.LexiconParameters.findDictionaryFile('twl06.gaddag') -dm.lexiconParameters().loadDawg(dawg) -dm.lexiconParameters().loadGaddag(gaddag) - -dm.strategyParameters().initialize('twl06') +def startUp(lexicon='twl06', + alphabet='english', + datadir='../../data'): + + # Set up the data manager + dm = quackle.DataManager() + dm.setComputerPlayers(quackle.ComputerPlayerCollection.fullCollection()) + dm.setBackupLexicon(lexicon) + dm.setAppDataDirectory(datadir) + + # Set up the alphabet + abc = quackle.AlphabetParameters.findAlphabetFile(alphabet) + abc2 = quackle.Util.stdStringToQString(abc) #convert to qstring + fa = quackle.FlexibleAlphabetParameters() + fa.thisown = False + + assert fa.load(abc2) + dm.setAlphabetParameters(fa) + + # Set up the board + board = quackle.BoardParameters() + board.thisown = False + dm.setBoardParameters(board) + + # Find the lexicon + dawg = quackle.LexiconParameters.findDictionaryFile(lexicon + '.dawg') + gaddag = quackle.LexiconParameters.findDictionaryFile(lexicon + '.gaddag') + dm.lexiconParameters().loadDawg(dawg) + dm.lexiconParameters().loadGaddag(gaddag) + + dm.strategyParameters().initialize(lexicon) + return dm + + +def getComputerPlayer(dm, name='Speedy Player'): + player, found = dm.computerPlayers().playerForName(name) + assert found + player = player.computerPlayer() + return player + + +dm = startUp() # Create a computer player -player1, found = dm.computerPlayers().playerForName('Speedy Player') -assert found -player1 = player1.computerPlayer() +player1 = getComputerPlayer(dm) print player1.name() # Create the Game file (.gcg) reader gamereader = quackle.GCGIO() -game = gamereader.read(quackle.Util.stdStringToQString('../../test/positions/short_game_with_bad_moves.gcg'), - quackle.Logania.MaintainBoardPreparation) +gamePath = quackle.Util.stdStringToQString('../../test/positions/short_game_with_bad_moves.gcg') +game = gamereader.read(gamePath, quackle.Logania.MaintainBoardPreparation) # Get the current position position = game.currentPosition() diff --git a/bindings/quackle.i b/bindings/quackle.i index 8ded915..cc8e390 100644 --- a/bindings/quackle.i +++ b/bindings/quackle.i @@ -49,6 +49,9 @@ %include "fixedstring.h" %include "uv.h" %include "alphabetparameters.h" + +%template(LetterParameterVector) std::vector; +%template(LetterStringVector) std::vector; %include "move.h" %include "rack.h" %include "bag.h" -- cgit v1.2.3 From 027385d0ff9f1223cb98410a29937e38d82de397 Mon Sep 17 00:00:00 2001 From: Gökçen Eraslan Date: Thu, 7 Jan 2016 18:32:14 +0100 Subject: bindings: Add another python test file to demonstrate selfplay. --- bindings/python/test.py | 80 ---------------------------------- bindings/python/test1_position.py | 80 ++++++++++++++++++++++++++++++++++ bindings/python/test2_selfplay.py | 91 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 171 insertions(+), 80 deletions(-) delete mode 100644 bindings/python/test.py create mode 100644 bindings/python/test1_position.py create mode 100644 bindings/python/test2_selfplay.py (limited to 'bindings/python') diff --git a/bindings/python/test.py b/bindings/python/test.py deleted file mode 100644 index 3a95808..0000000 --- a/bindings/python/test.py +++ /dev/null @@ -1,80 +0,0 @@ -# coding: utf-8 - -import quackle - -def startUp(lexicon='twl06', - alphabet='english', - datadir='../../data'): - - # Set up the data manager - dm = quackle.DataManager() - dm.setComputerPlayers(quackle.ComputerPlayerCollection.fullCollection()) - dm.setBackupLexicon(lexicon) - dm.setAppDataDirectory(datadir) - - # Set up the alphabet - abc = quackle.AlphabetParameters.findAlphabetFile(alphabet) - abc2 = quackle.Util.stdStringToQString(abc) #convert to qstring - fa = quackle.FlexibleAlphabetParameters() - fa.thisown = False - - assert fa.load(abc2) - dm.setAlphabetParameters(fa) - - # Set up the board - board = quackle.BoardParameters() - board.thisown = False - dm.setBoardParameters(board) - - # Find the lexicon - dawg = quackle.LexiconParameters.findDictionaryFile(lexicon + '.dawg') - gaddag = quackle.LexiconParameters.findDictionaryFile(lexicon + '.gaddag') - dm.lexiconParameters().loadDawg(dawg) - dm.lexiconParameters().loadGaddag(gaddag) - - dm.strategyParameters().initialize(lexicon) - return dm - - -def getComputerPlayer(dm, name='Speedy Player'): - player, found = dm.computerPlayers().playerForName(name) - assert found - player = player.computerPlayer() - return player - - -dm = startUp() - -# Create a computer player -player1 = getComputerPlayer(dm) -print player1.name() - -# Create the Game file (.gcg) reader -gamereader = quackle.GCGIO() -gamePath = quackle.Util.stdStringToQString('../../test/positions/short_game_with_bad_moves.gcg') -game = gamereader.read(gamePath, quackle.Logania.MaintainBoardPreparation) - -# Get the current position -position = game.currentPosition() - -player1.setPosition(position) - -racks = quackle.ProbableRackList() -unseenbag = position.unseenBag() -if unseenbag.size() <= dm.parameters().rackSize() + 3: - enum = quackle.Enumerator(unseenbag) - enum.enumerate(racks) - for rack in racks: - print rack - -movesToShow = 10 - -print "Board state: \n%s" % position.board().toString() -print "Move made: %s" % position.moveMade().toString() -print "Current player: %s" % position.currentPlayer().storeInformationToString() -print "Turn number: %i" % position.turnNumber() - -movelist = player1.moves(10) - -# Show 10 moves suggested by computer player -for move in movelist: print move.toString() diff --git a/bindings/python/test1_position.py b/bindings/python/test1_position.py new file mode 100644 index 0000000..3a95808 --- /dev/null +++ b/bindings/python/test1_position.py @@ -0,0 +1,80 @@ +# coding: utf-8 + +import quackle + +def startUp(lexicon='twl06', + alphabet='english', + datadir='../../data'): + + # Set up the data manager + dm = quackle.DataManager() + dm.setComputerPlayers(quackle.ComputerPlayerCollection.fullCollection()) + dm.setBackupLexicon(lexicon) + dm.setAppDataDirectory(datadir) + + # Set up the alphabet + abc = quackle.AlphabetParameters.findAlphabetFile(alphabet) + abc2 = quackle.Util.stdStringToQString(abc) #convert to qstring + fa = quackle.FlexibleAlphabetParameters() + fa.thisown = False + + assert fa.load(abc2) + dm.setAlphabetParameters(fa) + + # Set up the board + board = quackle.BoardParameters() + board.thisown = False + dm.setBoardParameters(board) + + # Find the lexicon + dawg = quackle.LexiconParameters.findDictionaryFile(lexicon + '.dawg') + gaddag = quackle.LexiconParameters.findDictionaryFile(lexicon + '.gaddag') + dm.lexiconParameters().loadDawg(dawg) + dm.lexiconParameters().loadGaddag(gaddag) + + dm.strategyParameters().initialize(lexicon) + return dm + + +def getComputerPlayer(dm, name='Speedy Player'): + player, found = dm.computerPlayers().playerForName(name) + assert found + player = player.computerPlayer() + return player + + +dm = startUp() + +# Create a computer player +player1 = getComputerPlayer(dm) +print player1.name() + +# Create the Game file (.gcg) reader +gamereader = quackle.GCGIO() +gamePath = quackle.Util.stdStringToQString('../../test/positions/short_game_with_bad_moves.gcg') +game = gamereader.read(gamePath, quackle.Logania.MaintainBoardPreparation) + +# Get the current position +position = game.currentPosition() + +player1.setPosition(position) + +racks = quackle.ProbableRackList() +unseenbag = position.unseenBag() +if unseenbag.size() <= dm.parameters().rackSize() + 3: + enum = quackle.Enumerator(unseenbag) + enum.enumerate(racks) + for rack in racks: + print rack + +movesToShow = 10 + +print "Board state: \n%s" % position.board().toString() +print "Move made: %s" % position.moveMade().toString() +print "Current player: %s" % position.currentPlayer().storeInformationToString() +print "Turn number: %i" % position.turnNumber() + +movelist = player1.moves(10) + +# Show 10 moves suggested by computer player +for move in movelist: print move.toString() diff --git a/bindings/python/test2_selfplay.py b/bindings/python/test2_selfplay.py new file mode 100644 index 0000000..4463c28 --- /dev/null +++ b/bindings/python/test2_selfplay.py @@ -0,0 +1,91 @@ +# coding: utf-8 + +import time + +import quackle + +def startUp(lexicon='twl06', + alphabet='english', + datadir='../../data'): + + # Set up the data manager + dm = quackle.DataManager() + dm.setComputerPlayers(quackle.ComputerPlayerCollection.fullCollection()) + dm.setBackupLexicon(lexicon) + dm.setAppDataDirectory(datadir) + + # Set up the alphabet + abc = quackle.AlphabetParameters.findAlphabetFile(alphabet) + abc2 = quackle.Util.stdStringToQString(abc) #convert to qstring + fa = quackle.FlexibleAlphabetParameters() + fa.thisown = False + + assert fa.load(abc2) + dm.setAlphabetParameters(fa) + + # Set up the board + board = quackle.BoardParameters() + board.thisown = False + dm.setBoardParameters(board) + + # Find the lexicon + dawg = quackle.LexiconParameters.findDictionaryFile(lexicon + '.dawg') + gaddag = quackle.LexiconParameters.findDictionaryFile(lexicon + '.gaddag') + dm.lexiconParameters().loadDawg(dawg) + dm.lexiconParameters().loadGaddag(gaddag) + + dm.strategyParameters().initialize(lexicon) + return dm + + + return player + + +def getComputerPlayer(dm, name='Speedy Player'): + player, found = dm.computerPlayers().playerForName(name) + assert found + player = player.computerPlayer() + player.thisown = False + return player + + +dm = startUp() + +p1 = getComputerPlayer(dm) +p2 = getComputerPlayer(dm) + +# Create computer players +player1 = quackle.Player('Compy1', quackle.Player.ComputerPlayerType, 0) +player1.setComputerPlayer(p1) +print player1.name() + +player2 = quackle.Player('Compy2', quackle.Player.ComputerPlayerType, 1) +player2.setComputerPlayer(p2) +print player2.name() + +dm.seedRandomNumbers(42) + +game = quackle.Game() +players = quackle.PlayerList() + +players.append(player1) +players.append(player2) + +game.setPlayers(players) +game.associateKnownComputerPlayers() +game.addPosition() + +for i in range(50): + if game.currentPosition().gameOver(): + print "GAME OVER" + break + + player = game.currentPosition().currentPlayer() + player.thisown =False + move = game.haveComputerPlay() + #print "Player: " + player.name() + print "Rack : " + player.rack().toString() + print 'Move: ' + move.toString() + print 'Board: \n' + game.currentPosition().board().toString() + + time.sleep(1) -- cgit v1.2.3 From 8c0321f80411286ca60cbfdd11320df36b28cf2e Mon Sep 17 00:00:00 2001 From: Gökçen Eraslan Date: Thu, 7 Jan 2016 18:47:22 +0100 Subject: Bindings: Remove unnecessary lines from Python selfplay test file --- bindings/python/test2_selfplay.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'bindings/python') diff --git a/bindings/python/test2_selfplay.py b/bindings/python/test2_selfplay.py index 4463c28..1c41874 100644 --- a/bindings/python/test2_selfplay.py +++ b/bindings/python/test2_selfplay.py @@ -38,14 +38,10 @@ def startUp(lexicon='twl06', return dm - return player - - def getComputerPlayer(dm, name='Speedy Player'): player, found = dm.computerPlayers().playerForName(name) assert found player = player.computerPlayer() - player.thisown = False return player @@ -81,7 +77,6 @@ for i in range(50): break player = game.currentPosition().currentPlayer() - player.thisown =False move = game.haveComputerPlay() #print "Player: " + player.name() print "Rack : " + player.rack().toString() -- cgit v1.2.3 From 49ff349b67c7fed35782bf6407242fe58ef654c7 Mon Sep 17 00:00:00 2001 From: Gökçen Eraslan Date: Sun, 24 Jan 2016 13:18:24 +0100 Subject: bindings: Fix DataManager ownership problems using DISOWN. --- bindings/python/test1_position.py | 2 -- bindings/python/test2_selfplay.py | 2 -- bindings/quackle.i | 25 ++++++++++++++++--------- 3 files changed, 16 insertions(+), 13 deletions(-) (limited to 'bindings/python') diff --git a/bindings/python/test1_position.py b/bindings/python/test1_position.py index 3a95808..e04081a 100644 --- a/bindings/python/test1_position.py +++ b/bindings/python/test1_position.py @@ -16,14 +16,12 @@ def startUp(lexicon='twl06', abc = quackle.AlphabetParameters.findAlphabetFile(alphabet) abc2 = quackle.Util.stdStringToQString(abc) #convert to qstring fa = quackle.FlexibleAlphabetParameters() - fa.thisown = False assert fa.load(abc2) dm.setAlphabetParameters(fa) # Set up the board board = quackle.BoardParameters() - board.thisown = False dm.setBoardParameters(board) # Find the lexicon diff --git a/bindings/python/test2_selfplay.py b/bindings/python/test2_selfplay.py index 1c41874..bb6e889 100644 --- a/bindings/python/test2_selfplay.py +++ b/bindings/python/test2_selfplay.py @@ -18,14 +18,12 @@ def startUp(lexicon='twl06', abc = quackle.AlphabetParameters.findAlphabetFile(alphabet) abc2 = quackle.Util.stdStringToQString(abc) #convert to qstring fa = quackle.FlexibleAlphabetParameters() - fa.thisown = False assert fa.load(abc2) dm.setAlphabetParameters(fa) # Set up the board board = quackle.BoardParameters() - board.thisown = False dm.setBoardParameters(board) # Find the lexicon diff --git a/bindings/quackle.i b/bindings/quackle.i index cc8e390..e45eb88 100644 --- a/bindings/quackle.i +++ b/bindings/quackle.i @@ -37,21 +37,23 @@ #include "quackleio/gcgio.h" %} + %include "std_string.i" %include "std_vector.i" +%include "typemaps.i" + +%include "fixedstring.h" +%include "uv.h" +%include "alphabetparameters.h" /*Needed to generate proper iterable types */ %template(MoveVector) std::vector; %template(PlayerVector) std::vector; %template(ProbableRackList) std::vector; %template(PositionList) std::vector; - -%include "fixedstring.h" -%include "uv.h" -%include "alphabetparameters.h" - %template(LetterParameterVector) std::vector; %template(LetterStringVector) std::vector; + %include "move.h" %include "rack.h" %include "bag.h" @@ -61,10 +63,6 @@ %include "catchall.h" %include "player.h" -/* handle output arguments of PlayerList methods using cool SWIG typemaps */ -/* what we do here is just to tell SWIG that last bool& argument is an output argument */ -%include "typemaps.i" - using namespace std; namespace Quackle { @@ -83,6 +81,15 @@ namespace Quackle %include "sim.h" %include "computerplayer.h" %include "computerplayercollection.h" + +%apply SWIGTYPE *DISOWN {Quackle::AlphabetParameters *alphabetParameters}; +%apply SWIGTYPE *DISOWN {Quackle::BoardParameters *boardParameters}; +%apply SWIGTYPE *DISOWN {Quackle::StrategyParameters *lexiconParameters}; +%apply SWIGTYPE *DISOWN {Quackle::LexiconParameters *lexiconParameters}; +%apply SWIGTYPE *DISOWN {Quackle::Evaluator *evaluator}; +%apply SWIGTYPE *DISOWN {Quackle::GameParameters *parameters}; +%apply SWIGTYPE *DISOWN {const Quackle::PlayerList &playerList}; + %include "datamanager.h" %include "endgame.h" %include "endgameplayer.h" -- cgit v1.2.3