speed up sortperm. ref #6112

on my system, now even faster than before
JuliaLang · Jul 3, 2014 · e8b6c45 · e8b6c45 · StefanKarpinski · Jul 3, 2014
1 parent a40bc88
commit e8b6c45
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/base/ordering.jl b/base/ordering.jl
@@ -48,8 +48,9 @@ lt(o::Lt,                    a, b) = o.lt(a,b)
 lt(o::LexicographicOrdering, a, b) = lexcmp(a,b) < 0
 
 function lt(p::Perm, a::Int, b::Int)
-    lt(p.order, p.data[a], p.data[b]) ? true :
-    lt(p.order, p.data[b], p.data[a]) ? false : a < b
+    da = p.data[a]
+    db = p.data[b]
+    lt(p.order, da, db) | (!lt(p.order, db, da) & (a < b))
 end
 function lt(p::Perm{LexicographicOrdering}, a::Int, b::Int)
     c = lexcmp(p.data[a], p.data[b])