From f1e8cd07845457948f554196e538dca27e0ebdb8 Mon Sep 17 00:00:00 2001
From: djib <me@djib.fr>
Date: Tue, 18 Jul 2006 23:14:35 +0000
Subject: [PATCH] Version 1.0.4 ============= Improved move ordering Changed
 default values

---
 src/suicideChess/ConfigFile.java     | 26 +++++++++++++-------------
 src/suicideChess/MoveComparator.java |  4 ++++
 src/suicideChess/SuicideChess.java   |  8 ++++----
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/suicideChess/ConfigFile.java b/src/suicideChess/ConfigFile.java
index cbf7953..79c4c02 100644
--- a/src/suicideChess/ConfigFile.java
+++ b/src/suicideChess/ConfigFile.java
@@ -282,20 +282,20 @@ public class ConfigFile {
                     10,     10,     10,     10,     10,     10,     10,     10
                 };
         squareWeightEndgame = new int[]{
-                0,     0,     0,     0,     0,     0,     0,     0,
-                0,     0,     0,     0,     0,     0,     0,     0,
-                0,     0,     0,     0,     0,     0,     0,     0,
-                0,     0,     0,     0,     0,     0,     0,     0,
-                0,     0,     0,     0,     0,     0,     0,     0,
-                0,     0,     0,     0,     0,     0,     0,     0,
-                0,     0,     0,     0,     0,     0,     0,     0,
-                0,     0,     0,     0,     0,     0,     0,     0
+                10,     10,     10,     10,     10,     10,     10,     10,
+                10,     10,     10,     10,     10,     10,     10,     10,
+                10,     10,     10,     10,     10,     10,     10,     10,
+                10,     10,     10,     10,     10,     10,     10,     10,
+                10,     10,     10,     10,     10,     10,     10,     10,
+                10,     10,     10,     10,     10,     10,     10,     10,
+                10,     10,     10,     10,     10,     10,     10,     10,
+                10,     10,     10,     10,     10,     10,     10,     10
             };
-        primaryMobilityValueMidgame = 40;
-        primaryMobilityValueEndgame = 40;
-        secondaryMobilityValueMidgame = 40; //5;
-        secondaryMobilityValueEndgame = 40;
-        endGamePawns = 3;
+        primaryMobilityValueMidgame = 0;
+        primaryMobilityValueEndgame = 0;
+        secondaryMobilityValueMidgame = 0; //5;
+        secondaryMobilityValueEndgame = 0;
+        endGamePawns = 4;
         endGamePieces = 8;
     }
     
diff --git a/src/suicideChess/MoveComparator.java b/src/suicideChess/MoveComparator.java
index 6fef42c..d4c24c6 100644
--- a/src/suicideChess/MoveComparator.java
+++ b/src/suicideChess/MoveComparator.java
@@ -44,11 +44,15 @@ class MoveCompare implements Comparator<Move> {
         } catch (NotAValidSquare e) {
             e.printStackTrace();
         }
+        /*
         if(oneBoardCopy.getBoardValue()<anotherBoardCopy.getBoardValue()) {
             return sortOrder;
         } else if (oneBoardCopy.getBoardValue()==anotherBoardCopy.getBoardValue()) {
             return 0;
         }
         return -sortOrder;
+        */
+        return sortOrder*(anotherBoardCopy.getBoardValue()-oneBoardCopy.getBoardValue());
+    
     }
 }
diff --git a/src/suicideChess/SuicideChess.java b/src/suicideChess/SuicideChess.java
index a5d5fc4..e778a9a 100644
--- a/src/suicideChess/SuicideChess.java
+++ b/src/suicideChess/SuicideChess.java
@@ -37,7 +37,7 @@ public class SuicideChess {
     /**
      * Use mobility in evaluation function (slows the program down a lot)
      */
-    public static final boolean USE_MOBILITY = false;
+    public static final boolean USE_MOBILITY = true;
     
     /**
      * do move ordering in Alpha-Beta pruning ?
@@ -99,7 +99,7 @@ public class SuicideChess {
     /**
      * The name to be displayed
      */
-    public static final String NAME = "djib's SuShi v1.0.3";
+    public static final String NAME = "djib's SuShi v1.0.4";
     
     /**
      * Displays informations in the console.
@@ -498,8 +498,8 @@ public class SuicideChess {
                                 bitboard.display();
                                 displayPlayer(bitboard);
                             }
-                            computerMove.display();
-                            bitboard.debug();
+                            //computerMove.display();
+                            //bitboard.debug();
                         }   
                                                 
                         if (testAndDisplayIfWinningOrDrawPosition(bitboard)) {