wfolsom/cs8803p4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90 Commits 1 Branch 0 Tags
21e5d894475b726b3f63410fbde6c2fc996ab88d
Commit Graph

90 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Woody Folsom
21e5d89447 Implemented naive Monte Carlo move generator (simulates 10 random moves for 3 turns by each player). 
Consequently, it performs strictly worse than Alpha-Beta, but usually avoids setting players up for an easy capture,
unlike Alpha-Beta.
 2012-04-29 14:59:25 -04:00
Woody Folsom
744ceb02f7 Fixed index out of bounds. 
Implemented CellPointer equals, hashcode.
 2012-04-29 13:40:27 -04:00
Marshall
a756aa242d - PlayerModel.java now returns the full array of output nodes instead of just their activation states. This exposes their strengths. 2012-04-29 12:49:08 -04:00
Marshall
1eebacf963 - Diagonal lines are no longer removed. 2012-04-29 12:45:49 -04:00
Woody Folsom
c53ff75ea4 Added configurable computer player - use 'com=random', 'com=minimax' etc as cmd-line args. 
Default is AlphaBeta.
Updated ActionListener for UserChooserFrame so that selecting from the list (or typing a new name and pressing RETURN) also triggers the action.
Added the player and computer algorithm names to the title bar e.g. "Bob vs. Alpha-Beta".
 2012-04-29 10:18:15 -04:00
Marshall
15ed56134e - Implemented multiple users, including a selection dialog and automatic preference saving and loading. 
- Integrated the ANN with the game. The network now predicts a user move, completely ignores it, and trains itself on the players actual move. This integration also included implementing two new functions. The first translates a board state to a boolean array to correspond with input nodes. The second translates a move to a boolean array to correspond with output nodes.
 2012-04-29 03:22:19 -04:00
Marshall
dc11e2c48b - Implemented saving and loading of a player model. High scores are now persistent, though only for one user. 
- Created a JUnit test class to test the serialization. Should be useful for later tests.
 2012-04-28 23:01:36 -04:00
Marshall
a6af6df132 - Reorganized packages so that the computer agents are inside the model package. 
- Added support for the player model inside Referee.java; high scores should now persist over a single execution of the program.
- Refactored PlayerModel.java to support game logging. All games are now logged so that we can track overall progress.
- Added scaffolding to allow saving and importing of PlayerModel.java. It is not yet functional, but it will be with two function implementations and then the appropriate calls.
 2012-04-28 19:18:28 -04:00
Marshall
1a4c6d865b - Finished HighScoreDialog.java. Now the player can play the game repeatedly. 2012-04-28 16:24:45 -04:00
Marshall
24096b50a8 - Updated the Node interface and its implementations to include a strength() function. This is a double value between 0 and 1 representing the percent activation. 
- Updated the PlayerModel to fix a bug in the high score tracking.
- Created HighScoreDialog.java, which displays the high scores from a PlayerModel. In the future, it will have a "New Game" button so that it can be used to transition between games.
 2012-04-26 13:04:41 -04:00
Marshall
0cfe26faf1 - Created a GameGoal class to encapsulate the expected computer behavior/target score for a game. The PlayerModel.java function getTargetScore() now returns a GameGoal object. 2012-04-26 12:08:17 -04:00
Marshall
b8a13a87d0 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p4 2012-04-26 11:18:06 -04:00
Woody Folsom
b87f58cb31 Minor changes to support debugging Alpha-Beta move generator. 2012-04-25 09:27:52 -04:00
Marshall
f19c09b573 -PlayerModel classes, including a function to get the target score for a player's game and a neural network to predict a player's moves. 2012-04-19 21:05:59 -04:00
Woody Folsom
10f43ee31c No longer ignoring .png files, thanks Mario. 2012-04-19 20:55:22 -04:00
Woody Folsom
d9ec72d0fb Alpha-Beta move generator can look 2 plays (4 plies) ahead on a 4x4 board and blocks every possible attempt by the player to connect 3. 
It should be possible to play on larger boards when the computers 'move' is changed from playing a tile to picking the player's next available color.
 2012-04-14 15:36:02 -04:00
Woody Folsom
74b8eb4622 Revampled MainFrame layout to improve appearance/usability when the number of tiles is very large or small. 
Fixed instantiation where a new MouseListener was used to each tile - now only one is used for all Tiles.
Fixed issue where the MouseListener was being added to each tile twice.
 2012-04-14 12:02:17 -04:00
Woody Folsom
9619f9a96d Incremental updates. Work in progress to augment Board, Referee, add score for computer player, implement Monte-Carlo simulation. 
Renamed Player implementations and changed Player to interface, with the goal of using abstraction to make the human and computer interactions with the game identical for ease of simulation.
 2012-04-08 17:25:10 -04:00
Woody Folsom
e0f42531e7 Replaced having 1 MouseListener per Tile JLabel which a single listener which asks the event's associated component for its row, column. 
This isn't ideal, but is preferable to putting this information in each of rows x columns different mouse listeners.
Also added a title to the MainFrame.
 2012-04-04 17:31:50 -04:00
Woody Folsom
b8df412740 Removed use of Refreshable and replaced with several methods which update the GUI using SwingUtilities.invokeLater(). 
While not as clean as using ChangeListener, it completely decouples the Model and View aspects,
and also avoids the need to manually paint() a hierarchy of components (a task best handled by Swing/AWT).
 2012-04-04 17:15:21 -04:00
Woody Folsom
0f616a3cc6 Continuing gradual process of collecting state from various GUI components and handlers and aggregating it in PlayerController. 
Removed references to Refree from some handlers, replacing them with direct use of PlayerController (Law of Demeter).
 2012-04-04 15:31:27 -04:00
Woody Folsom
0522f416e4 Correcting minor classpath issue which prevented running in Eclipse - was res/img, should have been res. 2012-04-04 13:44:32 -04:00
Woody Folsom
cffbc2c592 Build artifact dirs (docs, dist, bin) are now excluded from source control. 2012-04-02 13:57:50 -04:00
Woody Folsom
c8cdc1fcf8 Intermediate commit to remove Eclipse build artifacts (class files) from source control. 2012-04-02 13:57:26 -04:00
Woody Folsom
02c4986c30 App can now be built using Ant and run from the JAR file. 
Note: this requires adding the res/lib folder to the classpath in order to run in Eclipse (included in this commit).
Another commit will follow to remove build artifacts from git.
 2012-04-02 13:54:55 -04:00
Marshall
521fac6e08 -The rest of the game engine. I screwed up the commit last time. 2012-03-31 14:18:08 -04:00
Marshall
2954041e89 Initial game engine. 2012-03-31 14:15:50 -04:00
unknown
ccf8038f05 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-31 14:05:59 -04:00
Woody Folsom
6c4cce7a3a Test. 2012-03-29 11:59:41 -04:00
Woody Folsom
a2a6df8aa6 Final edits. 2012-03-18 23:09:23 -04:00
Marshall
b57a8da512 Last stuff. 2012-03-18 21:15:43 -04:00
Woody Folsom
cc15541e89 Mario has 3 lives again. 2012-03-18 21:05:45 -04:00
Marshall
54bf5937f0 - Fixed the bump bug. Kind of. I circumvented it. 2012-03-18 20:40:03 -04:00
Marshall
6ae266ee89 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-18 20:32:06 -04:00
Marshall
3c0673febf Some new stuff. 2012-03-18 20:31:54 -04:00
Woody Folsom
f1a7c2b4ce Updated remark on initial level per Marshall's new idea. 2012-03-18 20:23:04 -04:00
Marshall
f03577a822 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-18 19:57:52 -04:00
Marshall
aa5d9099f1 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 
Conflicts:
	src/dk/itu/mario/level/matcher/ProfileMatcher.java
 2012-03-18 19:57:41 -04:00
Woody Folsom
fdedf70546 Revisions. 2012-03-18 19:46:45 -04:00
Marshall
952ccdc23b - Update the ProfileMatcher mapping. 2012-03-18 19:01:08 -04:00
Woody Folsom
d5b8e0b85e Very rough draft of write-up (not proof-read). 2012-03-18 18:46:30 -04:00
Woody Folsom
18643d17e4 Fixed NPE when the default player.txt does not exist. Fixed bug when requesting PowerUp component of invalid length. Change default lives to 1. 2012-03-18 18:14:11 -04:00
Woody Folsom
0619f95f33 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-18 16:41:37 -04:00
Woody Folsom
992f2eef46 Example rules to enable/disable challenges (feeds fitness evaluator). 2012-03-18 16:41:23 -04:00
Marshall
a6f467d724 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-18 16:22:38 -04:00
Marshall
ac7b0c5b19 -Fixed some problems with the pipe jumping challenge. 2012-03-18 16:22:25 -04:00
Woody Folsom
862ba2aa31 CHALLENGE rule randomly generates challenges. 2012-03-18 16:17:04 -04:00
Woody Folsom
c2465821f3 Work in progress. 2012-03-18 15:01:16 -04:00
Marshall
1f1f23a6c3 - Greatly improved the challenge/reward probability function and usage. Removed some unnecessary fields and resorted the members of PCGLevel to make it easier to read. 2012-03-18 14:51:27 -04:00
Marshall
5ae5edd961 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-18 13:43:23 -04:00