Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix merge conflicts from pull
  • Loading branch information
joesweeney committed Apr 27, 2017
2 parents f9e3f3f + f04e191 commit c8406e1
Show file tree
Hide file tree
Showing 3 changed files with 127 additions and 145 deletions.
5 changes: 3 additions & 2 deletions src/RmCheckersClient.java
Expand Up @@ -53,7 +53,8 @@ public class RmCheckersClient {

public RmCheckersClient(){
_socket = openSocket();
e = new Evaluator00();
//e = new Evaluator00();
e = new BaseEvaluator("weights/beta.csv");
currentState = new CheckersGameState3();
user = _user1;
password = _password1;
Expand All @@ -62,7 +63,7 @@ public class RmCheckersClient {

public RmCheckersClient(int player, String opponent){
_socket = openSocket();
e = new Evaluator00();
e = new BaseEvaluator("weights/beta.csv");
currentState = new CheckersGameState3();
user = player==1 ? _user1 : _user2;
password = player==1 ? _password1 : _password2;
Expand Down

0 comments on commit c8406e1

Please sign in to comment.