X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.h;h=9df3277db775919672a88923e991ee82ffbf707c;hp=9702d9fbebcfbd0ab6a9088b3889f4807eb754c2;hb=1ee1d852fe5f82b73a9799db7cdd8468c0fa5faa;hpb=55b5b03273e9740b63663ee84a17788c5424eec3

diff --git a/src/move.h b/src/move.h
index 9702d9fb..9df3277d 100644
--- a/src/move.h
+++ b/src/move.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2009 Marco Costalba
+  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -86,10 +86,10 @@ inline void insertion_sort(T* firstMove, T* lastMove)
         }
 }
 
-// Our dedicated sort in range [firstMove, lastMove), it is well
-// tuned for non-captures where we have a lot of zero scored moves.
+// Our dedicated sort in range [firstMove, lastMove), first splits
+// positive scores from ramining then order seaprately the two sets.
 template<typename T>
-inline void sort_moves(T* firstMove, T* lastMove)
+inline void sort_moves(T* firstMove, T* lastMove, T** lastPositive)
 {
     T tmp;
     T *p, *d;
@@ -101,11 +101,11 @@ inline void sort_moves(T* firstMove, T* lastMove)
 
     // Split positives vs non-positives
     do {
-        while ((++p)->score > 0);
+        while ((++p)->score > 0) {}
 
         if (p != d)
         {
-            while (--d != p && d->score <= 0);
+            while (--d != p && d->score <= 0) {}
 
             tmp = *p;
             *p = *d;
@@ -114,29 +114,9 @@ inline void sort_moves(T* firstMove, T* lastMove)
 
     } while (p != d);
 
-    // Sort positives
+    // Sort just positive scored moves, remaining only when we get there
     insertion_sort<T>(firstMove, p);
-
-    d = lastMove;
-    p--;
-
-    // Split zero vs negatives
-    do {
-        while ((++p)->score == 0);
-
-        if (p != d)
-        {
-            while (--d != p && d->score < 0);
-
-            tmp = *p;
-            *p = *d;
-            *d = tmp;
-        }
-
-    } while (p != d);
-
-    // Sort negatives
-    insertion_sort<T>(p, lastMove);
+    *lastPositive = p;
 }
 
 // Picks up the best move in range [curMove, lastMove), one per cycle.
@@ -221,9 +201,9 @@ inline Move make_ep_move(Square from, Square to) {
 //// Prototypes
 ////
 
-extern std::ostream& operator<<(std::ostream &os, Move m);
-extern Move move_from_string(const Position &pos, const std::string &str);
-extern const std::string move_to_string(Move m);
+extern std::ostream& operator<<(std::ostream& os, Move m);
+extern Move move_from_string(const Position& pos, const std::string &str);
+extern const std::string move_to_string(Move m, bool chess960);
 extern bool move_is_ok(Move m);