Skip to content
Permalink
Browse files

Fix merge conflicts from pull

  • Loading branch information
joesweeney committed Apr 27, 2017
2 parents f9e3f3f + f04e191 commit c8406e1a172e171c7d63590780a48c78e0454487
Showing with 127 additions and 145 deletions.
  1. +3 −2 src/RmCheckersClient.java
  2. +121 −139 src/weights/alpha.csv
  3. +3 −4 src/weights/beta.csv
@@ -53,7 +53,8 @@

public RmCheckersClient(){
_socket = openSocket();
e = new Evaluator00();
//e = new Evaluator00();
e = new BaseEvaluator("weights/beta.csv");
currentState = new CheckersGameState3();
user = _user1;
password = _password1;
@@ -62,7 +63,7 @@ public 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;

0 comments on commit c8406e1

Please sign in to comment.
You can’t perform that action at this time.